From 19dd4d9defefe6a2d7155e88de3eee9e3dcdc512 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 22 Mar 2019 11:44:13 +0100
Subject: [PATCH 001/250] pricelist fixes
---
.../recordcontainers/db/conditionProcess.js | 11 ++++++++++-
entity/Attribute_entity/Attribute_entity.aod | 1 +
.../entityfields/product_id/onValueChange.js | 4 +++-
.../Productprice_entity.aod | 2 ++
.../entityfields/fromquantity/valueProcess.js | 18 ++++++++----------
.../entityfields/price/valueProcess.js | 6 ++++++
.../entityfields/pricelist/onValidation.js | 1 +
.../entityfields/vat/valueProcess.js | 6 ++++++
.../ActivityDetail_view.aod | 3 ++-
.../ActivityMain_view/ActivityMain_view.aod | 10 +++++-----
neonView/OrderDetail_view/OrderDetail_view.aod | 2 ++
neonView/TaskMain_view/TaskMain_view.aod | 11 ++++++-----
.../_____PREFERENCES_PROJECT.aod | 2 +-
process/Product_lib/process.js | 6 ++++--
14 files changed, 57 insertions(+), 26 deletions(-)
create mode 100644 entity/Productprice_entity/entityfields/price/valueProcess.js
create mode 100644 entity/Productprice_entity/entityfields/vat/valueProcess.js
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 9c8391b37c..c772668cbd 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -6,7 +6,16 @@ import("Sql_lib");
var cond = new SqlCondition();
if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
{
- var activityLinkCond = SqlCondition.begin().andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.RowId_param")
+ var rowId = vars.get("$param.RowId_param");
+ var rowIdCond = null;
+ if (vars.get("$param.ObjectId_param") == "Person")
+ {
+ rowId = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", rowId)
+ .buildSql("select PERSON_ID from CONTACT", "1 = 2"))
+ rowIdCond = "# in (select CONTACTID from CONTACT where PERSON_ID = ?)";
+ }
+ var activityLinkCond = SqlCondition.begin().andPrepare("ACTIVITYLINK.OBJECT_ROWID", rowId, rowIdCond)
.andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
// TODO: more performant way than IN. Maybe a join??
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 230a538109..405955e8bd 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -194,6 +194,7 @@
</entityProvider>
<entityField>
<name>FULL_ATTRIBUTE_NAME</name>
+ <title>Name</title>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index 524f19c066..fc9994c4e5 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -3,14 +3,16 @@ import("system.neon");
import("Product_lib");
import("Util_lib");
import("Entity_lib");
+import("Attribute_lib");
var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
if(pid != "")
{
var currency = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
- var PriceListFilter = { currency: currency, quantity: vars.get("$field.QUANTITY"), relationId: contactid };
+ var PriceListFilter = { currency: currency, quantity: vars.get("$field.QUANTITY"), relationId: contactid, priceList: pricelist };
//TODO: loading from db until loading from Consumer is possible.
var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index d9059a4c13..509d6a1fb6 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -35,6 +35,7 @@
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
<state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PRODUCTPRICEID</name>
@@ -79,6 +80,7 @@
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/vat/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js b/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js
index 66e7d5877c..b2204ba4ad 100644
--- a/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js
+++ b/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js
@@ -1,10 +1,8 @@
-//import("system.vars");
-//import("system.result");
-//import("system.neon");
-//
-//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
-//{
-// result.string("1");
-//}
-//else
-// result.string(vars.get("$this.value"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+ result.string("1");
+else
+ result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/price/valueProcess.js b/entity/Productprice_entity/entityfields/price/valueProcess.js
new file mode 100644
index 0000000000..723d0252aa
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/price/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+ result.string("0");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/pricelist/onValidation.js b/entity/Productprice_entity/entityfields/pricelist/onValidation.js
index 281a078881..4aacd1ac13 100644
--- a/entity/Productprice_entity/entityfields/pricelist/onValidation.js
+++ b/entity/Productprice_entity/entityfields/pricelist/onValidation.js
@@ -7,6 +7,7 @@ import("Entity_lib");
var priceList = {
priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
+ , priceListId: vars.get("$field.PRODUCTPRICEID")
, fromQuantity: vars.get("$field.FROMQUANTITY")
, buySell: vars.get("$field.BUYSELL")
, currency: vars.get("$field.CURRENCY")
diff --git a/entity/Productprice_entity/entityfields/vat/valueProcess.js b/entity/Productprice_entity/entityfields/vat/valueProcess.js
new file mode 100644
index 0000000000..723d0252aa
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/vat/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+ result.string("0");
\ No newline at end of file
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 365b115a49..9e831646ef 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -12,7 +12,8 @@
<genericViewTemplate>
<name>OfferInfo</name>
<editMode v="false" />
- <showDrawer v="false" />
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 12164cdbc4..eb9974e40d 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -14,16 +14,16 @@
<entityField>#ENTITY</entityField>
<view>ActivityPreview_view</view>
</neonViewReference>
- <neonViewReference>
- <name>f6c6888a-f3d6-410a-b97b-30c34a9dd6a2</name>
- <entityField>ModuleTrees</entityField>
- <view>ModuleTree_view</view>
- </neonViewReference>
<neonViewReference>
<name>a3a45cd7-587f-4bc0-9980-e6d1c89a8212</name>
<entityField>#ENTITY</entityField>
<view>ActivityDetail_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>f6c6888a-f3d6-410a-b97b-30c34a9dd6a2</name>
+ <entityField>ModuleTrees</entityField>
+ <view>ModuleTree_view</view>
+ </neonViewReference>
<neonViewReference>
<name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
<entityField>Documents</entityField>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index f8b617ff78..47464d32f3 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -11,6 +11,8 @@
<children>
<genericViewTemplate>
<name>OrderDetail_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index 9721f1788b..d8231d9831 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -14,14 +14,10 @@
<entityField>#ENTITY</entityField>
<view>TaskMainPreview_view</view>
</neonViewReference>
- <neonViewReference>
- <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
- <entityField>ModuleTrees</entityField>
- <view>ModuleTree_view</view>
- </neonViewReference>
<genericViewTemplate>
<name>details</name>
<showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
<entityField>#ENTITY</entityField>
<title>details</title>
<fields>
@@ -35,6 +31,11 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
+ <entityField>ModuleTrees</entityField>
+ <view>ModuleTree_view</view>
+ </neonViewReference>
<neonViewReference>
<name>6846f680-84ef-46da-a0ea-6797044cf693</name>
<entityField>MainDocuments</entityField>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 35430f5089..2e627c2e51 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic5</projectName>
+ <projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index e3f595e558..cdf6241f48 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -318,12 +318,14 @@ ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
var PriceLists = this.getProductDetails(pid).PriceLists;
for (var pricelist in PriceLists) {
+ //different pricelist id
//equal price list
//equal fromquantity
//equal currency
//equal pp/sp
- if (priceList.priceList == PriceLists[pricelist].priceList
- && priceList.fromQuantity == PriceLists[pricelist].fromQuantity
+ if (priceList.priceListId != PriceLists[pricelist].priceListId
+ && priceList.priceList == PriceLists[pricelist].priceList
+ && parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity)
&& priceList.buySell == PriceLists[pricelist].buySell
&& priceList.currency == PriceLists[pricelist].currency) {
--
GitLab
From 984779a84f425178780a05978db86656e661b344 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 12:56:39 +0100
Subject: [PATCH 002/250] =?UTF-8?q?Bei=20neuer=20Verkn=C3=BCpfung=20aus=20?=
=?UTF-8?q?Aufgabe=20/=20Aktivit=C3=A4t=20->=20Alle=20Verkn=C3=BCpfungen?=
=?UTF-8?q?=20aus=20parent=20=C3=BCbernehmen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Activity_entity/afterUiInit.js | 2 +-
.../newactivity/onActionProcess.js | 10 ++--
.../entityfields/newtask/onActionProcess.js | 9 ++--
.../entityfields/country/valueProcess.js | 2 -
.../entityfields/printoffer/stateProcess.js | 1 -
entity/Offeritem_entity/Offeritem_entity.aod | 1 -
.../entityfields/assignedto/valueProcess.js | 6 ---
entity/Task_entity/afterUiInit.js | 2 +-
.../newactivity/onActionProcess.js | 10 ++--
.../entityfields/newtask/onActionProcess.js | 10 ++--
process/ActivityTask_lib/process.js | 54 ++++++++++++++-----
process/Salesproject_lib/process.js | 1 -
process/Util_lib/process.js | 1 -
13 files changed, 56 insertions(+), 53 deletions(-)
delete mode 100644 entity/Offeritem_entity/entityfields/assignedto/valueProcess.js
diff --git a/entity/Activity_entity/afterUiInit.js b/entity/Activity_entity/afterUiInit.js
index 335bfa9bbf..0f3cf2b053 100644
--- a/entity/Activity_entity/afterUiInit.js
+++ b/entity/Activity_entity/afterUiInit.js
@@ -4,5 +4,5 @@ import("ActivityTask_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- ActivityUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param");
+ ActivityUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
}
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newactivity/onActionProcess.js b/entity/Activity_entity/entityfields/newactivity/onActionProcess.js
index 39352aaa73..1216eaeb42 100644
--- a/entity/Activity_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Activity_entity/entityfields/newactivity/onActionProcess.js
@@ -1,9 +1,5 @@
-import("system.neon");
import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
-var params = {
- "ParentId_param": vars.get("$field.ACTIVITYID"),
- "ParentContext_param": "Activity"
-};
-
-neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
+ActivityUtils.createNewActivity(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newtask/onActionProcess.js b/entity/Activity_entity/entityfields/newtask/onActionProcess.js
index 48a549d482..47fc462291 100644
--- a/entity/Activity_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Activity_entity/entityfields/newtask/onActionProcess.js
@@ -1,8 +1,5 @@
-import("system.neon");
import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
-var params = {
- "ParentId_param" : vars.get("$field.ACTIVITYID"),
- "ParentContext_param" : "Activity"
-};
-neon.openContext("Task", "TaskEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
+TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/country/valueProcess.js b/entity/Address_entity/entityfields/country/valueProcess.js
index 041ab63a44..0bbec92588 100644
--- a/entity/Address_entity/entityfields/country/valueProcess.js
+++ b/entity/Address_entity/entityfields/country/valueProcess.js
@@ -1,10 +1,8 @@
-import("system.logging");
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
-logging.log("recordstate = " + vars.get("$sys.recordstate"))
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
result.string("DE");
diff --git a/entity/Offer_entity/entityfields/printoffer/stateProcess.js b/entity/Offer_entity/entityfields/printoffer/stateProcess.js
index 9e9e92febb..b6ef75cff7 100644
--- a/entity/Offer_entity/entityfields/printoffer/stateProcess.js
+++ b/entity/Offer_entity/entityfields/printoffer/stateProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.result");
import("system.db");
import("Sql_lib");
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index ad258bf3ad..6f68d416a8 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -12,7 +12,6 @@
</entityProvider>
<entityField>
<name>ASSIGNEDTO</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/assignedto/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DISCOUNT</name>
diff --git a/entity/Offeritem_entity/entityfields/assignedto/valueProcess.js b/entity/Offeritem_entity/entityfields/assignedto/valueProcess.js
deleted file mode 100644
index 8f2c38c402..0000000000
--- a/entity/Offeritem_entity/entityfields/assignedto/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("")
\ No newline at end of file
diff --git a/entity/Task_entity/afterUiInit.js b/entity/Task_entity/afterUiInit.js
index 6a57309c46..bf767e8d66 100644
--- a/entity/Task_entity/afterUiInit.js
+++ b/entity/Task_entity/afterUiInit.js
@@ -4,5 +4,5 @@ import("ActivityTask_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param");
+ TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/newactivity/onActionProcess.js b/entity/Task_entity/entityfields/newactivity/onActionProcess.js
index f3c7bcbb72..08d17b66f9 100644
--- a/entity/Task_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Task_entity/entityfields/newactivity/onActionProcess.js
@@ -1,9 +1,5 @@
-import("system.neon");
import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
-var params = {
- "ParentId_param": vars.get("$field.TASKID"),
- "ParentContext_param": "Task"
-};
-
-neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
+ActivityUtils.createNewActivity(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/newtask/onActionProcess.js b/entity/Task_entity/entityfields/newtask/onActionProcess.js
index b4e2fd874a..d826841f60 100644
--- a/entity/Task_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Task_entity/entityfields/newtask/onActionProcess.js
@@ -1,9 +1,5 @@
-import("system.neon");
import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
-var params = {
- "ParentId_param": vars.get("$field.TASKID"),
- "ParentContext_param": "Task"
-};
-
-neon.openContext("Task", "TaskEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
+TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index a013d81fcb..421a419f4f 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -24,9 +24,9 @@ function ActivityUtils() {}
/**
* Create a new activity
*/
-ActivityUtils.createNewActivity = function(pRowId, pAdditionalLinks)
+ActivityUtils.createNewActivity = function(pRowId, pAdditionalLinks, pParentContext, pParentId)
{
- _ActivityTaskUtils.createNew("Activity", pRowId, pAdditionalLinks)
+ _ActivityTaskUtils._createNew("Activity", pRowId, pAdditionalLinks, pParentContext, pParentId)
}
/*
@@ -60,9 +60,9 @@ ActivityUtils.getLastActivityDate = function(pRowId)
* @return {String} pRowIdField jdito Field for the rowId
* @return {String} pAdditionalLinksField jdito Field for additional links
*/
-ActivityUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField)
+ActivityUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField)
{
- _ActivityTaskUtils.addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, "Links");
+ _ActivityTaskUtils._addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, "Links");
}
/**
@@ -77,9 +77,9 @@ function TaskUtils () {}
/**
* Create a new task
*/
-TaskUtils.createNewTask = function(pRowId, pAdditionalLinks)
+TaskUtils.createNewTask = function(pRowId, pAdditionalLinks, pParentContext, pParentId)
{
- _ActivityTaskUtils.createNew("Task", pRowId, pAdditionalLinks)
+ _ActivityTaskUtils._createNew("Task", pRowId, pAdditionalLinks, pParentContext, pParentId)
}
/**
@@ -89,9 +89,9 @@ TaskUtils.createNewTask = function(pRowId, pAdditionalLinks)
* @return {String} pRowIdField jdito Field for the rowId
* @return {String} pAdditionalLinksField jdito Field for additional links
*/
-TaskUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField)
+TaskUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField)
{
- _ActivityTaskUtils.addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, "Links");
+ _ActivityTaskUtils._addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, "Links");
}
/**
@@ -108,15 +108,27 @@ function _ActivityTaskUtils() {}
* Create a new task
* @ignore
*/
-_ActivityTaskUtils.createNew = function(pContext, pRowId, pAdditionalLinks)
+_ActivityTaskUtils._createNew = function(pContext, pRowId, pAdditionalLinks, pParentContext, pParentId)
{
if (pAdditionalLinks == undefined)
pAdditionalLinks = [];
var params = {};
- params["ObjectId_param"] = ContextUtils.getCurrentContextId();
- params["RowId_param"] = pRowId;
+ if (pRowId)
+ {
+ params["ObjectId_param"] = ContextUtils.getCurrentContextId();
+ params["RowId_param"] = pRowId;
+ }
+
params["PresetLinks_param"] = JSON.stringify(pAdditionalLinks);
+
+ if (pParentContext && pParentId)
+ {
+
+
+ params["ParentContext_param"] = pParentContext;
+ params["ParentId_param"] = pParentId;
+ }
neon.openContext(pContext, null, null, neon.OPERATINGSTATE_NEW, params);
}
@@ -130,7 +142,7 @@ _ActivityTaskUtils.createNew = function(pContext, pRowId, pAdditionalLinks)
*
* @ignore
*/
-_ActivityTaskUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pConsumerName)
+_ActivityTaskUtils._addLinkRecords = function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, pConsumerName)
{
if (vars.exists(pAdditionalLinksField))
presetLinks = JSON.parse(vars.get(pAdditionalLinksField));
@@ -142,6 +154,24 @@ _ActivityTaskUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditi
&& vars.exists(pObjectIdField) && vars.get(pObjectIdField))
presetLinks.push([vars.get(pObjectIdField), vars.get(pRowIdField)]);
+ if (vars.exists(pParentContextField) && vars.exists(pParentIdField))
+ {
+ switch (vars.get(pParentContextField))
+ {
+ case "Activity":
+ presetLinks = presetLinks.concat(db.table(SqlCondition.begin()
+ .andPrepare("ACTIVITYLINK.ACTIVITY_ID", vars.get(pParentIdField))
+ .buildSql("select OBJECT_TYPE, OBJECT_ROWID from ACTIVITYLINK", "1=2")));
+ break;
+ case "Task":
+ presetLinks = presetLinks.concat(db.table(SqlCondition.begin()
+ .andPrepare("TASKLINK.ACTIVITY_ID", vars.get(pParentIdField))
+ .buildSql("select OBJECT_TYPE, OBJECT_ROWID from TASKLINK", "1=2")));
+ break;
+ }
+
+ }
+
presetLinks.forEach(function(link) {
neon.addRecord(null, pConsumerName, {
"OBJECT_TYPE" : link[0],
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index 2386133f8d..6887b3ee1b 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.neon");
import("system.vars");
import("system.util");
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 3b5cc6b094..bc9a4fe69f 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -1,6 +1,5 @@
import("system.neon");
import("system.project");
-import("system.logging");
import("system.process");
import("system.db");
import("system.util");
--
GitLab
From d710357c705f825a0978066dfdcfe09d50112590 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 13:23:47 +0100
Subject: [PATCH 003/250] explizit gesetzte Expose entfernen
---
.../ActivityLink_entity.aod | 1 -
entity/Activity_entity/Activity_entity.aod | 3 ---
.../AddressType_entity/AddressType_entity.aod | 1 -
entity/Address_entity/Address_entity.aod | 6 -----
.../AppointmentLink_entity.aod | 1 -
entity/Attribute_entity/Attribute_entity.aod | 23 -------------------
.../Communication_entity.aod | 8 ++-----
entity/Context_entity/Context_entity.aod | 4 ----
entity/Contract_entity/Contract_entity.aod | 6 -----
entity/Document_entity/Document_entity.aod | 9 +-------
10 files changed, 3 insertions(+), 59 deletions(-)
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 34b9c2ad50..af831d9294 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -46,7 +46,6 @@
<children>
<entityParameter>
<name>ActivityId_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index aa6d823574..7682554996 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -236,15 +236,12 @@
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>RowId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>PresetLinks_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>ParentContext_param</name>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 48ca8e67b9..a0d88164c5 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -32,7 +32,6 @@
<children>
<entityParameter>
<name>UsageFilter_param</name>
- <expose v="true" />
<mandatory v="true" />
</entityParameter>
</children>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 67b08770d2..86da7fdbdb 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -90,11 +90,9 @@
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>OrganisationId_param</name>
@@ -135,11 +133,9 @@
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -222,11 +218,9 @@
</entityParameter>
<entityParameter>
<name>OrganisationId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 47911cce2a..2b4479624a 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -49,7 +49,6 @@
<children>
<entityParameter>
<name>AppointmentId_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 405955e8bd..3bd2589ca4 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -79,18 +79,9 @@
</entityDependency>
</dependencies>
<children>
- <entityParameter>
- <name>AttrParentType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AttrParentId_param</name>
- <expose v="true" />
- </entityParameter>
<entityParameter>
<name>GetGroups_param</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeparent/children/getgroups_param/valueProcess.js</valueProcess>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -177,20 +168,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>FULL_ATTRIBUTE_NAME</name>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 3a60711e69..6b9d3b711e 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -83,12 +83,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<children>
<entityParameter>
<name>CommCategory_param</name>
- <expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
@@ -122,12 +120,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityParameter>
<name>CommCategory_param</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
- <expose v="true" />
+ <expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
@@ -161,12 +158,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityParameter>
<name>CommCategory_param</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
- <expose v="true" />
+ <expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 922b46b44d..03dc38f45a 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -50,10 +50,6 @@
<name>CONTEXT_NAME</name>
<title>Context name</title>
</entityField>
- <entityProvider>
- <name>Context</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 8a8e017831..987a03e9e7 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -100,12 +100,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 85846c167b..36497caaa7 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -184,19 +184,15 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>Keyword_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -246,21 +242,18 @@
<entityParameter>
<name>Keyword_param</name>
<valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
- <expose v="true" />
+ <expose v="false" />
<mandatory v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
--
GitLab
From dadc161b993eae979d2d695a2bb703ee906980cc Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 13:37:15 +0100
Subject: [PATCH 004/250] mandatory entfernt, da es sonnst im Edit nicht mehr
geht, wenn man z.B. nur den Hauptdokument-haken setzt
---
entity/Document_entity/Document_entity.aod | 1 -
1 file changed, 1 deletion(-)
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 36497caaa7..9d6b3b524e 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -53,7 +53,6 @@
<name>BINDATA_UPLOAD</name>
<title>Datei</title>
<contentType>FILE</contentType>
- <mandatory v="true" />
<onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
--
GitLab
From a0fa2d59ed9d952ffcce094205538f89592e7036 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 22 Mar 2019 11:33:43 +0100
Subject: [PATCH 005/250] removed unnecessary code
---
entity/KeywordAttribute_entity/KeywordAttribute_entity.aod | 2 --
1 file changed, 2 deletions(-)
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index e0b2005872..a1ae369eeb 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -50,12 +50,10 @@
<children>
<entityParameter>
<name>ContainerName_param</name>
- <expose v="true" />
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
<name>FilterAlreadyUsedByEntryId_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
--
GitLab
From e0a8fc76543560e25edc77c558b7163a3d13fa0f Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 22 Mar 2019 13:58:06 +0100
Subject: [PATCH 006/250] person: added list of other contacts
---
entity/Contact_entity/Contact_entity.aod | 71 +++++++++++++++++++
.../containername_param/valueProcess.js | 4 ++
.../organisation_id/displayValueProcess.js | 9 +++
.../children/withprivat_param/valueProcess.js | 2 +
.../children/personid_param/valueProcess.js | 14 ++++
.../status/displayValueProcess.js | 11 +++
.../entityfields/status/valueProcess.js | 7 ++
.../targetcontext/valueProcess.js | 4 ++
.../recordcontainers/db/conditionProcess.js | 11 +++
.../KeywordEntry_entity.aod | 6 ++
entity/Person_entity/Person_entity.aod | 23 ++++--
.../newcontact/onActionProcess.js | 4 --
.../organisation_id/displayValueProcess.js | 11 +--
.../owncontactid_param/valueProcess.js | 4 ++
neonContext/Contact/Contact.aod | 4 ++
.../ContactList_view/ContactList_view.aod | 40 +++++++++++
neonView/PersonMain_view/PersonMain_view.aod | 5 ++
process/Contact_lib/process.js | 22 +++++-
18 files changed, 231 insertions(+), 21 deletions(-)
create mode 100644 entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
create mode 100644 entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/status/displayValueProcess.js
create mode 100644 entity/Contact_entity/entityfields/status/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/targetcontext/valueProcess.js
create mode 100644 entity/Contact_entity/recordcontainers/db/conditionProcess.js
delete mode 100644 entity/Person_entity/entityfields/newcontact/onActionProcess.js
create mode 100644 entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js
create mode 100644 neonView/ContactList_view/ContactList_view.aod
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 87c8f9e0ba..036ac1025f 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -18,6 +18,7 @@
<title>Organisation</title>
<consumer>Organisations</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
@@ -47,6 +48,12 @@
<entityName>Organisation_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>WithPrivat_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityParameter>
<name>PersonId_param</name>
@@ -56,6 +63,12 @@
<entityProvider>
<name>PersonRelated</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <children>
+ <entityParameter>
+ <name>OwnContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>ADDRESS_ID</name>
@@ -103,6 +116,7 @@
<name>LANGUAGE</name>
<title>Language</title>
<consumer>Languages</consumer>
+ <mandatory v="true" />
</entityField>
<entityConsumer>
<name>Languages</name>
@@ -113,11 +127,64 @@
<fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
+ <entityProvider>
+ <name>PersonsContactsExceptOwn</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>targetContext</targetContextField>
+ <targetIdField>CONTACTID</targetIdField>
+ <dependencies>
+ <entityDependency>
+ <name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>OtherContacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>PersonId_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>OwnContactId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>targetContext</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STATUS</name>
+ <title>Status</title>
+ <consumer>KeywordContactStates</consumer>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordContactStates</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>d2a29013-e270-4ce1-8f2d-b372206f0aa3</name>
@@ -160,6 +227,10 @@
<name>LANGUAGE.value</name>
<recordfield>CONTACT.LANGUAGE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.value</name>
+ <recordfield>CONTACT.STATUS</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js b/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..63035752b8
--- /dev/null
+++ b/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.contactStatus());
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
new file mode 100644
index 0000000000..460b39849d
--- /dev/null
+++ b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Contact_lib");
+
+var organisationId = vars.get("$field.ORGANISATION_ID");
+var res = OrganisationUtils.getNameByOrganisationId(organisationId);
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js b/entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
new file mode 100644
index 0000000000..cda204045d
--- /dev/null
+++ b/entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string(true);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js b/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js
new file mode 100644
index 0000000000..b9088fd5cb
--- /dev/null
+++ b/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.result");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+var contactId = vars.get("$param.OwnContactId_param");
+if (contactId)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select CONTACT.PERSON_ID from CONTACT");
+ var personId = db.cell(sql);
+ result.string(personId);
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/status/displayValueProcess.js b/entity/Contact_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000..7d0dbe15c0
--- /dev/null
+++ b/entity/Contact_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+var key = vars.get("$field.STATUS");
+if (key)
+{
+ var res = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), key);
+ result.string(res);
+}
diff --git a/entity/Contact_entity/entityfields/status/valueProcess.js b/entity/Contact_entity/entityfields/status/valueProcess.js
new file mode 100644
index 0000000000..ab590b0594
--- /dev/null
+++ b/entity/Contact_entity/entityfields/status/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("KeywordRegistry_basic");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string($KeywordRegistry.contactStatus$active());
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/targetcontext/valueProcess.js b/entity/Contact_entity/entityfields/targetcontext/valueProcess.js
new file mode 100644
index 0000000000..a15d38343e
--- /dev/null
+++ b/entity/Contact_entity/entityfields/targetcontext/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getContextName("Person"));
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/conditionProcess.js b/entity/Contact_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..2433febc96
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = new SqlCondition();
+cond.andPrepareVars("CONTACT.CONTACTID", "$param.OwnContactId_param", "# != ?");
+cond.andPrepareVars("CONTACT.PERSON_ID", "$param.PersonId_param");
+
+//TODO: use a preparedCondition when available #1030812 #1034026
+result.string(db.translateCondition(cond.build("1 = 2")));
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 5ad4909c23..4ee519d2d2 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -360,6 +360,12 @@
<fieldName>KeywordContactStates</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>KeywordContactStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 16475d8c44..805cba3759 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -694,13 +694,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
- <entityActionField>
- <name>newContact</name>
- <fieldType>ACTION</fieldType>
- <title>New contact</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newcontact/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:USERS</iconId>
- </entityActionField>
<entityField>
<name>DEPARTMENT</name>
<title>Department</title>
@@ -713,6 +706,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>CONTACTROLE</name>
<title>Contactrole</title>
</entityField>
+ <entityConsumer>
+ <name>OtherContacts</name>
+ <title>Other Contactroles</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>PersonsContactsExceptOwn</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OwnContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/newcontact/onActionProcess.js b/entity/Person_entity/entityfields/newcontact/onActionProcess.js
deleted file mode 100644
index 98a6f340f6..0000000000
--- a/entity/Person_entity/entityfields/newcontact/onActionProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.neon");
-
-neon.openContext("Contact", null, null, neon.OPERATINGSTATE_NEW, {PersonId_param: vars.get("$field.PERSON_ID")});
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js b/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js
index efe14ce09d..460b39849d 100644
--- a/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js
@@ -1,16 +1,9 @@
import("system.result");
import("system.db");
import("system.vars");
-import("Sql_lib");
+import("Contact_lib");
var organisationId = vars.get("$field.ORGANISATION_ID");
-var orgname = "";
-
-if (organisationId)
-{
- res = db.cell(SqlCondition.begin()
- .andPrepare("ORGANISATION.ORGANISATIONID", organisationId)
- .buildSql("select ORGANISATION.NAME from ORGANISATION"));
-}
+var res = OrganisationUtils.getNameByOrganisationId(organisationId);
result.string(res);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js b/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js
new file mode 100644
index 0000000000..7b6137b4d1
--- /dev/null
+++ b/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/neonContext/Contact/Contact.aod b/neonContext/Contact/Contact.aod
index 9a0e9a6ac1..3ad4a70c1f 100644
--- a/neonContext/Contact/Contact.aod
+++ b/neonContext/Contact/Contact.aod
@@ -9,5 +9,9 @@
<name>c96479fe-4f9c-433d-9de3-c2e1bbb5aac7</name>
<view>ContactEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>dde4fdab-4a5e-4183-8d4d-4e96d34054c7</name>
+ <view>ContactList_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ContactList_view/ContactList_view.aod b/neonView/ContactList_view/ContactList_view.aod
new file mode 100644
index 0000000000..c52c92ef47
--- /dev/null
+++ b/neonView/ContactList_view/ContactList_view.aod
@@ -0,0 +1,40 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>ContactList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>main</name>
+ <hideContentSearch v="true" />
+ <isEditable v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ef71b5ad-8581-4845-ae66-7df17d1459e0</name>
+ <entityField>ORGANISATION_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a3f3a2b8-1f7a-4783-b080-1853df3d1613</name>
+ <entityField>CONTACTROLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a8f4283d-7a40-4ee9-ae34-e4d424a9342a</name>
+ <entityField>DEPARTMENT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>13b085a4-9ee7-418b-b3a9-acaf053c44f1</name>
+ <entityField>POSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1daa17e8-0e8d-4760-b229-651ae9a121d3</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index d0e56b27d9..c27980a4d2 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -54,5 +54,10 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
+ <entityField>OtherContacts</entityField>
+ <view>ContactList_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 628de9c354..b3e659f848 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -7,7 +7,27 @@ import("Util_lib");
import("Context_lib");
/**
- * a static Utility class for relations
+ * a static Utility class for organisations
+ *
+ * Do not create an instance of this!
+ * @class
+ */
+function OrganisationUtils() {}
+
+OrganisationUtils.getNameByOrganisationId = function(pOrganisationId)
+{
+ var orgname = "";
+ if (pOrganisationId)
+ {
+ orgname = db.cell(SqlCondition.begin()
+ .andPrepare("ORGANISATION.ORGANISATIONID", pOrganisationId)
+ .buildSql("select ORGANISATION.NAME from ORGANISATION"));
+ }
+ return orgname;
+};
+
+/**
+ * a static Utility class for contacts
*
* Do not create an instance of this!
* @class
--
GitLab
From 6235ba20247728104730cecb087a8e6920e39b63 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 22 Mar 2019 13:56:46 +0100
Subject: [PATCH 007/250] displayValueProcess for keywords
---
entity/Activity_entity/Activity_entity.aod | 1 +
.../entityfields/category/displayValueProcess.js | 6 ++++++
entity/Contract_entity/Contract_entity.aod | 3 +++
.../entityfields/contractstatus/displayValueProcess.js | 6 ++++++
.../entityfields/contracttype/displayValueProcess.js | 6 ++++++
.../entityfields/payment/displayValueProcess.js | 6 ++++++
entity/KeywordAttribute_entity/KeywordAttribute_entity.aod | 1 +
.../entityfields/type/displayValueProcess.js | 6 ++++++
entity/Offer_entity/Offer_entity.aod | 4 ++++
.../entityfields/deliveryterms/displayValueProcess.js | 6 ++++++
.../entityfields/paymentterms/displayValueProcess.js | 6 ++++++
.../entityfields/probability/displayValueProcess.js | 6 ++++++
.../Offer_entity/entityfields/status/displayValueProcess.js | 6 ++++++
entity/Offeritem_entity/Offeritem_entity.aod | 1 +
.../entityfields/groupcodeid/displayValueProcess.js | 6 ++++++
.../Offeritem_entity/entityfields/quantity/onValueChange.js | 4 +++-
.../Offeritem_entity/entityfields/quantity/valueProcess.js | 2 +-
entity/Order_entity/Order_entity.aod | 1 +
.../Order_entity/entityfields/status/displayValueProcess.js | 6 ++++++
entity/Orderitem_entity/Orderitem_entity.aod | 2 ++
.../entityfields/groupcodeid/displayValueProcess.js | 6 ++++++
.../entityfields/unit/displayValueProcess.js | 6 ++++++
entity/Organisation_entity/Organisation_entity.aod | 2 ++
.../entityfields/status/displayValueProcess.js | 6 ++++++
.../entityfields/type/displayValueProcess.js | 6 ++++++
entity/Product_entity/Product_entity.aod | 2 ++
.../entityfields/groupcodeid/displayValueProcess.js | 6 ++++++
.../Product_entity/entityfields/unit/displayValueProcess.js | 6 ++++++
entity/Productprice_entity/Productprice_entity.aod | 1 +
.../entityfields/currency/displayValueProcess.js | 6 ++++++
.../SalesprojectCompetition_entity.aod | 3 +++
.../entityfields/phase/displayValueProcess.js | 6 ++++++
.../entityfields/reason/displayValueProcess.js | 6 ++++++
.../entityfields/status/displayValueProcess.js | 6 ++++++
.../SalesprojectForecast_entity.aod | 1 +
.../entityfields/groupcode/displayValueProcess.js | 6 ++++++
.../SalesprojectMember_entity/SalesprojectMember_entity.aod | 1 +
.../entityfields/salesproject_role/displayValueProcess.js | 6 ++++++
.../SalesprojectSource_entity/SalesprojectSource_entity.aod | 1 +
.../entityfields/source/displayValueProcess.js | 6 ++++++
entity/Salesproject_entity/Salesproject_entity.aod | 3 +++
.../entityfields/phase/displayValueProcess.js | 6 ++++++
.../entityfields/probability/displayValueProcess.js | 6 ++++++
.../entityfields/state/displayValueProcess.js | 6 ++++++
entity/Stock_entity/Stock_entity.aod | 1 +
.../entityfields/warehouse/displayValueProcess.js | 6 ++++++
entity/Task_entity/Task_entity.aod | 1 +
entity/Task_entity/entityfields/type/displayValueProcess.js | 6 ++++++
process/Product_lib/process.js | 6 ++++--
49 files changed, 211 insertions(+), 4 deletions(-)
create mode 100644 entity/Activity_entity/entityfields/category/displayValueProcess.js
create mode 100644 entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js
create mode 100644 entity/Contract_entity/entityfields/contracttype/displayValueProcess.js
create mode 100644 entity/Contract_entity/entityfields/payment/displayValueProcess.js
create mode 100644 entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js
create mode 100644 entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js
create mode 100644 entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js
create mode 100644 entity/Offer_entity/entityfields/probability/displayValueProcess.js
create mode 100644 entity/Offer_entity/entityfields/status/displayValueProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js
create mode 100644 entity/Order_entity/entityfields/status/displayValueProcess.js
create mode 100644 entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js
create mode 100644 entity/Orderitem_entity/entityfields/unit/displayValueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/status/displayValueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/type/displayValueProcess.js
create mode 100644 entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js
create mode 100644 entity/Product_entity/entityfields/unit/displayValueProcess.js
create mode 100644 entity/Productprice_entity/entityfields/currency/displayValueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
create mode 100644 entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
create mode 100644 entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
create mode 100644 entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/phase/displayValueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/probability/displayValueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/state/displayValueProcess.js
create mode 100644 entity/Stock_entity/entityfields/warehouse/displayValueProcess.js
create mode 100644 entity/Task_entity/entityfields/type/displayValueProcess.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 7682554996..77672a2f2c 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -41,6 +41,7 @@
<consumer>KeywordCategories</consumer>
<mandatory v="false" />
<groupable v="true" />
+ <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>SUBJECT</name>
diff --git a/entity/Activity_entity/entityfields/category/displayValueProcess.js b/entity/Activity_entity/entityfields/category/displayValueProcess.js
new file mode 100644
index 0000000000..05aefdcf53
--- /dev/null
+++ b/entity/Activity_entity/entityfields/category/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 987a03e9e7..aad7b187cb 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -55,17 +55,20 @@
<name>CONTRACTSTATUS</name>
<title>${CONTRACT_STATUS}</title>
<consumer>ContractStates</consumer>
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CONTRACTTYPE</name>
<title>Type of contract</title>
<consumer>ContractTypes</consumer>
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>PAYMENT</name>
<title>Payment method</title>
<consumer>ContractPayments</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js b/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js
new file mode 100644
index 0000000000..66bf177f66
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contractStatus(), vars.get("$field.CONTRACTSTATUS")));
diff --git a/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js b/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js
new file mode 100644
index 0000000000..71f2a895f0
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.get("$field.CONTRACTTYPE")));
diff --git a/entity/Contract_entity/entityfields/payment/displayValueProcess.js b/entity/Contract_entity/entityfields/payment/displayValueProcess.js
new file mode 100644
index 0000000000..3129346218
--- /dev/null
+++ b/entity/Contract_entity/entityfields/payment/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contractPayment(), vars.get("$field.PAYMENT")));
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index a1ae369eeb..0bd9afbf6e 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -34,6 +34,7 @@
<title>Type</title>
<consumer>KeywordAttributeTypes</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityProvider>
<name>SpecificContainerKeyword</name>
diff --git a/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js b/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js
new file mode 100644
index 0000000000..9c4c0c7870
--- /dev/null
+++ b/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.keywordAttributeType(), vars.get("$field.TYPE")));
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d716537eff..6c8bb2d1b7 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -44,6 +44,7 @@
<name>PROBABILITY</name>
<title>Probability</title>
<consumer>KeywordProbabilities</consumer>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
@@ -76,6 +77,7 @@
<title>Status</title>
<consumer>KeywordOfferStates</consumer>
<state>EDITABLE</state>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VAT</name>
@@ -528,11 +530,13 @@
<name>PAYMENTTERMS</name>
<title>Payment term</title>
<consumer>KeywordPaymentTerm</consumer>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DELIVERYTERMS</name>
<title>Deliveryspecification</title>
<consumer>KeywordDeliveryTerm</consumer>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordPaymentTerm</name>
diff --git a/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js
new file mode 100644
index 0000000000..61db9c5b10
--- /dev/null
+++ b/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), vars.get("$field.DELIVERYTERMS")));
diff --git a/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js b/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js
new file mode 100644
index 0000000000..28d34ae5de
--- /dev/null
+++ b/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.paymentTerm(), vars.get("$field.PAYMENTTERMS")));
diff --git a/entity/Offer_entity/entityfields/probability/displayValueProcess.js b/entity/Offer_entity/entityfields/probability/displayValueProcess.js
new file mode 100644
index 0000000000..888f3e80c6
--- /dev/null
+++ b/entity/Offer_entity/entityfields/probability/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.offerProbability(), vars.get("$field.PROBABILITY")));
diff --git a/entity/Offer_entity/entityfields/status/displayValueProcess.js b/entity/Offer_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000..5e51722dd9
--- /dev/null
+++ b/entity/Offer_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.offerStatus(), vars.get("$field.STATUS")));
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 6f68d416a8..f330271f5d 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -24,6 +24,7 @@
<title>Commodity group</title>
<consumer>KeywordProductGroupcodes</consumer>
<state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ITEMNAME</name>
diff --git a/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js b/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js
new file mode 100644
index 0000000000..ce477b6704
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index f6cb10a458..e0c1c63a3d 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -3,6 +3,7 @@ import("system.neon");
import("Product_lib");
import("Util_lib");
import("Entity_lib");
+import("Attribute_lib");
var pid = vars.get("$field.PRODUCT_ID");
var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUANTITY"));
@@ -10,8 +11,9 @@ if(pid != "" && newQuantity != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
- var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid };
+ var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid, priceList: pricelist };
var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
diff --git a/entity/Offeritem_entity/entityfields/quantity/valueProcess.js b/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
index ebd4664e61..801a9cf46f 100644
--- a/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("system.neon");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
result.string("1");
}
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index e7c5d42244..bac5056c81 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -70,6 +70,7 @@
<title>Status</title>
<consumer>KeywordStates</consumer>
<state>EDITABLE</state>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VAT</name>
diff --git a/entity/Order_entity/entityfields/status/displayValueProcess.js b/entity/Order_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000..70976b2e02
--- /dev/null
+++ b/entity/Order_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.get("$field.STATUS")));
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 560c0b7fac..c7e1d5c6d7 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -22,6 +22,7 @@
<title>Commodity group</title>
<consumer>KeywordProductGroupcodes</consumer>
<state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ITEMNAME</name>
@@ -82,6 +83,7 @@
<name>UNIT</name>
<title>Unit</title>
<consumer>KeywordQuantityUnits</consumer>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VAT</name>
diff --git a/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js b/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js
new file mode 100644
index 0000000000..ce477b6704
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
diff --git a/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js b/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js
new file mode 100644
index 0000000000..0149bf2040
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), vars.get("$field.UNIT")));
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 7189615ed7..262a7751a9 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -51,11 +51,13 @@
<title>Status</title>
<consumer>KeywordContactStates</consumer>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TYPE</name>
<title>Type</title>
<consumer>KeywordOrganisationTypes</consumer>
+ <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Activities</name>
diff --git a/entity/Organisation_entity/entityfields/status/displayValueProcess.js b/entity/Organisation_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000..cc03068b7c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.STATUS")));
diff --git a/entity/Organisation_entity/entityfields/type/displayValueProcess.js b/entity/Organisation_entity/entityfields/type/displayValueProcess.js
new file mode 100644
index 0000000000..06795c5d70
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/type/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.organisationType(), vars.get("$field.TYPE")));
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 52746fccf0..817b35a0aa 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -20,6 +20,7 @@
<title>Product group</title>
<consumer>KeywordProductGroupcodes</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>MINSTOCK</name>
@@ -60,6 +61,7 @@
<title>Unit</title>
<consumer>KeywordQuantityUnits</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>currentPurchasePrice</name>
diff --git a/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js b/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js
new file mode 100644
index 0000000000..ce477b6704
--- /dev/null
+++ b/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
diff --git a/entity/Product_entity/entityfields/unit/displayValueProcess.js b/entity/Product_entity/entityfields/unit/displayValueProcess.js
new file mode 100644
index 0000000000..0149bf2040
--- /dev/null
+++ b/entity/Product_entity/entityfields/unit/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), vars.get("$field.UNIT")));
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 509d6a1fb6..988c07972e 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -18,6 +18,7 @@
<title>Currency</title>
<consumer>KeywordCurrencies</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>FROMQUANTITY</name>
diff --git a/entity/Productprice_entity/entityfields/currency/displayValueProcess.js b/entity/Productprice_entity/entityfields/currency/displayValueProcess.js
new file mode 100644
index 0000000000..c268b6c47a
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/currency/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 79a4e24f54..9c47256f3f 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -24,6 +24,7 @@
<title>Reason</title>
<consumer>KeywordWonLost</consumer>
<selectionMode>SINGLE</selectionMode>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>SALESPROJECT_COMPETITIONID</name>
@@ -38,6 +39,7 @@
<title>State</title>
<consumer>KeywordStates</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>SalesprojectId_param</name>
@@ -130,6 +132,7 @@
<name>PHASE</name>
<title>Phase</title>
<consumer>KeywordPhases</consumer>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordPricePolitics</name>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
new file mode 100644
index 0000000000..dda454b255
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
diff --git a/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js
new file mode 100644
index 0000000000..4058d229ee
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectWonLost(), vars.get("$field.REASON")));
diff --git a/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000..9dd81c4237
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATUS")));
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 2ad3d06743..824d4d5547 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -19,6 +19,7 @@
<name>GROUPCODE</name>
<title>Product</title>
<consumer>KeywordProductGroupcodes</consumer>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>INFO</name>
diff --git a/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js b/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
new file mode 100644
index 0000000000..aa76ca3c49
--- /dev/null
+++ b/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODE")));
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 2dc7e8f234..75a4372f98 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -26,6 +26,7 @@
<name>SALESPROJECT_ROLE</name>
<title>Role</title>
<consumer>KeywordMemberRoles</consumer>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js</displayValueProcess>
</entityField>
<entityProvider>
<name>SalesprojectMembers</name>
diff --git a/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js b/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
new file mode 100644
index 0000000000..c44ff2976c
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectMemberRole(), vars.get("$field.SALESPROJECT_ROLE")));
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 012013e756..c8c6e96745 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -57,6 +57,7 @@
<name>SOURCE</name>
<title>Touchpoint</title>
<consumer>KeywordSources</consumer>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordSources</name>
diff --git a/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js b/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
new file mode 100644
index 0000000000..b3db488792
--- /dev/null
+++ b/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectSource(), vars.get("$field.SOURCE")));
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 216089b1c4..1fb2469e52 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -41,6 +41,7 @@
<title>Phase</title>
<consumer>KeywordPhases</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>PROJECTCODE</name>
@@ -80,6 +81,7 @@
<title>Status</title>
<consumer>KeywordStates</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VOLUME</name>
@@ -102,6 +104,7 @@
<name>PROBABILITY</name>
<title>Probability</title>
<consumer>KeywordProbabilties</consumer>
+ <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
diff --git a/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js b/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js
new file mode 100644
index 0000000000..dda454b255
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
diff --git a/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js b/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js
new file mode 100644
index 0000000000..883b399d25
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectProbability(), vars.get("$field.PROBABILITY")));
diff --git a/entity/Salesproject_entity/entityfields/state/displayValueProcess.js b/entity/Salesproject_entity/entityfields/state/displayValueProcess.js
new file mode 100644
index 0000000000..4b194ebac2
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/state/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATE")));
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 6078334545..c53691f953 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -46,6 +46,7 @@
<title>Warehouse</title>
<consumer>KeywordWarehouses</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js</displayValueProcess>
</entityField>
<entityProvider>
<name>Stocks</name>
diff --git a/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js b/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js
new file mode 100644
index 0000000000..11e584c4e1
--- /dev/null
+++ b/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.stockWarehouse(), vars.get("$field.WAREHOUSE")));
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 7093a20568..1bd9acec26 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -84,6 +84,7 @@
<searchable v="false" />
<groupable v="false" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
diff --git a/entity/Task_entity/entityfields/type/displayValueProcess.js b/entity/Task_entity/entityfields/type/displayValueProcess.js
new file mode 100644
index 0000000000..b8b8e7a4a3
--- /dev/null
+++ b/entity/Task_entity/entityfields/type/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskType(), vars.get("$field.TYPE")));
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index cdf6241f48..6ee4f51c5d 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.util");
import("system.SQLTYPES");
import("system.datetime");
@@ -173,6 +174,7 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
validPriceLists = true;
var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
, "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
+ orderby = orderby.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
cols = cols.concat(colsPricelistValid);
joins.push("left join PRODUCTPRICE validPP on "
@@ -182,7 +184,7 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
.andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
.andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
.andSqlCondition(SqlCondition.begin()
- .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId, "# <= ?")
+ .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
.orSqlCondition(SqlCondition.begin()
.and("validPP.CONTACT_ID is null")
.andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'),
@@ -196,7 +198,7 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
.buildSql("select " + cols.join(", ") + " from PRODUCT " + joins.join(" "),
"1 = 2",
"order by " + orderby.join(", "))
-
+logging.log(ProductDataSql.toSource())
var ProductData = db.table(ProductDataSql);
for (var i = 0; i < ProductData.length; i++)
--
GitLab
From d551f31a0a4b395947bfd0bdbd9877f7c0ae498c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 22 Mar 2019 14:01:24 +0100
Subject: [PATCH 008/250] updated language translations
---
.../_____LANGUAGE_EXTRA.aod | 103 ++++++++++++++++-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 108 ++++++++++++++++--
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 103 ++++++++++++++++-
3 files changed, 294 insertions(+), 20 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 1be3f6f961..fe4916e19a 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2440,19 +2440,112 @@
<key>Contactrole</key>
</entry>
<entry>
- <key>new contact</key>
+ <key>Object tree</key>
</entry>
<entry>
- <key>Posistion</key>
+ <key>New appointment</key>
</entry>
<entry>
- <key>Object tree</key>
+ <key>&Aufg / Term (%0/%1)</key>
+ </entry>
+ <entry>
+ <key>Verschieben auf Datum?</key>
+ </entry>
+ <entry>
+ <key>niedrig</key>
+ </entry>
+ <entry>
+ <key>Gebucht</key>
+ </entry>
+ <entry>
+ <key>Other Contactroles</key>
+ </entry>
+ <entry>
+ <key>Bitte Datumseingabe prüfen!</key>
+ </entry>
+ <entry>
+ <key>In Bearbeitung</key>
+ </entry>
+ <entry>
+ <key>OK</key>
+ </entry>
+ <entry>
+ <key>Nicht begonnen</key>
+ </entry>
+ <entry>
+ <key>Bitte Filterbedingungen setzen</key>
+ </entry>
+ <entry>
+ <key>Bestätigt</key>
+ </entry>
+ <entry>
+ <key>Vorläufig</key>
+ </entry>
+ <entry>
+ <key>keine</key>
+ </entry>
+ <entry>
+ <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
+ </entry>
+ <entry>
+ <key>Aufgaben von</key>
+ </entry>
+ <entry>
+ <key>&Aufgaben (%0)</key>
+ </entry>
+ <entry>
+ <key>erledigt / zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>hoch</key>
+ </entry>
+ <entry>
+ <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+ </entry>
+ <entry>
+ <key>Zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>Erledigt</key>
+ </entry>
+ <entry>
+ <key>Usages</key>
+ </entry>
+ <entry>
+ <key>Abgesagt</key>
+ </entry>
+ <entry>
+ <key>Außer Haus</key>
+ </entry>
+ <entry>
+ <key>Abbrechen</key>
+ </entry>
+ <entry>
+ <key>Benutzer auswählen</key>
+ </entry>
+ <entry>
+ <key>delegiert</key>
+ </entry>
+ <entry>
+ <key>frei</key>
+ </entry>
+ <entry>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+ </entry>
+ <entry>
+ <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+ </entry>
+ <entry>
+ <key>normal</key>
+ </entry>
+ <entry>
+ <key>Termine von</key>
</entry>
<entry>
- <key>New Appointment</key>
+ <key>nur Verschiebung in die Zukunft erlaubt!</key>
</entry>
<entry>
- <key>New contact</key>
+ <key>Kategorie</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 58d292f3c4..94c3e93d5f 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -204,10 +204,6 @@
<key>Addresses</key>
<value>Adressen</value>
</entry>
- <entry>
- <key>New Appointment</key>
- <value>Neuer Termin</value>
- </entry>
<entry>
<key>Contact type</key>
<value>Kontaktart</value>
@@ -3178,18 +3174,110 @@
<value>Funktion</value>
</entry>
<entry>
- <key>New contact</key>
- <value>Neuer Kontakt</value>
+ <key>Object tree</key>
</entry>
<entry>
- <key>Posistion</key>
+ <key>&Aufg / Term (%0/%1)</key>
</entry>
<entry>
- <key>Object tree</key>
+ <key>Verschieben auf Datum?</key>
+ </entry>
+ <entry>
+ <key>niedrig</key>
+ </entry>
+ <entry>
+ <key>Gebucht</key>
+ </entry>
+ <entry>
+ <key>Other Contactroles</key>
+ <value>Weitere Funktionen</value>
+ </entry>
+ <entry>
+ <key>Bitte Datumseingabe prüfen!</key>
+ </entry>
+ <entry>
+ <key>In Bearbeitung</key>
+ </entry>
+ <entry>
+ <key>OK</key>
+ </entry>
+ <entry>
+ <key>Nicht begonnen</key>
+ </entry>
+ <entry>
+ <key>Bitte Filterbedingungen setzen</key>
+ </entry>
+ <entry>
+ <key>Bestätigt</key>
+ </entry>
+ <entry>
+ <key>Vorläufig</key>
+ </entry>
+ <entry>
+ <key>keine</key>
+ </entry>
+ <entry>
+ <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
+ </entry>
+ <entry>
+ <key>Aufgaben von</key>
+ </entry>
+ <entry>
+ <key>&Aufgaben (%0)</key>
+ </entry>
+ <entry>
+ <key>erledigt / zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>hoch</key>
+ </entry>
+ <entry>
+ <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+ </entry>
+ <entry>
+ <key>Zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>Erledigt</key>
+ </entry>
+ <entry>
+ <key>Usages</key>
+ </entry>
+ <entry>
+ <key>Abgesagt</key>
+ </entry>
+ <entry>
+ <key>Außer Haus</key>
+ </entry>
+ <entry>
+ <key>Abbrechen</key>
+ </entry>
+ <entry>
+ <key>Benutzer auswählen</key>
+ </entry>
+ <entry>
+ <key>delegiert</key>
+ </entry>
+ <entry>
+ <key>frei</key>
+ </entry>
+ <entry>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+ </entry>
+ <entry>
+ <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+ </entry>
+ <entry>
+ <key>normal</key>
+ </entry>
+ <entry>
+ <key>Termine von</key>
+ </entry>
+ <entry>
+ <key>nur Verschiebung in die Zukunft erlaubt!</key>
</entry>
<entry>
- <key>new contact</key>
- <value>Neuer Kontakt</value>
+ <key>Kategorie</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 7eddc64ec8..989834a3fd 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2464,19 +2464,112 @@
<key>Contactrole</key>
</entry>
<entry>
- <key>new contact</key>
+ <key>Object tree</key>
</entry>
<entry>
- <key>Posistion</key>
+ <key>New appointment</key>
</entry>
<entry>
- <key>Object tree</key>
+ <key>&Aufg / Term (%0/%1)</key>
+ </entry>
+ <entry>
+ <key>Verschieben auf Datum?</key>
+ </entry>
+ <entry>
+ <key>niedrig</key>
+ </entry>
+ <entry>
+ <key>Gebucht</key>
+ </entry>
+ <entry>
+ <key>Other Contactroles</key>
+ </entry>
+ <entry>
+ <key>Bitte Datumseingabe prüfen!</key>
+ </entry>
+ <entry>
+ <key>In Bearbeitung</key>
+ </entry>
+ <entry>
+ <key>OK</key>
+ </entry>
+ <entry>
+ <key>Nicht begonnen</key>
+ </entry>
+ <entry>
+ <key>Bitte Filterbedingungen setzen</key>
+ </entry>
+ <entry>
+ <key>Bestätigt</key>
+ </entry>
+ <entry>
+ <key>Vorläufig</key>
+ </entry>
+ <entry>
+ <key>keine</key>
+ </entry>
+ <entry>
+ <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
+ </entry>
+ <entry>
+ <key>Aufgaben von</key>
+ </entry>
+ <entry>
+ <key>&Aufgaben (%0)</key>
+ </entry>
+ <entry>
+ <key>erledigt / zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>hoch</key>
+ </entry>
+ <entry>
+ <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+ </entry>
+ <entry>
+ <key>Zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>Erledigt</key>
+ </entry>
+ <entry>
+ <key>Usages</key>
+ </entry>
+ <entry>
+ <key>Abgesagt</key>
+ </entry>
+ <entry>
+ <key>Außer Haus</key>
+ </entry>
+ <entry>
+ <key>Abbrechen</key>
+ </entry>
+ <entry>
+ <key>Benutzer auswählen</key>
+ </entry>
+ <entry>
+ <key>delegiert</key>
+ </entry>
+ <entry>
+ <key>frei</key>
+ </entry>
+ <entry>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+ </entry>
+ <entry>
+ <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+ </entry>
+ <entry>
+ <key>normal</key>
+ </entry>
+ <entry>
+ <key>Termine von</key>
</entry>
<entry>
- <key>New Appointment</key>
+ <key>nur Verschiebung in die Zukunft erlaubt!</key>
</entry>
<entry>
- <key>New contact</key>
+ <key>Kategorie</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
--
GitLab
From 6a55c9e3e4ae40e474d5058a6276af9b70d0b74d Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Fri, 22 Mar 2019 14:35:31 +0100
Subject: [PATCH 009/250] add more ChartTypes to Turnover
---
.../TurnoverChart_view/TurnoverChart_view.aod | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 4b2453ee6e..093b1e4038 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -39,6 +39,33 @@
</multiDataChartViewTemplate>
<multiDataChartViewTemplate>
<name>LineChart</name>
+ <chartType>LINE</chartType>
+ <xAxis>X</xAxis>
+ <yAxis>Y</yAxis>
+ <parentField>PARENT</parentField>
+ <categoryField>CATEGORY</categoryField>
+ <entityField>#ENTITY</entityField>
+ </multiDataChartViewTemplate>
+ <multiDataChartViewTemplate>
+ <name>AreaChart</name>
+ <chartType>AREA</chartType>
+ <xAxis>X</xAxis>
+ <yAxis>Y</yAxis>
+ <parentField>PARENT</parentField>
+ <categoryField>CATEGORY</categoryField>
+ <entityField>#ENTITY</entityField>
+ </multiDataChartViewTemplate>
+ <multiDataChartViewTemplate>
+ <name>BarChart</name>
+ <chartType>BAR</chartType>
+ <xAxis>X</xAxis>
+ <yAxis>Y</yAxis>
+ <parentField>PARENT</parentField>
+ <categoryField>CATEGORY</categoryField>
+ <entityField>#ENTITY</entityField>
+ </multiDataChartViewTemplate>
+ <multiDataChartViewTemplate>
+ <name>SplineChart</name>
<chartType>SPLINE</chartType>
<xAxis>X</xAxis>
<yAxis>Y</yAxis>
--
GitLab
From 39ea49f1a61b5d13b0ab4e1025e3517cbb9ad9da Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 13:47:07 +0100
Subject: [PATCH 010/250] Weitere explizite expose entfernen
---
.../KeywordAttributeRelation_entity.aod | 1 -
.../KeywordEntry_entity.aod | 2 -
.../ModuleTree_entity/ModuleTree_entity.aod | 2 -
.../ObjectRelation_entity.aod | 2 -
entity/Object_entity/Object_entity.aod | 3 -
entity/Offer_entity/Offer_entity.aod | 60 ++++++++++++++++---
entity/Offeritem_entity/Offeritem_entity.aod | 4 --
entity/Orderitem_entity/Orderitem_entity.aod | 18 ------
8 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 5a7e7aea17..70b9c0c27f 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -55,7 +55,6 @@
<children>
<entityParameter>
<name>KeywordEntryId_param</name>
- <expose v="true" />
<triggerRecalculation v="false" />
<mandatory v="false" />
</entityParameter>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 4ee519d2d2..cb5fb23196 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -371,12 +371,10 @@
<entityParameter>
<name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
<name>ContainerName_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 775888a81b..cba8cd0680 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -40,11 +40,9 @@
<children>
<entityParameter>
<name>ContextName_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>ID_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index a654723375..68ef46cbeb 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -84,12 +84,10 @@
<children>
<entityParameter>
<name>ObjectRowid_param</name>
- <expose v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
- <expose v="true" />
<mandatory v="true" />
</entityParameter>
</children>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 58bf718a57..d3f9290270 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -43,13 +43,11 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
- <expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
@@ -94,7 +92,6 @@
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
- <expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 6c8bb2d1b7..bacfebdc53 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -164,7 +164,6 @@
<name>SalesprojectId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
@@ -180,13 +179,41 @@
</entityDependency>
</dependencies>
<children>
+ <entityParameter>
+ <name>OfferAddress_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCode_param</name>
+ <expose v="false" />
+ </entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCurrency_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferHeader_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferLanguage_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferOriginal_Id_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferVersnr_param</name>
+ <expose v="false" />
</entityParameter>
<entityParameter>
<name>SalesprojectId_param</name>
- <expose v="true" />
+ <mandatory v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -242,7 +269,6 @@
<name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
@@ -457,16 +483,32 @@
</dependencies>
<children>
<entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
+ <name>OfferOriginal_Id_param</name>
+ <expose v="false" />
</entityParameter>
<entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
+ <name>OfferHeader_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCurrency_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferVersnr_param</name>
+ <expose v="false" />
</entityParameter>
<entityParameter>
<name>OfferLanguage_param</name>
- <expose v="true" />
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <mandatory v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index f330271f5d..ec89403fb7 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -159,20 +159,16 @@
<children>
<entityParameter>
<name>ContactId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>Currency_param</name>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>OfferId_param</name>
- <expose v="true" />
</entityParameter>
<entityParameter>
<name>OfferStatus_param</name>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index c7e1d5c6d7..b3d6f8a1b7 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -148,24 +148,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>INFO</name>
--
GitLab
From 4000a4bba56a897e1fc8c3baeec2a22c622020fd Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 14:53:55 +0100
Subject: [PATCH 011/250] fix salesproject
---
.../SalesprojectCompetition_entity.aod | 1 +
.../SalesprojectForecast_entity.aod | 1 -
.../recordcontainers/db/onDBUpdate.js | 3 ---
.../SalesprojectCompetitionPreview_view.aod | 2 ++
.../SalesprojectForecastPreview_view.aod | 4 +++-
.../SalesprojectMemberEdit_view.aod | 4 ----
.../SalesprojectSourcePreview_view.aod | 8 +++++---
7 files changed, 11 insertions(+), 12 deletions(-)
delete mode 100644 entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 9c47256f3f..bdd5fa2a86 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -72,6 +72,7 @@
<title>Organisation</title>
<consumer>Organisations</consumer>
<linkedContext>Organisation</linkedContext>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>ORGANISATION_NAME</name>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 824d4d5547..f58b697cca 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -88,7 +88,6 @@
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBUpdate>%aditoprj%/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>29b759fb-1d0a-4262-b6af-0da5f3985eb3</name>
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js b/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
deleted file mode 100644
index ee62dca4c5..0000000000
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("Salesproject_lib");
-
-Salesproject.notifyToUpdateForecast()
\ No newline at end of file
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 89dbc0919c..556305ff42 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -16,6 +16,8 @@
</cardViewTemplate>
<genericViewTemplate>
<name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
index 97e8375375..c8ddeb76d2 100644
--- a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
+++ b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
@@ -10,12 +10,14 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <titleField>TYPE</titleField>
+ <titleField>GROUPCODE</titleField>
<descriptionField>DATE_START</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
index c1adcb7f7f..6005e46c72 100644
--- a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
+++ b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
@@ -21,10 +21,6 @@
<name>b74ab5a3-2d3c-49e6-b7df-219b16ca22fd</name>
<entityField>SALESPROJECT_ROLE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>cde86703-28d1-43f7-a216-7d7ab3d6137b</name>
- <entityField>RELATIONSHIP</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
index e76797bd39..5b907e2c92 100644
--- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
+++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
@@ -11,16 +11,18 @@
<cardViewTemplate>
<name>Header</name>
<titleField>SOURCE</titleField>
- <descriptionField>ENTRYDATE</descriptionField>
+ <descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>e21bd1a0-368c-4842-bbfb-23db50c20ef7</name>
- <entityField>INFO</entityField>
+ <name>7c61ec34-3206-4dba-96cf-24fe0112bf7b</name>
+ <entityField>ENTRYDATE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
--
GitLab
From c7abdd37442948ff23b5212747a6fd9c76546ddd Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 15:02:28 +0100
Subject: [PATCH 012/250] Revert: Explizit exposte Parameter
---
.../ActivityLink_entity.aod | 1 +
entity/Activity_entity/Activity_entity.aod | 3 +
.../AddressType_entity/AddressType_entity.aod | 1 +
entity/Address_entity/Address_entity.aod | 6 ++
.../AppointmentLink_entity.aod | 1 +
entity/Attribute_entity/Attribute_entity.aod | 23 +++++++
.../Communication_entity.aod | 8 ++-
entity/Context_entity/Context_entity.aod | 4 ++
entity/Contract_entity/Contract_entity.aod | 6 ++
entity/Document_entity/Document_entity.aod | 9 ++-
.../KeywordAttributeRelation_entity.aod | 1 +
.../KeywordEntry_entity.aod | 2 +
.../ModuleTree_entity/ModuleTree_entity.aod | 2 +
.../ObjectRelation_entity.aod | 2 +
entity/Object_entity/Object_entity.aod | 3 +
entity/Offer_entity/Offer_entity.aod | 60 +++----------------
entity/Offeritem_entity/Offeritem_entity.aod | 4 ++
entity/Orderitem_entity/Orderitem_entity.aod | 18 ++++++
18 files changed, 100 insertions(+), 54 deletions(-)
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index af831d9294..34b9c2ad50 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -46,6 +46,7 @@
<children>
<entityParameter>
<name>ActivityId_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 77672a2f2c..dc0e95ce40 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -237,12 +237,15 @@
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>RowId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>PresetLinks_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>ParentContext_param</name>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index a0d88164c5..48ca8e67b9 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -32,6 +32,7 @@
<children>
<entityParameter>
<name>UsageFilter_param</name>
+ <expose v="true" />
<mandatory v="true" />
</entityParameter>
</children>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 86da7fdbdb..67b08770d2 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -90,9 +90,11 @@
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>OrganisationId_param</name>
@@ -133,9 +135,11 @@
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -218,9 +222,11 @@
</entityParameter>
<entityParameter>
<name>OrganisationId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 2b4479624a..47911cce2a 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -49,6 +49,7 @@
<children>
<entityParameter>
<name>AppointmentId_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 3bd2589ca4..405955e8bd 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -79,9 +79,18 @@
</entityDependency>
</dependencies>
<children>
+ <entityParameter>
+ <name>AttrParentType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <expose v="true" />
+ </entityParameter>
<entityParameter>
<name>GetGroups_param</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeparent/children/getgroups_param/valueProcess.js</valueProcess>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -168,6 +177,20 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>FilteredAttributeIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>FULL_ATTRIBUTE_NAME</name>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 6b9d3b711e..3a60711e69 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -83,10 +83,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<children>
<entityParameter>
<name>CommCategory_param</name>
+ <expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
+ <expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
@@ -120,11 +122,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityParameter>
<name>CommCategory_param</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
+ <expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
@@ -158,11 +161,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityParameter>
<name>CommCategory_param</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
+ <expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 03dc38f45a..922b46b44d 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -50,6 +50,10 @@
<name>CONTEXT_NAME</name>
<title>Context name</title>
</entityField>
+ <entityProvider>
+ <name>Context</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index aad7b187cb..f50f874903 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -103,6 +103,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 9d6b3b524e..d4c10e0ed4 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -183,15 +183,19 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>Keyword_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -241,18 +245,21 @@
<entityParameter>
<name>Keyword_param</name>
<valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <expose v="true" />
<mandatory v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 70b9c0c27f..5a7e7aea17 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -55,6 +55,7 @@
<children>
<entityParameter>
<name>KeywordEntryId_param</name>
+ <expose v="true" />
<triggerRecalculation v="false" />
<mandatory v="false" />
</entityParameter>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index cb5fb23196..4ee519d2d2 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -371,10 +371,12 @@
<entityParameter>
<name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
<name>ContainerName_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index cba8cd0680..775888a81b 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -40,9 +40,11 @@
<children>
<entityParameter>
<name>ContextName_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>ID_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 68ef46cbeb..a654723375 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -84,10 +84,12 @@
<children>
<entityParameter>
<name>ObjectRowid_param</name>
+ <expose v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
+ <expose v="true" />
<mandatory v="true" />
</entityParameter>
</children>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index d3f9290270..58bf718a57 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -43,11 +43,13 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
+ <expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
+ <expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
@@ -92,6 +94,7 @@
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
+ <expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index bacfebdc53..6c8bb2d1b7 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -164,6 +164,7 @@
<name>SalesprojectId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
@@ -179,41 +180,13 @@
</entityDependency>
</dependencies>
<children>
- <entityParameter>
- <name>OfferAddress_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferCode_param</name>
- <expose v="false" />
- </entityParameter>
<entityParameter>
<name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferCurrency_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferHeader_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferLanguage_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferOriginal_Id_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferVersnr_param</name>
- <expose v="false" />
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>SalesprojectId_param</name>
- <mandatory v="true" />
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -269,6 +242,7 @@
<name>ContactId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
@@ -483,32 +457,16 @@
</dependencies>
<children>
<entityParameter>
- <name>OfferOriginal_Id_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferHeader_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferCurrency_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferVersnr_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferLanguage_param</name>
- <expose v="false" />
+ <name>ContactId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>SalesprojectId_param</name>
- <expose v="false" />
+ <expose v="true" />
</entityParameter>
<entityParameter>
- <name>ContactId_param</name>
- <mandatory v="true" />
+ <name>OfferLanguage_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index ec89403fb7..f330271f5d 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -159,16 +159,20 @@
<children>
<entityParameter>
<name>ContactId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>Currency_param</name>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>OfferId_param</name>
+ <expose v="true" />
</entityParameter>
<entityParameter>
<name>OfferStatus_param</name>
+ <expose v="true" />
</entityParameter>
</children>
</entityProvider>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index b3d6f8a1b7..c7e1d5c6d7 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -148,6 +148,24 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>INFO</name>
--
GitLab
From 91475930f93fb948ec3e893799116c219a1d8ba2 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 15:13:01 +0100
Subject: [PATCH 013/250] =?UTF-8?q?Angebotsposten:=20fix=20hinzuf=C3=BCgen?=
=?UTF-8?q?=20von=20Prtodukten=20ohne=20St=C3=BCckliste?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
process/OfferOrder_lib/process.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index f1c7180310..1b286d5154 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -271,8 +271,12 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
columns = columns.concat(additionalProductInfo.map(function(item) {return item[0]}));
var colTypes = db.getColumnTypes(table, columns);
+
// partsList[rootProdId] = root node
- __itemInsertStatement(partsList[rootProdId], assignedTo, currency, contactId);
+ if (partsList[rootProdId] != undefined) // if product has a parts list
+ {
+ __itemInsertStatement(partsList[rootProdId], assignedTo, currency, contactId);
+ }
if (statements.length > 0)
db.inserts(statements);
--
GitLab
From eab122c3c55491486eaa40d5cd2e5e637f07cb31 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 15:46:54 +0100
Subject: [PATCH 014/250] =?UTF-8?q?Testdaten=20f=C3=BCr=20St=C3=A4rke=20/?=
=?UTF-8?q?=20Schw=C3=A4che?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../_____LANGUAGE_EXTRA.aod | 18 ++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 24 ++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 18 ++++++
.../AditoBasic/update_Strength_Weakness.xml | 59 +++++++++++++++++++
.../data_alias/basic/2019.2/changelog.xml | 2 +
5 files changed, 121 insertions(+)
create mode 100644 others/db_changes/data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index fe4916e19a..19e7aa6f09 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2547,6 +2547,24 @@
<entry>
<key>Kategorie</key>
</entry>
+ <entry>
+ <key>Product content</key>
+ </entry>
+ <entry>
+ <key>Know How</key>
+ </entry>
+ <entry>
+ <key>Personal appearance</key>
+ </entry>
+ <entry>
+ <key>Market situation</key>
+ </entry>
+ <entry>
+ <key>Liquidity</key>
+ </entry>
+ <entry>
+ <key>Price policy</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 94c3e93d5f..2fe5ec6d2e 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3279,6 +3279,30 @@
<entry>
<key>Kategorie</key>
</entry>
+ <entry>
+ <key>Product content</key>
+ <value>Produktinhalt</value>
+ </entry>
+ <entry>
+ <key>Know How</key>
+ <value>Know How</value>
+ </entry>
+ <entry>
+ <key>Personal appearance</key>
+ <value>Persönliches Auftreten</value>
+ </entry>
+ <entry>
+ <key>Market situation</key>
+ <value>Marktsituation</value>
+ </entry>
+ <entry>
+ <key>Liquidity</key>
+ <value>Liquidität</value>
+ </entry>
+ <entry>
+ <key>Price policy</key>
+ <value>Preispolitik</value>
+ </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 989834a3fd..9fae765966 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2571,6 +2571,24 @@
<entry>
<key>Kategorie</key>
</entry>
+ <entry>
+ <key>Product content</key>
+ </entry>
+ <entry>
+ <key>Know How</key>
+ </entry>
+ <entry>
+ <key>Personal appearance</key>
+ </entry>
+ <entry>
+ <key>Market situation</key>
+ </entry>
+ <entry>
+ <key>Liquidity</key>
+ </entry>
+ <entry>
+ <key>Price policy</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
new file mode 100644
index 0000000000..437e3b8b61
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
@@ -0,0 +1,59 @@
+<?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="a.veogl" id="3e9548bd-2c3e-413f-a8b0-405d926f2790">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Price policy"/>
+ <where>AB_KEYWORD_ENTRYID = ? and TITLE = ?</where>
+ <whereParams>
+ <param value="7963d4ed-f7a7-4a9f-aa86-fea42167145f"/>
+ <param value="Strength 1"/>
+ </whereParams>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Personal appearance"/>
+ <where>AB_KEYWORD_ENTRYID = ? and TITLE = ?</where>
+ <whereParams>
+ <param value="2cacfe09-7dcd-454a-b263-46aee796bc21"/>
+ <param value="Strength 2"/>
+ </whereParams>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Product content"/>
+ <where>AB_KEYWORD_ENTRYID = ? and TITLE = ?</where>
+ <whereParams>
+ <param value="919cffee-5943-4105-a5bc-a14bd33b9f67"/>
+ <param value="Strength 3"/>
+ </whereParams>
+ </update>
+
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Know How"/>
+ <where>AB_KEYWORD_ENTRYID = ? and TITLE = ?</where>
+ <whereParams>
+ <param value="fd012937-8fe7-418e-8e55-80b3b5db331c"/>
+ <param value="Weakness 1"/>
+ </whereParams>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Market situation"/>
+ <where>AB_KEYWORD_ENTRYID = ? and TITLE = ?</where>
+ <whereParams>
+ <param value="b62e1a05-af41-4d2d-978c-6c2950b202d8"/>
+ <param value="Weakness 2"/>
+ </whereParams>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Liquidity"/>
+ <where>AB_KEYWORD_ENTRYID = ? and TITLE = ?</where>
+ <whereParams>
+ <param value="294db00d-6237-4db8-b7b6-41c5dc79a1e4"/>
+ <param value="Weakness 3"/>
+ </whereParams>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 139a4d6f45..a9809f5a9d 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -103,4 +103,6 @@
<include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
<include relativeToChangelogFile="true" file="Salesproject_add_column.xml"/>
+
+ <include relativeToChangelogFile="true" file="AditoBasic/update_Strength_Weakness.xml"/>
</databaseChangeLog>
--
GitLab
From fe1670c90ae29358b8b209f9ca9f6140e30b6237 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 22 Mar 2019 16:01:23 +0100
Subject: [PATCH 015/250] zwischenstand
---
.../AppointmentLink_entity.aod | 15 ++++++++--
.../objectid/displayValueProcess.js | 8 ++++++
.../objecttype/displayValueProcess.js | 2 ++
.../opencontext/onActionProcess.js | 5 ++++
.../Appointment_entity/Appointment_entity.aod | 2 ++
entity/Appointment_entity/afterUiInit.js | 23 +++++++++++++++
.../classification/valueProcess.js | 1 +
.../entityfields/summary/onValueChange.js | 10 +++++++
.../recordcontainers/jdito/contentProcess.js | 16 ++++++++++-
.../recordcontainers/jdito/onInsert.js | 4 ++-
.../newappointment/onActionProcess.js | 8 ++++--
.../AppointmentLink/AppointmentLink.aod | 6 ++++
.../AppointmentEdit_view.aod | 2 +-
.../AppointmentLinkEdit_view.aod | 28 +++++++++++++++++++
.../AppointmentLinkFilter_view.aod | 26 ++++++-----------
.../AppointmentPreview_view.aod | 5 ++++
process/Calendar_lib/process.js | 16 +++++++++--
17 files changed, 151 insertions(+), 26 deletions(-)
create mode 100644 entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
create mode 100644 entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
create mode 100644 entity/Appointment_entity/afterUiInit.js
create mode 100644 entity/Appointment_entity/entityfields/summary/onValueChange.js
create mode 100644 neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 47911cce2a..f5ead0f4e9 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -19,12 +19,17 @@
<entityField>
<name>OBJECTID</name>
<consumer>Objects</consumer>
- <linkedContext>Object_context</linkedContext>
+ <linkedContext>Object</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
</entityField>
<entityField>
<name>OBJECTTYPE</name>
<consumer>Context</consumer>
- <linkedContext>Context_context</linkedContext>
+ <linkedContext>Context</linkedContext>
<displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
@@ -50,6 +55,7 @@
<entityParameter>
<name>AppointmentId_param</name>
<expose v="true" />
+ <triggerRecalculation v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -79,6 +85,11 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>opencontext</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
new file mode 100644
index 0000000000..4667394dd7
--- /dev/null
+++ b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Context_lib")
+
+logging.log("name??")
+result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECTTYPE"), vars.get("$field.OBJECTID"))));
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
index bc84d07a9f..9600fe0fe7 100644
--- a/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
@@ -5,5 +6,6 @@ import("system.project");
if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE"))
{
+ logging.log("objecttype value: " + project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
}
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js b/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
new file mode 100644
index 0000000000..442af76990
--- /dev/null
+++ b/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
@@ -0,0 +1,5 @@
+import("system.logging");
+
+
+
+logging.log("derp");
\ No newline at end of file
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index afc0d97621..936bee1859 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -4,12 +4,14 @@
<title>Termin</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
+ <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityField>
<name>SUMMARY</name>
<title>Betreff</title>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>DESCRIPTION</name>
diff --git a/entity/Appointment_entity/afterUiInit.js b/entity/Appointment_entity/afterUiInit.js
new file mode 100644
index 0000000000..d55c53f2e1
--- /dev/null
+++ b/entity/Appointment_entity/afterUiInit.js
@@ -0,0 +1,23 @@
+import("system.util");
+import("system.neon");
+import("system.logging");
+import("system.vars");
+
+
+
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+ var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(entry["AppLinkContext"] && entry["AppLinkId"])
+ {
+ logging.log("hier geht lohos... " + vars.get("$field.UID") + " id");
+ neon.addRecord(null, "AppointmentLinks",
+ {
+ "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+ "OBJECTID" : entry["AppLinkId"],
+ "OBJECTTYPE" : entry["AppLinkContext"]
+ });
+ }
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/classification/valueProcess.js b/entity/Appointment_entity/entityfields/classification/valueProcess.js
index a4056b8834..ec7def641b 100644
--- a/entity/Appointment_entity/entityfields/classification/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/classification/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.neon");
import("system.vars");
import("system.calendars");
diff --git a/entity/Appointment_entity/entityfields/summary/onValueChange.js b/entity/Appointment_entity/entityfields/summary/onValueChange.js
new file mode 100644
index 0000000000..c2e271765a
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/summary/onValueChange.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+
+
+//var entry = JSON.parse(vars.get("$param.Entry_param"));
+//
+//entry[calendars.SUMMARY] = vars.get("$field.SUMMARY");
+//
+//neon.setFieldValue("$param.Entry_param", JSON.stringify(entry));
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 89cded5903..f215bb27df 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -4,6 +4,7 @@ import("system.calendars");
import("system.datetime");
import("system.eMath");
import("system.util");
+import("system.neon");
if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
{
@@ -22,7 +23,8 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
var enddate = entry[calendars.DTEND];
var links = entry[calendars.LINKS];
var description = entry[calendars.DESCRIPTION];
- var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
+ if(entry[calendars.ORGANIZER2] != undefined)
+ var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
var status = entry[calendars.STATUS];
var location = entry[calendars.LOCATION];
var reminder = entry[calendars.REMINDER_DURATION];
@@ -42,6 +44,18 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
} else {
rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
}
+
+// if(entry["AppLinkContext"] && entry["AppLinkId"])
+// {
+// logging.log("hier geht lohos... " + uid + " id");
+// neon.addRecord(null, "AppointmentLinks",
+// {
+// "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+// "APPOINTMENT_ID" : vars.get("$field.UID"),
+// "OBJECTID" : entry["AppLinkId"],
+// "OBJECTTYPE" : entry["AppLinkContext"]
+// });
+// }
//@TODO Icon
result.object([
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
index d6ebfc2d5a..8c5a320fa7 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
@@ -15,7 +15,7 @@ event[calendars.TYPE] = calendars.VEVENT;
event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer.
event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
event[calendars.STATUS] = vars.getString("$field.STATUS");
-event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
+//event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
event[calendars.LOCATION] = vars.get("$field.LOCATION");
event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
event[calendars.DTSTART] = vars.get("$field.BEGIN");
@@ -32,6 +32,8 @@ if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "
}
var idstringarray = calendars.insert([event]);
event[calendars.ID] = idstringarray[0];
+neon.setFieldValue("$field.UID", event[calendars.ID]);
+
vars.set("$context.editmode", calendars.MODE_UPDATE);
diff --git a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
index d5e0f5adb9..804ae6cd1e 100644
--- a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
@@ -1,10 +1,14 @@
+import("system.vars");
+import("system.logging");
import("system.neon");
import("system.calendars");
import("Calendar_lib");
import("system.date");
+import("Context_lib");
var params = {};
-params["Entry_param"] = CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false);
+params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
+
+neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
-neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/neonContext/AppointmentLink/AppointmentLink.aod b/neonContext/AppointmentLink/AppointmentLink.aod
index b94adc147f..f9df643499 100644
--- a/neonContext/AppointmentLink/AppointmentLink.aod
+++ b/neonContext/AppointmentLink/AppointmentLink.aod
@@ -2,11 +2,17 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>AppointmentLink</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>AppointmentLinkFilter_view</mainview>
<filterview>AppointmentLinkFilter_view</filterview>
+ <editview>AppointmentLinkEdit_view</editview>
<entity>AppointmentLink_entity</entity>
<references>
<neonViewReference>
<name>015bf8e9-621a-423d-8fd3-17ef264cc919</name>
+ <view>AppointmentLinkEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f0f803a8-74a4-4a96-a989-d3923b994280</name>
<view>AppointmentLinkFilter_view</view>
</neonViewReference>
</references>
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index be63a39d83..5fc6e7f8c4 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -35,7 +35,7 @@
<neonViewReference>
<name>39802b49-f67c-4796-ba05-105aa073d60c</name>
<entityField>AppointmentLinks</entityField>
- <view>AppointmentLinkFilter_view</view>
+ <view>AppointmentLinkEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod b/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
new file mode 100644
index 0000000000..f3d1d53ddd
--- /dev/null
+++ b/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
@@ -0,0 +1,28 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>AppointmentLinkEdit_view</name>
+ <title>relations</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>GenericMultiple</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>539c9844-8f4b-49e8-8974-30bdf127f47c</name>
+ <entityField>OBJECTTYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eba00f45-cd7e-43c0-9dea-559293ca7d49</name>
+ <entityField>OBJECTID</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index b08bd63a17..dfe97b2a59 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -1,28 +1,20 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
<name>AppointmentLinkFilter_view</name>
- <title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Connections</layoutCaption>
+ </drawerLayout>
</layout>
<children>
- <genericMultipleViewTemplate>
- <name>GenericMultiple</name>
- <autoNewRow v="true" />
+ <actionListViewTemplate>
+ <name>ölk</name>
+ <titleField>OBJECTID</titleField>
+ <descriptionField>OBJECTTYPE</descriptionField>
+ <entryAction>opencontext</entryAction>
<entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>539c9844-8f4b-49e8-8974-30bdf127f47c</name>
- <entityField>OBJECTTYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eba00f45-cd7e-43c0-9dea-559293ca7d49</name>
- <entityField>OBJECTID</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
+ </actionListViewTemplate>
</children>
</neonView>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 18b38cef92..868058a242 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -27,5 +27,10 @@
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</appointmentPreviewViewTemplate>
+ <neonViewReference>
+ <name>be0befe0-4b29-4c23-924a-0167240d2b54</name>
+ <entityField>AppointmentLinks</entityField>
+ <view>AppointmentLinkFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/process/Calendar_lib/process.js b/process/Calendar_lib/process.js
index 81b9333190..bc4c96b354 100644
--- a/process/Calendar_lib/process.js
+++ b/process/Calendar_lib/process.js
@@ -190,9 +190,9 @@ CalendarUtil.newSilentEvent = function( pSummary, pDescription, pWithLink, pUser
*
@return {Object} das EntryObjekt
*/
-CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pPriority, pReminder )
+CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, pAppLinkContext, pAppLinkId, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pPriority, pReminder )
{
- var Entry = [];
+ var Entry = {};
var framename;
var framdata;
var dbid;
@@ -245,6 +245,7 @@ CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, p
pStatus = calendars.STATUS_NEEDSACTION;
pStatus = mapCalendarStatus(pStatus, calendars.getBackendTypeTasks() );
+
}
Entry[calendars.USER] = calendars.getCalendarUser(pUser);
@@ -253,6 +254,7 @@ CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, p
Entry[calendars.STATUS] = pStatus;
Entry[calendars.CLASSIFICATION] = calendars.CLASSIFICATION_PUBLIC;
Entry[calendars.CATEGORIES] = pCategory;
+
if( pPriority != undefined )
{
@@ -264,6 +266,9 @@ CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, p
Entry[calendars.HASREMINDER] = "true";
Entry[calendars.REMINDER_DURATION] = pReminder;
}
+ else
+ Entry[calendars.HASREMINDER] = "false";
+
if (pWithLink == false)
{
@@ -308,6 +313,13 @@ CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, p
Entry["LINK_TITLE_1"] = linktitle;
}
}
+
+
+if(pAppLinkContext && pAppLinkId)
+{
+ Entry["AppLinkContext"] = pAppLinkContext;
+ Entry["AppLinkId"] = pAppLinkId;
+}
return Entry;
}
--
GitLab
From 47d5c2dbb8060659ff44d98a7166006a84b9b452 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 16:11:46 +0100
Subject: [PATCH 016/250] Offer / Order weitere Links zu Activity Task
vorbelegen
---
entity/Offer_entity/Offer_entity.aod | 8 ++++++++
.../children/presetlinks_param/valueProcess.js | 18 ++++++++++++++++++
.../newactivity/onActionProcess.js | 16 +++++++++++++++-
.../entityfields/newtask/onActionProcess.js | 16 +++++++++++++++-
.../children/presetlinks_param/valueProcess.js | 18 ++++++++++++++++++
entity/Order_entity/Order_entity.aod | 8 ++++++++
.../children/presetlinks_param/valueProcess.js | 18 ++++++++++++++++++
.../newactivity/onActionProcess.js | 16 +++++++++++++++-
.../entityfields/newtask/onActionProcess.js | 16 +++++++++++++++-
.../children/presetlinks_param/valueProcess.js | 18 ++++++++++++++++++
process/Offer_lib/process.js | 1 -
11 files changed, 148 insertions(+), 5 deletions(-)
create mode 100644 entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
create mode 100644 entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 6c8bb2d1b7..b9a8f65376 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -427,6 +427,10 @@
<name>RowId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityActionField>
@@ -586,6 +590,10 @@
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
new file mode 100644
index 0000000000..db35a547ac
--- /dev/null
+++ b/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+result.object(links);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
index 95b96c5f1f..d0e6ebcf2b 100644
--- a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
@@ -1,4 +1,18 @@
import("system.vars");
import("ActivityTask_lib");
+import("Contact_lib");
-ActivityUtils.createNewActivity(vars.getString("$field.OFFERID"));
\ No newline at end of file
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+ActivityUtils.createNewActivity(vars.getString("$field.OFFERID"), links);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newtask/onActionProcess.js b/entity/Offer_entity/entityfields/newtask/onActionProcess.js
index 4ac1d14db6..b77c8343aa 100644
--- a/entity/Offer_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newtask/onActionProcess.js
@@ -1,4 +1,18 @@
import("system.vars");
import("ActivityTask_lib");
+import("Contact_lib");
-TaskUtils.createNewTask(vars.get("$field.OFFERID"));
\ No newline at end of file
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+TaskUtils.createNewTask(vars.get("$field.OFFERID"), links);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js b/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
new file mode 100644
index 0000000000..db35a547ac
--- /dev/null
+++ b/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+result.object(links);
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index bac5056c81..7c92100b57 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -382,6 +382,10 @@
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityActionField>
@@ -426,6 +430,10 @@
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
</entityFields>
diff --git a/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
new file mode 100644
index 0000000000..db35a547ac
--- /dev/null
+++ b/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+result.object(links);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/newactivity/onActionProcess.js b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
index 45bc3331e0..52c2254f6f 100644
--- a/entity/Order_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
@@ -1,4 +1,18 @@
import("system.vars");
import("ActivityTask_lib");
+import("Contact_lib");
-ActivityUtils.createNewActivity(vars.getString("$field.SALESORDERID"));
\ No newline at end of file
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+ActivityUtils.createNewActivity(vars.get("$field.SALESORDERID"), links);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/newtask/onActionProcess.js b/entity/Order_entity/entityfields/newtask/onActionProcess.js
index 994ccb2800..a2fb8e983a 100644
--- a/entity/Order_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Order_entity/entityfields/newtask/onActionProcess.js
@@ -1,4 +1,18 @@
import("system.vars");
import("ActivityTask_lib");
+import("Contact_lib");
-TaskUtils.createNewTask(vars.get("$field.SALESORDERID"));
\ No newline at end of file
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+TaskUtils.createNewTask(vars.get("$field.SALESORDERID"), links);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js b/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
new file mode 100644
index 0000000000..db35a547ac
--- /dev/null
+++ b/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+var links = [];
+
+if (contactId)
+{
+ links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+}
+
+if (vars.get("$field.SALESPROJECT_ID"))
+{
+ links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+}
+
+result.object(links);
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 59d3bcdc1c..bb8af4f67b 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -80,7 +80,6 @@ OfferUtils.createNewOffer = function(pSalesprojectId, pRelationId)
neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
}
-
/*
* Open Offer report, the report is translated to the language of the offer
*
--
GitLab
From 12e9f989ac38c37bc138d5de01629537742e3191 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 16:24:01 +0100
Subject: [PATCH 017/250] VAT in %
---
entity/Productprice_entity/Productprice_entity.aod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 988c07972e..c4538d9a76 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -77,7 +77,7 @@
</entityField>
<entityField>
<name>VAT</name>
- <title>VAT</title>
+ <title>VAT in %</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
--
GitLab
From de0ea378001792b16132bd088b2b1b44ec741ed6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 22 Mar 2019 14:47:36 +0100
Subject: [PATCH 018/250] anyContact: removed unreferenced file for condition
---
.../recordcontainers/db/conditionProcess.js | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 entity/AnyContact_entity/recordcontainers/db/conditionProcess.js
diff --git a/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js b/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index be3227f265..0000000000
--- a/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = SqlCondition.begin()
-
-// filter privat company if it is not needed
-if (!vars.exists("$param.WithPrivat_param") || vars.get("$param.WithPrivat_param") != "1")
- cond.andPrepare("ORGANISATION.ORGANISATIONID", "0", "# <> ?");
-
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
--
GitLab
From 43d8ad525c25e1ae71c6d9a6709baec696793d5b Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 22 Mar 2019 14:37:49 +0100
Subject: [PATCH 019/250] refactor Organisation: "WithPrivat_param"-parameter
---
entity/Contact_entity/Contact_entity.aod | 6 +++---
.../valueProcess.js | 1 +
.../Organisation_entity.aod | 20 +++++++++----------
.../withprivate_param}/valueProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 4 ++--
entity/Person_entity/Person_entity.aod | 4 ++--
.../withprivate_param}/valueProcess.js | 2 +-
7 files changed, 20 insertions(+), 19 deletions(-)
rename entity/Contact_entity/entityfields/organisations/children/{withprivat_param => withprivate_param}/valueProcess.js (97%)
rename entity/{Person_entity/entityfields/organisations/children/withprivat_param => Organisation_entity/entityfields/withprivate_param}/valueProcess.js (55%)
rename entity/{Organisation_entity/entityfields/withprivat_param => Person_entity/entityfields/organisations/children/withprivate_param}/valueProcess.js (56%)
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 036ac1025f..7174d343ea 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -46,12 +46,12 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
- <name>WithPrivat_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js</valueProcess>
+ <name>WithPrivate_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js b/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
similarity index 97%
rename from entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
rename to entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
index cda204045d..40effa0178 100644
--- a/entity/Contact_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
+++ b/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
@@ -1,2 +1,3 @@
import("system.result");
+
result.string(true);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 262a7751a9..7a0233ae56 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -140,15 +140,20 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>7aa5f9b4-6986-4593-a6d8-c4fb03da9c68</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
<expose v="true" />
- <mandatory v="true" />
</entityParameter>
<entityParameter>
- <name>WithPrivat_param</name>
+ <name>WithPrivate_param</name>
<expose v="true" />
</entityParameter>
</children>
@@ -261,12 +266,6 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>08439676-9146-427b-9bc6-8d6c6c7548d7</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
@@ -587,9 +586,10 @@
</children>
</entityConsumer>
<entityParameter>
- <name>WithPrivat_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/withprivat_param/valueProcess.js</valueProcess>
+ <name>WithPrivate_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/withprivate_param/valueProcess.js</valueProcess>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
diff --git a/entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js b/entity/Organisation_entity/entityfields/withprivate_param/valueProcess.js
similarity index 55%
rename from entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/withprivate_param/valueProcess.js
index 975bf6435d..e0f3ec47e2 100644
--- a/entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/withprivate_param/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("1");
\ No newline at end of file
+result.string(false);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 25ab666e57..2f923bd91f 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -4,10 +4,10 @@ import("system.result");
import("Sql_lib");
var cond = SqlCondition.begin()
- .andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param");
+ .andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param");
// filter privat company if it is not needed
-if (!vars.exists("$param.WithPrivat_param") || vars.get("$param.WithPrivat_param") != "1")
+if (vars.getString("$param.WithPrivate_param") != "true")
cond.andPrepare("ORGANISATION.ORGANISATIONID", "0", "# <> ?");
//TODO: use a preparedCondition when available #1030812 #1034026
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 805cba3759..eee113f9b8 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -206,8 +206,8 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dependency>
<children>
<entityParameter>
- <name>WithPrivat_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js</valueProcess>
+ <name>WithPrivate_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Organisation_entity/entityfields/withprivat_param/valueProcess.js b/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
similarity index 56%
rename from entity/Organisation_entity/entityfields/withprivat_param/valueProcess.js
rename to entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
index 755662df16..40effa0178 100644
--- a/entity/Organisation_entity/entityfields/withprivat_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.string("0")
\ No newline at end of file
+result.string(true);
\ No newline at end of file
--
GitLab
From 132270e862541d00bebb08e306d2f1fe60e10d2d Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 22 Mar 2019 16:47:37 +0100
Subject: [PATCH 020/250] offer fixes
---
entity/Offer_entity/Offer_entity.aod | 12 ++++++++
.../entityfields/copyoffer/onActionProcess.js | 4 ++-
.../deliveryterms/valueProcess.js | 7 +++++
.../entityfields/paymentterms/valueProcess.js | 7 +++++
entity/Person_entity/Person_entity.aod | 29 +++++++++++++++----
.../recordcontainers/db/conditionProcess.js | 5 ++++
.../SalesprojectMember_entity.aod | 8 ++++-
.../salesprojectid_param/valueProcess.js | 4 +++
.../Salesproject_entity.aod | 2 ++
.../entityfields/phase/valueProcess.js | 6 ++++
.../entityfields/state/valueProcess.js | 6 ++++
.../entityfields/start_date/valueProcess.js | 2 +-
.../SalesprojectCompetitionEdit_view.aod | 5 ++++
process/Offer_lib/process.js | 8 +++--
14 files changed, 94 insertions(+), 11 deletions(-)
create mode 100644 entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
create mode 100644 entity/Offer_entity/entityfields/paymentterms/valueProcess.js
create mode 100644 entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/phase/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/state/valueProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index b9a8f65376..92d1a1ff77 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -534,12 +534,14 @@
<name>PAYMENTTERMS</name>
<title>Payment term</title>
<consumer>KeywordPaymentTerm</consumer>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DELIVERYTERMS</name>
<title>Deliveryspecification</title>
<consumer>KeywordDeliveryTerm</consumer>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
@@ -621,6 +623,16 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>OfferPaymentTerm_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferDeliveryTerm_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
index 4957b1ff84..accad62bfb 100644
--- a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
@@ -7,6 +7,8 @@ var currency = vars.getString("$field.CURRENCY");
var language = vars.getString("$field.LANGUAGE");
var header = vars.getString("$field.HEADER");
var offerId = vars.getString("$field.OFFERID");
+var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
+var paymentTerm = vars.getString("$field.PAYMENTTERMS");
-OfferUtils.copyOffer(offerId, contactId, language, currency, header);
+OfferUtils.copyOffer(offerId, contactId, language, currency, header, deliveryTerm, paymentTerm);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
new file mode 100644
index 0000000000..c1fc17cc44
--- /dev/null
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
+{
+ result.string(vars.get("$param.OfferDeliveryTerm_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
new file mode 100644
index 0000000000..298cb1a859
--- /dev/null
+++ b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param"))
+{
+ result.string(vars.get("$param.OfferPaymentTerm_param"));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index eee113f9b8..8d3077b91f 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -275,12 +275,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>ContactEditors</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>b72f99e9-0c8d-4b54-863b-b47eafbb0189</name>
- <entityName>SalesprojectMember_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>f5b4d286-9f5e-4b13-8dca-d9b04186f6ca</name>
<entityName>Timetracking_entity</entityName>
@@ -722,6 +716,29 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>SalesprojectMemberContact</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>a6372a65-6cbe-4a8e-b428-f77b7f1ea4db</name>
+ <entityName>SalesprojectMember_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index 3d91dc356d..77acb02a09 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -7,5 +7,10 @@ var cond = new SqlCondition();
cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
+//in salesprojectMember, only people that aren't already in the salesproject should be selectable
+cond.andPrepareVars("PERSON.PERSONID", "$param.SalesprojectId_param",
+ "# not in (select CONTACT.PERSON_ID from SALESPROJECT_MEMBER join CONTACT on SALESPROJECT_MEMBER.CONTACT_ID = CONTACT.CONTACTID "
+ + " where SALESPROJECT_MEMBER.SALESPROJECT_ID = ?)");
+
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 75a4372f98..c3eb99ba47 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -136,8 +136,14 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>SalesprojectMemberContact</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>KeywordMemberRoles</name>
diff --git a/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
new file mode 100644
index 0000000000..0456b23233
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALESPROJECT_ID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 1fb2469e52..0afca7b3a7 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -41,6 +41,7 @@
<title>Phase</title>
<consumer>KeywordPhases</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -81,6 +82,7 @@
<title>Status</title>
<consumer>KeywordStates</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/entity/Salesproject_entity/entityfields/phase/valueProcess.js b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
new file mode 100644
index 0000000000..49280bb32c
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string("9f7d1fa9-7c09-4037-8f7c-8458def14d89"); //NQC
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/valueProcess.js b/entity/Salesproject_entity/entityfields/state/valueProcess.js
new file mode 100644
index 0000000000..1ca1654d0c
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/state/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/start_date/valueProcess.js b/entity/Task_entity/entityfields/start_date/valueProcess.js
index 2e53ba813c..0b43b2859a 100644
--- a/entity/Task_entity/entityfields/start_date/valueProcess.js
+++ b/entity/Task_entity/entityfields/start_date/valueProcess.js
@@ -8,6 +8,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
var presetVal = datetime.date();
//TODO: depending on what happens in #1032274 we need to manually set the resolution to MINUTES or not (which means we've to set everything smaller than MINUTES (Seconds, etc.) to zero)
- presetVal = datetime.toLong(datetime.toDate(presetVal, "yyyy-MM-dd hh:mm"), "yyyy-MM-dd hh:mm");
+ presetVal = Math.floor(presetVal / datetime.ONE_MINUTE) * datetime.ONE_MINUTE;
result.string(presetVal);
}
\ No newline at end of file
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
index 16ddeeaa24..badeadd20f 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
@@ -51,5 +51,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>cba34c27-9abf-416b-99fc-f7e91bd3669c</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index bb8af4f67b..aa218c4ff4 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -286,15 +286,19 @@ OfferUtils.openOfferReport = function (pOfferID)
* @param pLanguage {String} language
* @param pCurrency {String} [currency=""]
* @param pHeader {String} [header=""]
+ * @param pDeliveryTerm {String} [deliveryTerm=""]
+ * @param pPaymentTerm {String} [paymentTerm=""]
*/
-OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader)
+OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader, pDeliveryTerm, pPaymentTerm)
{
var params = {
"ContactId_param" : pContactId,
"OfferLanguage_param" : pLanguage,
"OfferOriginal_Id_param" : pOfferId,
"OfferCurrency_param" : pCurrency || "",
- "OfferHeader_param" : pHeader || ""
+ "OfferHeader_param" : pHeader || "",
+ "OfferDeliveryTerm_param" : pDeliveryTerm || "",
+ "OfferPaymentTerm_param" : pPaymentTerm || ""
};
neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
}
--
GitLab
From 3f78d79d7b77cadc4fe568c640f099c54fea320f Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Fri, 22 Mar 2019 17:46:25 +0100
Subject: [PATCH 021/250] 360degree integration
---
entity/360Degree_entity/360Degree_entity.aod | 77 +++++++++++++++++++
.../entityfields/context_name/valueProcess.js | 5 ++
.../children/objecttype_param/valueProcess.js | 4 +
.../recordcontainers/jdito/contentProcess.js | 31 ++++++++
.../Organisation_entity.aod | 16 ++++
.../objectrowid_param/valueProcess.js | 4 +
.../_____LANGUAGE_EXTRA.aod | 3 +
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 +
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +
neonContext/360Degree/360Degree.aod | 14 ++++
.../360DegreeFilter_view.aod | 19 +++++
.../OrganisationMain_view.aod | 5 ++
process/Context_lib/process.js | 22 +++---
13 files changed, 196 insertions(+), 11 deletions(-)
create mode 100644 entity/360Degree_entity/360Degree_entity.aod
create mode 100644 entity/360Degree_entity/entityfields/context_name/valueProcess.js
create mode 100644 entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
create mode 100644 entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
create mode 100644 entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
create mode 100644 neonContext/360Degree/360Degree.aod
create mode 100644 neonView/360DegreeFilter_view/360DegreeFilter_view.aod
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
new file mode 100644
index 0000000000..d46ac9f4dd
--- /dev/null
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -0,0 +1,77 @@
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>360Degree_entity</name>
+ <title>360 Degree</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <searchable v="false" />
+ </entityField>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>OrganisationObjects</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>TARGET_ID</targetIdField>
+ <dependencies>
+ <entityDependency>
+ <name>15488007-165c-4630-828a-447cf2c27899</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>360DegreeObjects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>TARGET_CONTEXT</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>TARGET_ID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CONTEXT_NAME</name>
+ <title>Module</title>
+ <groupable v="true" />
+ <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/context_name/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>TARGET_ID.value</element>
+ <element>TARGET_CONTEXT.value</element>
+ <element>TITLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/360Degree_entity/entityfields/context_name/valueProcess.js b/entity/360Degree_entity/entityfields/context_name/valueProcess.js
new file mode 100644
index 0000000000..618f59f467
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/context_name/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string(translate.text(vars.getString("$field.TARGET_CONTEXT")));
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..bb07a1ee2e
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object(["Salesproject", "Offer", "Contract"]);
\ No newline at end of file
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..1f70304a1c
--- /dev/null
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,31 @@
+import("system.logging");
+import("system.util");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var resultList = [];
+if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
+{
+ var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+ contextList.forEach(function (context)
+ {
+ var data = db.table(ContextUtils.getContextDataSql(context, vars.get("$param.ObjectRowId_param")));
+ data.forEach(function (row)
+ {
+ var record = [];
+ record[0] = util.getNewUUID();
+ record[1] = row[0];
+ record[2] = context;
+ record[3] = row[1];
+ resultList.push(record);
+ });
+
+ });
+ result.object(resultList)
+}
+else
+{
+ result.object(resultList);
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 7a0233ae56..1c9253f9ce 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -616,6 +616,22 @@
<iconId>VAADIN:CALENDAR</iconId>
<tooltip>New Appointment</tooltip>
</entityActionField>
+ <entityConsumer>
+ <name>360DegreeObjects</name>
+ <title>360 Degree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>360Degree_entity</entityName>
+ <fieldName>OrganisationObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..c52b656d2f
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 19e7aa6f09..d79c42f05f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2565,6 +2565,9 @@
<entry>
<key>Price policy</key>
</entry>
+ <entry>
+ <key>New appointment</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 2fe5ec6d2e..cbb4347031 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -153,6 +153,10 @@
<entry>
<key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
</entry>
+ <entry>
+ <key>360 Degree</key>
+ <value>360 Grad</value>
+ </entry>
<entry>
<key>Activities</key>
<value>Aktivitäten</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 9fae765966..e288ce276b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2589,6 +2589,9 @@
<entry>
<key>Price policy</key>
</entry>
+ <entry>
+ <key>New appointment</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/360Degree/360Degree.aod b/neonContext/360Degree/360Degree.aod
new file mode 100644
index 0000000000..25790be755
--- /dev/null
+++ b/neonContext/360Degree/360Degree.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>360Degree</name>
+ <title>360 Degree</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>360DegreeFilter_view</filterview>
+ <entity>360Degree_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>9e68c23b-1b55-4ff7-971d-815af0f9dd8a</name>
+ <view>360DegreeFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
new file mode 100644
index 0000000000..ae98a9499c
--- /dev/null
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -0,0 +1,19 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>360DegreeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treetableViewTemplate>
+ <name>Treetable</name>
+ <titleField>TITLE</titleField>
+ <descriptionField>CONTEXT_NAME</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </treetableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index e239640186..7a18c8683f 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -20,6 +20,11 @@
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ae34787c-dcaf-4fe2-a4e2-35219f138b03</name>
+ <entityField>360DegreeObjects</entityField>
+ <view>360DegreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>55e04574-bc55-4c9a-a4c4-9ebd287f8ae6</name>
<entityField>Tasks</entityField>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index b0c76ff639..08fbf7aaaa 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -106,19 +106,19 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId nameField Tablename, IDField
- "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID"],
- "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID"],
- "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID"],
- "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID"],
+ // contextId nameField Tablename, IDField, RelationField
+ "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", ""],
+ "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID", ""],
+ "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID", ""],
+ "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", "CONTACT_ID"],
// TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
// maskingUtils.concat([SqlMaskingUtils.cast("CONTRACTCODE", "varchar", 10), getKeySQL("CONTRACTTYPE", "CONTRACTTYPE" )])
- "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID"],
+ "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID", "CONTACT_ID"],
// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
- "Offer": [maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10), "OFFER", "OFFERID"],
- "Order": [maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10), "SALESORDER", "SALESORDERID"],
- "Product": ["PRODUCTNAME", "PRODUCT", "PRODUCTID"],
- "Task": ["SUBJECT", "TASK", "TASKID", translate.text("Task")]
+ "Offer": [maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10), "OFFER", "OFFERID", "CONTACT_ID"],
+ "Order": [maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10), "SALESORDER", "SALESORDERID", "CONTACT_ID"],
+ "Product": ["PRODUCTNAME", "PRODUCT", "PRODUCTID", ""],
+ "Task": ["SUBJECT", "TASK", "TASKID", translate.text("Task"), ""]
}
}
@@ -171,7 +171,7 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId)
var cond = SqlCondition.begin();
if (pRowId)
{
- cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][2], pRowId)
+ cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][3], pRowId)
}
return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=1");
--
GitLab
From 7ea0c38ca19e73da01f23b84f99fdf7b517c0493 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 07:36:45 +0100
Subject: [PATCH 022/250] fix Product
---
entity/Offeritem_entity/Offeritem_entity.aod | 1 +
.../entityfields/quantity/onValidation.js | 9 +++++++++
.../entityfields/quantity/valueProcess.js | 2 +-
entity/Prod2prod_entity/Prod2prod_entity.aod | 2 ++
.../entityfields/quantity/valueProcess.js | 18 ++++++++----------
5 files changed, 21 insertions(+), 11 deletions(-)
create mode 100644 entity/Offeritem_entity/entityfields/quantity/onValidation.js
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index f330271f5d..3c9b8ae970 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -81,6 +81,7 @@
<contentType>NUMBER</contentType>
<outputFormat>#</outputFormat>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValidation.js b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
new file mode 100644
index 0000000000..e5e0c8fb5f
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+logging.log("validate")
+if (parseInt(vars.get("$field.QUANTITY")) <= 0)
+{
+ result.string("${QUANTITY_LOWER_THAN_0}");
+}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/quantity/valueProcess.js b/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
index 801a9cf46f..ebd4664e61 100644
--- a/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("system.neon");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string("1");
}
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 8826f3b29a..a6c4e305ff 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -27,6 +27,8 @@
<entityField>
<name>QUANTITY</name>
<title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
<valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js</valueProcess>
</entityField>
<entityField>
diff --git a/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js b/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js
index 66e7d5877c..1adf62b3fa 100644
--- a/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js
+++ b/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js
@@ -1,10 +1,8 @@
-//import("system.vars");
-//import("system.result");
-//import("system.neon");
-//
-//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
-//{
-// result.string("1");
-//}
-//else
-// result.string(vars.get("$this.value"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.QUANTITY"))
+{
+ result.string("1");
+}
\ No newline at end of file
--
GitLab
From d41ba50dbae07298a3b5ea87cddbe24b84183666 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 25 Mar 2019 10:06:46 +0100
Subject: [PATCH 023/250] ModuleTree always show complete tree
---
.../recordcontainers/jdito/contentProcess.js | 29 ++++++++++++++-----
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
index 4880654df0..061d2085b3 100644
--- a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -9,7 +9,7 @@ var fixedID = vars.get("$param.ID_param");
let resArray = [];
// Query root element
-var root = queryRootElement(fixedContextName, fixedID);
+var root = queryRootElement(fixedContextName, fixedID, true);
if (root !== null) {
// Push root element
resArray.push(root);
@@ -73,23 +73,36 @@ function queryChildrenElements (pContextName, pID) {
*
* @param pContextName Context name of the root element.
* @param pID ID of the root element.
+ * @param pGetFirst start from the first element
*/
-function queryRootElement (pContextName, pID) {
+function queryRootElement (pContextName, pID, pGetFirst) {
var resultArray;
if (pContextName === "Task") {
- resultArray = db.table("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK where TASKID = '" + pID + "'");
+ resultArray = db.array(db.ROW, "select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK where TASKID = '" + pID + "'");
if (resultArray.length === 0) {
return null;
}
-
- return augmentData(resultArray[0], "Task");
+ if (pGetFirst && resultArray[1] && resultArray[2])
+ return queryRootElement(resultArray[2], resultArray[1], pGetFirst);
+ if (pGetFirst)
+ {
+ fixedContextName = "Task";
+ fixedID = resultArray[0];
+ }
+ return augmentData(resultArray, "Task");
} else if (pContextName === "Activity") {
- resultArray = db.table("select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY where ACTIVITYID = '" + pID +"'");
+ resultArray = db.array(db.ROW, "select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY where ACTIVITYID = '" + pID +"'");
if (resultArray.length === 0) {
return null;
}
-
- return augmentData(resultArray[0], "Activity");
+ if (pGetFirst && resultArray[1] && resultArray[2])
+ return queryRootElement(resultArray[2], resultArray[1], pGetFirst);
+ if (pGetFirst)
+ {
+ fixedContextName = "Activity";
+ fixedID = resultArray[0];
+ }
+ return augmentData(resultArray, "Activity");
} else {
return null;
}
--
GitLab
From 79073759433ebe36c205d3d36b3b9071245cd13b Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 25 Mar 2019 10:13:27 +0100
Subject: [PATCH 024/250] Rename: Attribute -> Eigenschaften
---
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 2 +-
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 10 +++++-----
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d79c42f05f..879f3d272b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2566,7 +2566,7 @@
<key>Price policy</key>
</entry>
<entry>
- <key>New appointment</key>
+ <key>360 Degree</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index cbb4347031..5362442f9a 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1304,7 +1304,7 @@
</entry>
<entry>
<key>Attributes</key>
- <value>Attribute</value>
+ <value>Eigenschaften</value>
</entry>
<entry>
<key>Facebook</key>
@@ -1584,7 +1584,7 @@
</entry>
<entry>
<key>Attribute Relation</key>
- <value>Attributbeziehung</value>
+ <value>Eigenschaftsbeziehung</value>
</entry>
<entry>
<key>My Dashboard</key>
@@ -1592,7 +1592,7 @@
</entry>
<entry>
<key>Attribute Usage</key>
- <value>Attributverwendung</value>
+ <value>Eigenschaftsverwendung</value>
</entry>
<entry>
<key>Beziehung</key>
@@ -1602,7 +1602,7 @@
</entry>
<entry>
<key>Attribute</key>
- <value>Attribut</value>
+ <value>Eigenschaft</value>
</entry>
<entry>
<key>Container</key>
@@ -1910,7 +1910,7 @@
</entry>
<entry>
<key>Superordinate Attribute</key>
- <value>Ãœbergeordnetes Attribut</value>
+ <value>Ãœbergeordnete Eigenschaft</value>
</entry>
<entry>
<key>Kyrgyzstan</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index e288ce276b..2f458b7aaf 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2590,7 +2590,7 @@
<key>Price policy</key>
</entry>
<entry>
- <key>New appointment</key>
+ <key>360 Degree</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
--
GitLab
From 9834cbdfcfcd82d4ce5d9ed95842273c9c1eef63 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 10:43:46 +0100
Subject: [PATCH 025/250] updated contact tilte in links
---
.../recordcontainers/db/conditionProcess.js | 2 ++
entity/Person_entity/Person_entity.aod | 7 +++++++
.../full_name_fieldgroup/valueProcess.js | 1 +
entity/Person_entity/titleProcess.js | 14 +++++++++++++-
process/Context_lib/process.js | 8 +++++---
5 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 2f923bd91f..d8bc46d7f9 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -10,5 +10,7 @@ var cond = SqlCondition.begin()
if (vars.getString("$param.WithPrivate_param") != "true")
cond.andPrepare("ORGANISATION.ORGANISATIONID", "0", "# <> ?");
+//TODO: exclude already used (or validation of already used combinations)
+
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 8d3077b91f..744aac134e 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -739,6 +739,9 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityProvider>
+ <entityField>
+ <name>ORGANISATION_NAME</name>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -877,6 +880,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>CONTACTROLE.value</name>
<recordfield>CONTACT.CONTACTROLE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGANISATION_NAME.value</name>
+ <recordfield>ORGANISATION.NAME</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js b/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
index b3a098ff14..778c203ff1 100644
--- a/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
+++ b/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
@@ -3,6 +3,7 @@ import("system.result");
import("Util_lib");
import("Contact_lib");
+//no orgname here since the org-field is in the card-template as separate field
var contact = new Contact();
contact.salutation = vars.get("$field.SALUTATION");
contact.title = vars.get("$field.TITLE");
diff --git a/entity/Person_entity/titleProcess.js b/entity/Person_entity/titleProcess.js
index 29d40a6e1f..abaa3df156 100644
--- a/entity/Person_entity/titleProcess.js
+++ b/entity/Person_entity/titleProcess.js
@@ -1,4 +1,16 @@
import("system.vars");
import("system.result");
+import("Util_lib");
+import("Contact_lib");
-result.string(vars.get("$field.NAME_fieldGroup"));
\ No newline at end of file
+//do not use "FULL_NAME_fieldGroup" here since the field group must not include the orgname
+var contact = new Contact();
+contact.salutation = vars.get("$field.SALUTATION");
+contact.title = vars.get("$field.TITLE");
+contact.firstname = vars.get("$field.FIRSTNAME");
+contact.middlename = vars.get("$field.MIDDLENAME");
+contact.lastname = vars.get("$field.LASTNAME");
+contact.organisationName = vars.get("$field.ORGANISATION_NAME");
+
+var renderer = new ContactTitleRenderer(contact, null);
+result.string(renderer.asString());
\ No newline at end of file
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 08fbf7aaaa..4427c14c80 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -3,6 +3,7 @@ import("system.project");
import("system.vars");
import("system.SQLTYPES");
import("Sql_lib");
+import("Contact_lib");
/**
* Methods to manage contexts.
@@ -106,9 +107,9 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId nameField Tablename, IDField, RelationField
+ // contextId nameField Tablename, IDField, RelationField, override Tablename (needed if Tablename is a join clause)
"Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", ""],
- "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID", ""],
+ "Person": [(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()), "PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ", "CONTACTID", "", "CONTACT"],
"Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID", ""],
"Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", "CONTACT_ID"],
// TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
@@ -157,7 +158,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
{
var selectMap = ContextUtils._getSelectMap()
if (selectMap[pContextId] != undefined)
- return SqlCondition.begin().andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][2], pRowId).buildSql("select " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=2");
+ return SqlCondition.begin().andPrepare((selectMap[pContextId][4] ? selectMap[pContextId][4] : selectMap[pContextId][1]) + "." + selectMap[pContextId][2], pRowId).buildSql("select " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=2");
else
return "select 1 from person where 1=2";
}
@@ -176,3 +177,4 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId)
return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=1");
}
+
--
GitLab
From 64ebe48fa98e3f147a7786615bdaf879a952dc77 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 10:55:30 +0100
Subject: [PATCH 026/250] exclude private organisation from AnyContact-entity
---
entity/AnyContact_entity/AnyContact_entity.aod | 1 +
.../recordcontainers/db/conditionProcess.js | 14 ++++++++++++++
2 files changed, 15 insertions(+)
create mode 100644 entity/AnyContact_entity/recordcontainers/db/conditionProcess.js
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index bd84a04594..505785aee4 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -177,6 +177,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<name>db</name>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
diff --git a/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js b/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..e3e997905f
--- /dev/null
+++ b/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,14 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+//exclude private organisation
+var cond = SqlCondition.begin()
+ .andPrepare("CONTACT.ORGANISATION_ID", "0", "# != ?")
+ .orSqlCondition(SqlCondition.begin()
+ .andPrepare("CONTACT.ORGANISATION_ID", "0")
+ .and("CONTACT.PERSON_ID is not null")
+ );
+
+
+result.string(db.translateCondition(cond.build()));
\ No newline at end of file
--
GitLab
From d095efeb2ac63c6b5ed305181369034089c0df7a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 11:08:37 +0100
Subject: [PATCH 027/250] revert to old Product logic
---
entity/Prod2prod_entity/Prod2prod_entity.aod | 4 +-
.../recordcontainers/jdito/contentProcess.js | 1 +
neonContext/Prod2prod/Prod2prod.aod | 4 +
.../Prod2prodTable_view.aod | 38 +++++
.../ProductMain_view/ProductMain_view.aod | 5 +
process/OfferOrder_lib/process.js | 5 +-
process/Product_lib/process.js | 160 ++++++++++--------
7 files changed, 146 insertions(+), 71 deletions(-)
create mode 100644 neonView/Prod2prodTable_view/Prod2prodTable_view.aod
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index a6c4e305ff..278b28c9f4 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -141,13 +141,13 @@
<element>UID.value</element>
<element>PARENTID.value</element>
<element>PROD2PRODID.value</element>
+ <element>DEST_ID.value</element>
+ <element>SOURCE_ID.displayValue</element>
<element>QUANTITY.value</element>
<element>OPTIONAL.value</element>
<element>TAKEPRICE.value</element>
<element>PRODUCTCODE.value</element>
<element>PRODUCTID.value</element>
- <element>SOURCE_ID.value</element>
- <element>DEST_ID.displayValue</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
index 1eca5fb315..4bd6e91ebb 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.neon");
import("system.result");
import("system.vars");
diff --git a/neonContext/Prod2prod/Prod2prod.aod b/neonContext/Prod2prod/Prod2prod.aod
index 3599d29114..5f3312e66d 100644
--- a/neonContext/Prod2prod/Prod2prod.aod
+++ b/neonContext/Prod2prod/Prod2prod.aod
@@ -16,5 +16,9 @@
<name>428b22a1-427f-4547-a478-964442078bc1</name>
<view>Prod2ProdEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>257aa20f-d6b4-4a64-8f61-bb62b6ef49c8</name>
+ <view>Prod2prodTable_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/Prod2prodTable_view/Prod2prodTable_view.aod b/neonView/Prod2prodTable_view/Prod2prodTable_view.aod
new file mode 100644
index 0000000000..7b14b322f3
--- /dev/null
+++ b/neonView/Prod2prodTable_view/Prod2prodTable_view.aod
@@ -0,0 +1,38 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>Prod2prodTable_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>data</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>1a1880db-4a23-4c0f-9a87-7da546461cca</name>
+ <entityField>PARENTID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>40710edc-b8ef-43fa-8f8c-99add3946c47</name>
+ <entityField>SOURCE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>673daab5-c779-49db-aaf4-851f2d0a2c95</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0c99aadc-0798-45eb-b015-8cdef16bf0f1</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>da0abba6-9ea0-4503-9b51-8d232f345aa8</name>
+ <entityField>TAKEPRICE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 7ac4a87c4d..ed9d388e26 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -29,6 +29,11 @@
<entityField>#ENTITY</entityField>
<view>ProductDescription_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>cbcf23d7-1d80-41c5-8041-8e768fa91487</name>
+ <entityField>ProductLinks</entityField>
+ <view>Prod2prodTable_view</view>
+ </neonViewReference>
<neonViewReference>
<name>7f416115-ff89-45ca-be10-ed568cac266c</name>
<entityField>ProductLinks</entityField>
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index 1b286d5154..bb660ba440 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -272,10 +272,9 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
columns = columns.concat(additionalProductInfo.map(function(item) {return item[0]}));
var colTypes = db.getColumnTypes(table, columns);
- // partsList[rootProdId] = root node
- if (partsList[rootProdId] != undefined) // if product has a parts list
+ if (partsList.root != undefined) // if product has a parts list
{
- __itemInsertStatement(partsList[rootProdId], assignedTo, currency, contactId);
+ __itemInsertStatement(partsList.root, assignedTo, currency, contactId);
}
if (statements.length > 0)
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 6ee4f51c5d..7f1383f16f 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -393,14 +393,15 @@ ProductUtils.removeImage = function(pProductId)
* @class
*
*/
-function Prod2ProdUtils(productId) {
+function Prod2ProdUtils(productId)
+{
this.productId = productId;
this.data = undefined;
}
/**
- * Delivers an Object containing parts list structure for passed product "productId" (Constructor parameter)
- *
+ * Delivers an Object containing parts list structure for passed product "pProductId" (Constructor parameter)
+ *
* @return {Object} { $prod2prodid$ { <br>
* ids: [ Array containing child Prod2ProdIds for passed product "pProductId" (Constructor parameter) ] <br>
* , rowdata: [ "PROD2PRODID", "DEST_ID", "SOURCE_ID", "QUANTITY", "OPTIONAL", "TAKEPRICE" ] from DB-Table PROD2PROD <br>
@@ -409,10 +410,13 @@ function Prod2ProdUtils(productId) {
* , quantity: "Quantity" <br>
* , optional: "0" = not optional, "1" = optional <br>
* , takeprice: "0" = no price, "1" = price <br>
+ * , productcode: "Productcode" <br>
+ * , productid: "Productid" <br>
* } }
*/
-Prod2ProdUtils.prototype.getPartsListObject = function() {
- return this._relateChilds().getTreeObject();
+Prod2ProdUtils.prototype.getPartsListObject = function()
+{
+ return this._relateChilds();
}
/**
@@ -434,9 +438,27 @@ Prod2ProdUtils.prototype.getPartsListObject = function() {
* , "PRODUCTCODE"
* , "PRODUCTID"] ]
*/
-Prod2ProdUtils.prototype.getPartsListForRecordContainer = function() {
- var tree = this._relateChilds();
- return tree.toArray(7);
+Prod2ProdUtils.prototype.getPartsListForRecordContainer = function()
+{
+ var ret = [];
+ var childs = this._relateChilds();
+
+ __push(childs.root);
+
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
+ var rowdata = childs[pObj.ids[i]].rowdata;
+ var UID = util.getNewUUID();
+ var PARENTID = childs[pObj.ids[i]].destid;
+
+ rowdata = [UID, PARENTID].concat(rowdata);
+ ret.push(rowdata);
+ __push( childs[pObj.ids[i]] );
+ }
+ }
+ return ret;
}
/**
@@ -446,18 +468,21 @@ Prod2ProdUtils.prototype.getPartsListForRecordContainer = function() {
*
* @return {String[]} [ "SOURCE_ID" ]
*/
-Prod2ProdUtils.prototype.getPartsListProdIds = function() {
+Prod2ProdUtils.prototype.getPartsListProdIds = function()
+{
var ret = [];
- var childs = this._relateChilds().getTreeObject();
+ var childs = this._relateChilds();
__push(childs.root);
return ret;
- function __push(pObj) {
- for (var i = 0; i < pObj.ids.length; i++) {
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
ret.push(childs[pObj.ids[i]].sourceid);
- __push(childs[pObj.ids[i]]);
+ __push( childs[pObj.ids[i]] );
}
}
}
@@ -469,7 +494,8 @@ Prod2ProdUtils.prototype.getPartsListProdIds = function() {
*
* @return {String[]} [ "DEST_ID" ]
*/
-Prod2ProdUtils.prototype.getParentProdIds = function() {
+Prod2ProdUtils.prototype.getParentProdIds = function()
+{
var ret = [];
var parents = this._relateParents();
@@ -477,10 +503,12 @@ Prod2ProdUtils.prototype.getParentProdIds = function() {
return ret;
- function __push(pObj) {
- for (var i = 0; i < pObj.ids.length; i++) {
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
ret.push(parents[pObj.ids[i]].destid);
- __push(parents[pObj.ids[i]]);
+ __push( parents[pObj.ids[i]] );
}
}
}
@@ -491,9 +519,10 @@ Prod2ProdUtils.prototype.getParentProdIds = function() {
*
* @ignore
*/
-Prod2ProdUtils.prototype._initProd2ProdData = function() {
+Prod2ProdUtils.prototype._initProd2ProdData = function()
+{
if (this.data == undefined) {
- this.data = db.table("select SOURCE_ID, DEST_ID, PROD2PRODID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID, SOURCE_ID, DEST_ID "
+ this.data = db.table("select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID "
+ "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
+ "order by PRODUCTCODE ");
}
@@ -502,78 +531,77 @@ Prod2ProdUtils.prototype._initProd2ProdData = function() {
/**
* object tree to relate products by DEST_ID / SOURCE_ID.
**/
-Prod2ProdUtils.prototype._buildTree = function(supervised) {
+Prod2ProdUtils.prototype._buildTree = function(pSupervised)
+{
this._initProd2ProdData();
- var productId = this.productId;
+
+ var tree = { root: {ids: [], sourceid: this.productId } };
- var tree = DataTree.begin(this.productId).addArray(this.data,
- function(pUid, pNode)
+ if(pSupervised)
+ tree = { root: {ids: [], destid: this.productId } };
+
+ for (var i = 0; i < this.data.length; i++)
{
- if (pUid == productId)
+ var prod2prodid = this.data[i][0];
+ if ( tree[prod2prodid] == undefined )
{
- pNode["sourceid"] = productId;
- if (supervised)
- {
- pNode["destid"] = productId;
- }
- }
- else
- {
- pNode["destid"] = pNode.parent;
- pNode["sourceid"] = pUid;
-
- if (pNode.data != undefined) {
- pNode["quantity"] = pNode.data[1];
- pNode["optional"] = pNode.data[2];
- pNode["takeprice"] = pNode.data[3];
- pNode["productcode"] = pNode.data[4];
- pNode["productid"] = pNode.data[5];
- }
+ tree[prod2prodid] = {
+ ids: []
+ , rowdata: this.data[i].slice(0)//copy to get NativeArray for concatenation
+ , destid: this.data[i][1]
+ , sourceid: this.data[i][2]
+ , quantity: this.data[i][3]
+ , optional: this.data[i][4]
+ , takeprice: this.data[i][5]
+ , productcode: this.data[i][6]
+ , productid: this.data[i][7]
+ };
}
}
- );
+
+ return tree;
- return tree;
}
-Prod2ProdUtils.prototype._relateChilds = function() {
+Prod2ProdUtils.prototype._relateChilds = function()
+{
var tree = this._buildTree(false);
- __relate(this.productId);
+
+ __relate("root");
return tree;
- function __relate(id) {
- var treeObject = tree.getTreeObject();
- if (treeObject[id] != undefined)
+ function __relate(pID)
+ {
+ for ( var id in tree )
{
- for (var treeId in treeObject) {
- if (treeObject[treeId].destid == treeObject[id].sourceid && treeObject[id].ids.indexOf(treeId) == -1) {
- treeObject[id].ids.push(treeId);
- __relate(treeId);
- }
- }
+ if ( tree[id].destid == tree[pID].sourceid && tree[pID].ids.indexOf(id) == -1 )
+ {
+ tree[pID].ids.push(id);
+ __relate(id);
+ }
}
}
}
-Prod2ProdUtils.prototype._relateParents = function() {
+Prod2ProdUtils.prototype._relateParents = function()
+{
var tree = this._buildTree(true);
- __relate(this.productId);
+ __relate("root");
return tree;
- function __relate(id) {
- var treeObject = tree.getTreeObject();
- if (treeObject[id] != undefined)
+ function __relate(pID)
+ {
+ for ( var id in tree )
{
- for (var treeId in treeObject) {
- if (treeObject[treeId].sourceid == treeObject[id].destid && treeObject[id].ids.indexOf(treeId) == -1) {
- treeObject[id].ids.push(treeId);
- __relate(treeId);
- }
- }
+ if ( tree[id].sourceid == tree[pID].destid && tree[pID].ids.indexOf(id) == -1 )
+ {
+ tree[pID].ids.push(id);
+ __relate(id);
+ }
}
}
}
\ No newline at end of file
--
GitLab
From 00132b84b2063243dbef08742ddd36940c90fe3a Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 25 Mar 2019 11:21:52 +0100
Subject: [PATCH 028/250] Activity relations in preview
---
.../ActivityLink_entity.aod | 2 +-
neonContext/ActivityLink/ActivityLink.aod | 4 +++
.../ActivityLinkPreviewList_view.aod | 26 +++++++++++++++++++
.../ActivityPreview_view.aod | 5 ++++
4 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 34b9c2ad50..38ceb851f5 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -20,7 +20,7 @@
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
- <title>Beziehung</title>
+ <title>Relation</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
diff --git a/neonContext/ActivityLink/ActivityLink.aod b/neonContext/ActivityLink/ActivityLink.aod
index bbb417a30f..dfc2613a96 100644
--- a/neonContext/ActivityLink/ActivityLink.aod
+++ b/neonContext/ActivityLink/ActivityLink.aod
@@ -18,5 +18,9 @@
<name>0960878d-9077-4707-8239-b48f1b55a5e8</name>
<view>ActivityLinkMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e814dfa7-68da-485f-aea1-462197b33f67</name>
+ <view>ActivityLinkPreviewList_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod b/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
new file mode 100644
index 0000000000..283d81b544
--- /dev/null
+++ b/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
@@ -0,0 +1,26 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>ActivityLinkPreviewList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>ActivityLinks</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>7db98c3e-2203-4af1-a155-5f4d62bd0ef8</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>063acc6e-1a7f-48a2-8204-a2adaf6ffdb4</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 9d177fb190..6604909f9e 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -39,6 +39,11 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>4c365613-81c5-4518-8953-751b5ae35cc2</name>
+ <entityField>Links</entityField>
+ <view>ActivityLinkPreviewList_view</view>
+ </neonViewReference>
<neonViewReference>
<name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
<entityField>MainDocuments</entityField>
--
GitLab
From e7da15de849410167d31d5c7c7e99eb6b0a2ee10 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 25 Mar 2019 11:28:21 +0100
Subject: [PATCH 029/250] Task Links in preview
---
entity/TaskLink_entity/TaskLink_entity.aod | 1 -
neonContext/TaskLink/TaskLink.aod | 4 +++
.../TaskLinkPreviewList_view.aod | 26 +++++++++++++++++++
.../TaskPreview_view/TaskPreview_view.aod | 5 ++++
4 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index b344727738..2ed05178f4 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -19,7 +19,6 @@
<name>OBJECT_TYPE</name>
<title>Object type</title>
<consumer>Contexts</consumer>
- <linkedContext>Context</linkedContext>
<displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/neonContext/TaskLink/TaskLink.aod b/neonContext/TaskLink/TaskLink.aod
index 5e6273ddc3..4ac1b80b12 100644
--- a/neonContext/TaskLink/TaskLink.aod
+++ b/neonContext/TaskLink/TaskLink.aod
@@ -16,5 +16,9 @@
<name>cd180425-6562-49d9-99be-f3a47a88f427</name>
<view>TaskLinkMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>8799454a-92af-4604-8e6c-9323f745a258</name>
+ <view>TaskLinkPreviewList_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod b/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
new file mode 100644
index 0000000000..a009b2b1c3
--- /dev/null
+++ b/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
@@ -0,0 +1,26 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>TaskLinkPreviewList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>TaskLinks</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>280359fa-e38a-49b1-9dc7-84cb670e43c3</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d5d86e34-16a0-4dd9-acfd-f1a2f031d750</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 02f4fbcea5..70dd0f540f 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -51,6 +51,11 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>8cf85386-d25f-459a-a2a1-991c9e3287b6</name>
+ <entityField>Links</entityField>
+ <view>TaskLinkPreviewList_view</view>
+ </neonViewReference>
<neonViewReference>
<name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
<entityField>MainDocuments</entityField>
--
GitLab
From 1ce45b65ac38164388dd6193e16b3cbdbbdb04bc Mon Sep 17 00:00:00 2001
From: Maria Hofmann <m.hofmann@adito.de>
Date: Mon, 25 Mar 2019 11:28:21 +0100
Subject: [PATCH 030/250] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][Tic?=
=?UTF-8?q?ketNr.:=201034406][Kl=C3=A4rung=20und=20Refactoring=20-=20Wie?=
=?UTF-8?q?=20sind=20die=20Codingguidlines=20f=C3=BCr=20View-Templates=3F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ActivityLinkMultiEdit_view.aod | 2 +-
.../AppointmentLinkFilter_view.aod | 2 +-
neonView/ContactEdit_view/ContactEdit_view.aod | 2 +-
neonView/ContactList_view/ContactList_view.aod | 2 +-
neonView/OrderDetail_view/OrderDetail_view.aod | 2 +-
neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod | 2 +-
neonView/StockCount_view/StockCount_view.aod | 2 +-
neonView/StockEdit_view/StockEdit_view.aod | 2 +-
neonView/StockFilter_view/StockFilter_view.aod | 2 +-
neonView/TaskEdit_view/TaskEdit_view.aod | 2 +-
neonView/TaskFilter_view/TaskFilter_view.aod | 6 +++---
neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod | 2 +-
neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod | 2 +-
neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod | 2 +-
neonView/TaskMainPreview_view/TaskMainPreview_view.aod | 4 ++--
neonView/TaskPreview_view/TaskPreview_view.aod | 4 ++--
neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod | 2 +-
.../TimetrackingFilter_view/TimetrackingFilter_view.aod | 2 +-
18 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
index dbb50a2c7e..fab71b99e1 100644
--- a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
+++ b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>GenericMultiple</name>
+ <name>MultipleEdit</name>
<entityField>#ENTITY</entityField>
<title></title>
<columns>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index b08bd63a17..617858db80 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>GenericMultiple</name>
+ <name>MultipleEdit</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/ContactEdit_view/ContactEdit_view.aod b/neonView/ContactEdit_view/ContactEdit_view.aod
index 861b5da3b0..7e82ca816b 100644
--- a/neonView/ContactEdit_view/ContactEdit_view.aod
+++ b/neonView/ContactEdit_view/ContactEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>data</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/ContactList_view/ContactList_view.aod b/neonView/ContactList_view/ContactList_view.aod
index c52c92ef47..f950d771e5 100644
--- a/neonView/ContactList_view/ContactList_view.aod
+++ b/neonView/ContactList_view/ContactList_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>main</name>
+ <name>Contacts</name>
<hideContentSearch v="true" />
<isEditable v="false" />
<entityField>#ENTITY</entityField>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 47464d32f3..8af0f327be 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>OrderDetail_template</name>
+ <name>Details</name>
<showDrawer v="true" />
<drawerCaption>Detail</drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
index e1258b43a5..9b2cb02c7a 100644
--- a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
+++ b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>linkData</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/StockCount_view/StockCount_view.aod b/neonView/StockCount_view/StockCount_view.aod
index e510784001..8e8ede676a 100644
--- a/neonView/StockCount_view/StockCount_view.aod
+++ b/neonView/StockCount_view/StockCount_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic</name>
+ <name>Stocks</name>
<showDrawer v="true" />
<drawerCaption>Stock</drawerCaption>
<entityField>#ENTITY</entityField>
diff --git a/neonView/StockEdit_view/StockEdit_view.aod b/neonView/StockEdit_view/StockEdit_view.aod
index 51a44973a2..ea63dc4bbf 100644
--- a/neonView/StockEdit_view/StockEdit_view.aod
+++ b/neonView/StockEdit_view/StockEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/StockFilter_view/StockFilter_view.aod b/neonView/StockFilter_view/StockFilter_view.aod
index 50d23d9240..b715a7f618 100644
--- a/neonView/StockFilter_view/StockFilter_view.aod
+++ b/neonView/StockFilter_view/StockFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table_template</name>
+ <name>Stocks</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 1d122a0c8c..f43c9f7a1c 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>main</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 76dbda0d06..5581203669 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -27,7 +27,7 @@
</layout>
<children>
<timelineViewTemplate>
- <name>mainTimeline</name>
+ <name>TasksTimeline</name>
<dateField>START_DATE</dateField>
<titleField>SUBJECT</titleField>
<descriptionField>DESCRIPTION</descriptionField>
@@ -35,7 +35,7 @@
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
<tableViewTemplate>
- <name>mainTable</name>
+ <name>TasksTable</name>
<entityField>#ENTITY</entityField>
<title></title>
<columns>
@@ -63,7 +63,7 @@
</columns>
</tableViewTemplate>
<treetableViewTemplate>
- <name>mainTreetable</name>
+ <name>TasksTreetable</name>
<titleField>SUBJECT</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>#ICON</iconField>
diff --git a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
index 17d77bee50..d947ac5f4a 100644
--- a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
+++ b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Table</name>
+ <name>TaskLinks</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
diff --git a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
index 5a43d5672c..564a98f8e8 100644
--- a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
+++ b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericMultipleViewTemplate>
- <name>GenericMultiple</name>
+ <name>MultipleEdit</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
index 0490135620..1ab3daed2f 100644
--- a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
+++ b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>Generic</name>
+ <name>Info</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index b90cedaa55..21a1ad13fa 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>head</name>
+ <name>Header</name>
<iconField>#ICON</iconField>
<titleField>SUBJECT</titleField>
<descriptionField>STATUS</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>extendedData</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 02f4fbcea5..4bc4885aac 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<cardViewTemplate>
- <name>head</name>
+ <name>Header</name>
<iconField>#ICON</iconField>
<titleField>SUBJECT</titleField>
<descriptionField>STATUS</descriptionField>
@@ -17,7 +17,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>extendedData</name>
+ <name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
index ae77a626db..7f4c05f9fc 100644
--- a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
+++ b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<genericViewTemplate>
- <name>TimetrackingEdit_template</name>
+ <name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index 141e746d2c..e923bf38ea 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>TimetrackingFilter_template</name>
+ <name>Timetrackings</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
--
GitLab
From c59a1932b07e36018978e5b13d2ba20211589278 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 07:36:45 +0100
Subject: [PATCH 031/250] fix Product
---
entity/Offeritem_entity/Offeritem_entity.aod | 1 +
.../entityfields/quantity/onValidation.js | 9 +++++++++
.../entityfields/quantity/valueProcess.js | 2 +-
entity/Prod2prod_entity/Prod2prod_entity.aod | 2 ++
.../entityfields/quantity/valueProcess.js | 18 ++++++++----------
5 files changed, 21 insertions(+), 11 deletions(-)
create mode 100644 entity/Offeritem_entity/entityfields/quantity/onValidation.js
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index f330271f5d..3c9b8ae970 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -81,6 +81,7 @@
<contentType>NUMBER</contentType>
<outputFormat>#</outputFormat>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValidation.js b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
new file mode 100644
index 0000000000..e5e0c8fb5f
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+logging.log("validate")
+if (parseInt(vars.get("$field.QUANTITY")) <= 0)
+{
+ result.string("${QUANTITY_LOWER_THAN_0}");
+}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/quantity/valueProcess.js b/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
index 801a9cf46f..ebd4664e61 100644
--- a/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/quantity/valueProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("system.neon");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string("1");
}
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 8826f3b29a..a6c4e305ff 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -27,6 +27,8 @@
<entityField>
<name>QUANTITY</name>
<title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
<valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js</valueProcess>
</entityField>
<entityField>
diff --git a/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js b/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js
index 66e7d5877c..1adf62b3fa 100644
--- a/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js
+++ b/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js
@@ -1,10 +1,8 @@
-//import("system.vars");
-//import("system.result");
-//import("system.neon");
-//
-//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
-//{
-// result.string("1");
-//}
-//else
-// result.string(vars.get("$this.value"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.QUANTITY"))
+{
+ result.string("1");
+}
\ No newline at end of file
--
GitLab
From 238c6e1019f338656405eb3204beaae0cd7146b9 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 11:35:00 +0100
Subject: [PATCH 032/250] =?UTF-8?q?Produkt:=20Sprache=20geh=C3=B6rt=20zu?=
=?UTF-8?q?=20Beschreibung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Product_entity/Product_entity.aod | 2 +-
entity/Product_entity/entityfields/language/titleProcess.js | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 entity/Product_entity/entityfields/language/titleProcess.js
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 817b35a0aa..b7ab75cc4e 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -279,8 +279,8 @@
</entityConsumer>
<entityField>
<name>LANGUAGE</name>
- <title>Language</title>
<consumer>Languages</consumer>
+ <titleProcess>%aditoprj%/entity/Product_entity/entityfields/language/titleProcess.js</titleProcess>
</entityField>
<entityConsumer>
<name>Languages</name>
diff --git a/entity/Product_entity/entityfields/language/titleProcess.js b/entity/Product_entity/entityfields/language/titleProcess.js
new file mode 100644
index 0000000000..04be2c545b
--- /dev/null
+++ b/entity/Product_entity/entityfields/language/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Language") + " (" + translate.text("Description") + ")");
\ No newline at end of file
--
GitLab
From 92d27f5c081e688d48cba805c2413b5ca0a92c82 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 11:41:17 +0100
Subject: [PATCH 033/250] =?UTF-8?q?=C3=BCbersetzung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Offeritem_entity/entityfields/quantity/onValidation.js | 3 ++-
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 ++++++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 7 +++++++
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 7 +++++++
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValidation.js b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
index e5e0c8fb5f..b6b200a809 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValidation.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.logging");
import("system.result");
import("system.vars");
@@ -5,5 +6,5 @@ import("system.vars");
logging.log("validate")
if (parseInt(vars.get("$field.QUANTITY")) <= 0)
{
- result.string("${QUANTITY_LOWER_THAN_0}");
+ result.string(translate.text("${QUANTITY_LOWER_THAN_1}"));
}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 879f3d272b..8a08edeeb5 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2568,6 +2568,12 @@
<entry>
<key>360 Degree</key>
</entry>
+ <entry>
+ <key>VAT in %</key>
+ </entry>
+ <entry>
+ <key>${QUANTITY_LOWER_THAN_1}</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 5362442f9a..38c7fc4a48 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -102,6 +102,10 @@
<key>${SALESPROJECT_MEMBER}</key>
<value>Projektteam</value>
</entry>
+ <entry>
+ <key>${QUANTITY_LOWER_THAN_1}</key>
+ <value>Die Menge muss mindestens 1 sein.</value>
+ </entry>
<entry>
<key>Days inactive</key>
<value>Tage inaktiv</value>
@@ -3307,6 +3311,9 @@
<key>Price policy</key>
<value>Preispolitik</value>
</entry>
+ <entry>
+ <key>VAT in %</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 2f458b7aaf..9007ab8c78 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2592,6 +2592,13 @@
<entry>
<key>360 Degree</key>
</entry>
+ <entry>
+ <key>VAT in %</key>
+ </entry>
+ <entry>
+ <key>${QUANTITY_LOWER_THAN_1}</key>
+ <value>Quantity should be greater than 0.</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 367bdbea5038c11acb8678ea8a3f9135b301836a Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 11:26:33 +0100
Subject: [PATCH 034/250] add validation for new contact of duplicate entries
---
entity/Contact_entity/Contact_entity.aod | 2 ++
.../organisation_id/onValidation.js | 19 +++++++++++++++++++
entity/Contact_entity/onValidation.js | 0
3 files changed, 21 insertions(+)
create mode 100644 entity/Contact_entity/entityfields/organisation_id/onValidation.js
create mode 100644 entity/Contact_entity/onValidation.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 7174d343ea..ecdd154429 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -4,6 +4,7 @@
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
+ <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
<recordContainer>db</recordContainer>
<entityFields>
@@ -19,6 +20,7 @@
<consumer>Organisations</consumer>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValidation.js b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
new file mode 100644
index 0000000000..7af59e488e
--- /dev/null
+++ b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
@@ -0,0 +1,19 @@
+import("system.translate");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Entity_lib");
+import("Sql_lib");
+
+var personId = vars.get("$field.PERSON_ID");
+var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISATION_ID");
+
+if (personId && organisationId)
+{
+ var alreadyExistantContactId = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", personId)
+ .andPrepare("CONTACT.ORGANISATION_ID", organisationId)
+ .buildSql("select CONTACT.CONTACTID from CONTACT"));
+ if (alreadyExistantContactId != "")
+ result.string(translate.text("The combination of person and organisation does already exist and can not be created once more."));
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/onValidation.js b/entity/Contact_entity/onValidation.js
new file mode 100644
index 0000000000..e69de29bb2
--
GitLab
From 942bc4faf012b0ee540e017cf5a4915ac8ae5d5e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 11:41:43 +0100
Subject: [PATCH 035/250] bugfix: could not edit org anymore
---
neonView/OrganisationEdit_view/OrganisationEdit_view.aod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 812914dec3..4a26e10585 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -44,7 +44,7 @@
</genericViewTemplate>
<neonViewReference>
<name>148e3a6c-d30b-470c-84e5-273293348611</name>
- <entityField>OrganisationAddresses</entityField>
+ <entityField>Addresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
--
GitLab
From eabb86901c6312403b69087a304d3d08ef8931bd Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 13:01:44 +0100
Subject: [PATCH 036/250] fix Sprache bei Angebot
---
entity/Offer_entity/Offer_entity.aod | 1 +
.../language/displayValueProcess.js | 27 +++++++++----------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 92d1a1ff77..42e32ee83e 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -59,6 +59,7 @@
<onValueChange>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
+ <element>PROCESS</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/Offer_entity/entityfields/language/displayValueProcess.js b/entity/Offer_entity/entityfields/language/displayValueProcess.js
index ac73db4489..bcbf211816 100644
--- a/entity/Offer_entity/entityfields/language/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/language/displayValueProcess.js
@@ -1,15 +1,12 @@
-import("system.db");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Sql_lib");
-
-//if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param"))
-{
- var iso3 = vars.get("$field.LANGUAGE");
- var latinName = db.cell(SqlCondition.begin()
- .andPrepare("AB_LANGUAGE.ISO3", iso3)
- .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=0"));
- latinName = translate.text(latinName);
- result.string(latinName);
-}
\ No newline at end of file
+import("system.db");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var iso3 = vars.get("$field.LANGUAGE");
+var latinName = db.cell(SqlCondition.begin()
+ .andPrepare("AB_LANGUAGE.ISO3", iso3)
+ .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=0"));
+latinName = translate.text(latinName);
+result.string(latinName);
--
GitLab
From 0daf078bad2f2d4d550878f433dcae21cd0ce44a Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 25 Mar 2019 14:36:58 +0100
Subject: [PATCH 037/250] #1035774: Prod2Prod tree
---
entity/Prod2prod_entity/Prod2prod_entity.aod | 6 +-
.../recordcontainers/jdito/contentProcess.js | 127 +++++++++++++++++-
.../Prod2prodFilter_view.aod | 2 +-
3 files changed, 126 insertions(+), 9 deletions(-)
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 278b28c9f4..ff0f7aa649 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -139,13 +139,9 @@
<onDelete>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
- <element>PARENTID.value</element>
- <element>PROD2PRODID.value</element>
+ <element>SOURCE_ID.value</element>
<element>DEST_ID.value</element>
- <element>SOURCE_ID.displayValue</element>
<element>QUANTITY.value</element>
- <element>OPTIONAL.value</element>
- <element>TAKEPRICE.value</element>
<element>PRODUCTCODE.value</element>
<element>PRODUCTID.value</element>
</recordFields>
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
index 4bd6e91ebb..2e71e4c9dd 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
@@ -6,17 +6,138 @@ import("system.db");
import("system.util");
import("Product_lib");
+/**
+ * Calculate the root elements for this tree.
+ *
+ * @param productRootID string
+ * @param rows TreeData[]
+ * @return string[]
+ */
+function calculateRootElements (productRootID, rows) {
+ return rows.filter(function (row) {
+ // Filter predicate if the DIST_ID matches.
+ return row[2] === productRootID;
+ }).map(function (row) {
+ // Map to PROD2PROD_ID.
+ return row[0];
+ });
+}
+
+/**
+* Calculates a mapping object which has the PROD2PROD_ID as
+* key and the full TreeData array as value.
+*
+* @param rows TreeData[]
+* @return {[key: TreeData]}
+*/
+function buildProd2ProdIDMapping (rows) {
+ var mapping = {}
+
+ rows.forEach(function(row) {
+ // Create new property which PROD2PROD_ID as key and data
+ // as value.
+ mapping[row[0]] = row;
+ });
+
+ return mapping;
+}
+
+/**
+ * Calcualtes the children mapping structure which has the DIST_ID
+ * as key and an array of PROD2PROD_IDs as value.
+ *
+ * @param rows TreeData[]
+ * @return {[key: string[]]}
+ */
+function buildChildrenMapping(rows) {
+ var parrentMapping = {}
+
+ rows.forEach(function (row) {
+ // Create empty array if not created previously.
+ if (parrentMapping[row[2]] === undefined)
+ parrentMapping[row[2]] = []
+
+ // Push with DIST_ID as key and PROD2PROD_ID as value.
+ parrentMapping[row[2]].push(row[0]);
+ })
+
+ return parrentMapping
+}
+
+/**
+ * Calculates the graph starting from the given elementID.
+ */
+function buildGraph (elementID, parentElementID, mappingStructure, prod2prodIdMapping) {
+ var elements = []
+
+ // Get the PROD2PROD data array and copy it.
+ // Copying is requried due to mutability of arrays.
+ var elementData = prod2prodIdMapping[elementID].slice(0);
+
+ // Just as an error prevention.
+ if (elementData === undefined)
+ return elements;
+
+ // Generate new PROD2PROD_ID to create a uniqueness between the PROD2PROD objects.
+ var virtualProd2ProdId = util.getNewUUID();
+
+ // Override actual PROD2PROD_ID with new ID.
+ elementData[0] = virtualProd2ProdId;
+
+ // Override parent id to match overriden prod2prodId of parent
+ if (parentElementID === null || parentElementID === undefined)
+ // Describes an root element
+ elementData[2] = null;
+ else
+ elementData[2] = parentElementID;
+
+ // Push element data to elements array of this graph.
+ elements.push(elementData);
+
+ // Search for children
+ var childrens = mappingStructure[elementData[1]];
+
+ if (childrens !== undefined && childrens.length > 0) {
+ // Build graph for each children
+
+ childrens.forEach(function(children) {
+ // Recursive function call (!)
+
+ var graphResult = buildGraph(children, elementData[0], mappingStructure, prod2prodIdMapping);
+
+ graphResult.forEach(function(res) {elements.push(res)})
+ });
+ }
+
+ return elements;
+}
+
if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
var prodid = vars.exists("$param.ProductId_param")
&& vars.get("$param.ProductId_param") != null ? vars.get("$param.ProductId_param") : "";
if(prodid != "")
{
- var p2pUtils = new Prod2ProdUtils(prodid);
- result.object(p2pUtils.getPartsListForRecordContainer());
+ // First 3 columns are crucial, the rest is optional.
+ var data = db.table("select PROD2PRODID, SOURCE_ID, DEST_ID, QUANTITY, PRODUCTCODE, PRODUCTID "
+ + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
+ + "order by PRODUCTCODE");
+
+ var prod2prodIdMapping = buildProd2ProdIDMapping(data);
+ var childrenMapping = buildChildrenMapping(data);
+ var rootElements = calculateRootElements(prodid, data);
+
+ var allData = []
+
+ rootElements.forEach(function(rg) {
+ var graphData = buildGraph(rg, null, childrenMapping, prod2prodIdMapping)
+ graphData.forEach(function (gd) { allData.push(gd); })
+ })
+
+ result.object(allData);
}
}
else
{
result.object([]);
-}
\ No newline at end of file
+}
diff --git a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
index b22717b6dc..eeaf321c7d 100644
--- a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
+++ b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
@@ -11,7 +11,7 @@
<children>
<treetableViewTemplate>
<name>Partlist</name>
- <parentField>PARENTID</parentField>
+ <parentField>DEST_ID</parentField>
<favoriteActionGroup1>alter</favoriteActionGroup1>
<titleField>PRODUCTCODE</titleField>
<descriptionField>QUANTITY</descriptionField>
--
GitLab
From a9d41ef2a5e84b1b1fcb591d904ce834e8d5c137 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 14:44:06 +0100
Subject: [PATCH 038/250] added comment
---
process/Context_lib/process.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 4427c14c80..6423127c07 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -107,7 +107,7 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId nameField Tablename, IDField, RelationField, override Tablename (needed if Tablename is a join clause)
+ // contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, override Tablename (needed if Tablename is a join clause)
"Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", ""],
"Person": [(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()), "PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ", "CONTACTID", "", "CONTACT"],
"Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID", ""],
--
GitLab
From 48acf017479a35204ac688314ebbe63b2c596a13 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 15:25:24 +0100
Subject: [PATCH 039/250] rename functions: relation to contact
---
.../entityfields/contacttype/valueProcess.js | 2 +-
.../recordcontainers/db/fromClauseProcess.js | 2 +-
.../contact_id/linkedContextProcess.js | 2 +-
.../presetlinks_param/valueProcess.js | 2 +-
.../contact_id/linkedContextProcess.js | 2 +-
.../newactivity/onActionProcess.js | 2 +-
.../entityfields/newtask/onActionProcess.js | 2 +-
.../salesproject_id/mandatoryProcess.js | 2 +-
.../presetlinks_param/valueProcess.js | 2 +-
.../presetlinks_param/valueProcess.js | 2 +-
.../contact_id/linkedContextProcess.js | 2 +-
.../newactivity/onActionProcess.js | 2 +-
.../entityfields/newtask/onActionProcess.js | 2 +-
.../presetlinks_param/valueProcess.js | 2 +-
.../Organisation_entity.aod | 2 +
.../recordcontainers/db/onDBInsert.js | 3 ++
process/Contact_lib/process.js | 43 +++++++++----------
process/PostalAddress_lib/process.js | 8 ++--
18 files changed, 44 insertions(+), 40 deletions(-)
create mode 100644 entity/Organisation_entity/recordcontainers/db/onDBInsert.js
diff --git a/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js b/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
index 32bb8ca197..1974bb4d5a 100644
--- a/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
+++ b/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("system.vars");
import("Contact_lib")
-result.object(ContactUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
+result.object(ContactUtils.getContactType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js b/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
index c2008fc0d1..7dc4c1aa3f 100644
--- a/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("Contact_lib")
-result.string(ContactUtils.getFullRelationString());
\ No newline at end of file
+result.string(ContactUtils.getFullContactString());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
index e678b842c5..2e504d63e3 100644
--- a/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Contact_lib");
-result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
index db35a547ac..e4c6c134df 100644
--- a/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
index e678b842c5..2e504d63e3 100644
--- a/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Contact_lib");
-result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
index d0e6ebcf2b..4be677edd5 100644
--- a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Offer_entity/entityfields/newtask/onActionProcess.js b/entity/Offer_entity/entityfields/newtask/onActionProcess.js
index b77c8343aa..f0165851ed 100644
--- a/entity/Offer_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newtask/onActionProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
index 05b1f9bd5c..3bd7da35b2 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("Contact_lib");
-var type = ContactUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
+var type = ContactUtils.getContactType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
result.string(type != 2);
diff --git a/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js b/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
index db35a547ac..e4c6c134df 100644
--- a/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
index db35a547ac..e4c6c134df 100644
--- a/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
index e678b842c5..2e504d63e3 100644
--- a/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Contact_lib");
-result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/newactivity/onActionProcess.js b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
index 52c2254f6f..1a27d3d454 100644
--- a/entity/Order_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Order_entity/entityfields/newtask/onActionProcess.js b/entity/Order_entity/entityfields/newtask/onActionProcess.js
index a2fb8e983a..3d0aeaf0be 100644
--- a/entity/Order_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Order_entity/entityfields/newtask/onActionProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js b/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
index db35a547ac..e4c6c134df 100644
--- a/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
@@ -7,7 +7,7 @@ var links = [];
if (contactId)
{
- links.push([ContactUtils.getContextByRelationId(contactId), contactId]);
+ links.push([ContactUtils.getContextByContactId(contactId), contactId]);
}
if (vars.get("$field.SALESPROJECT_ID"))
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1c9253f9ce..ea7df11cc5 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -187,6 +187,7 @@
<consumer>Addresses</consumer>
<searchable v="false" />
<state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/address_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
@@ -639,6 +640,7 @@
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBInsert>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000..ba0e67422c
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,3 @@
+import("system.logging");
+import("system.vars");
+
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index b3e659f848..c3b389da09 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -50,7 +50,7 @@ function ContactUtils() {}
* This saves an extra select from CONTACT. <br>
* <br>
* <br>
- * @param {String} pRelationId
+ * @param {String} pContactId
* @param {String} pPersId selected from the CONTACT table
* @param {String} pOrgId selected from the CONTACT table
* <br>
@@ -59,34 +59,34 @@ function ContactUtils() {}
* 2 if privat person <br>
* 3 if person of an organisation <br>
*/
-ContactUtils.getRelationType = function(pRelationId, pPersId, pOrgId)
+ContactUtils.getContactType = function(pContactId, pPersId, pOrgId)
{
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- return ContactUtils.getRelationTypeByRelation(pRelationId);
+ return ContactUtils.getContactTypeByContact(pContactId);
}
else
{
- return ContactUtils.getRelationTypeByPersOrg(pPersId, pOrgId);
+ return ContactUtils.getContactTypeByPersOrg(pPersId, pOrgId);
}
}
/**
* get the type of contact for a relationId <br>
- * If you already have persId and orgId from the CONTACT table, use getRelationTypeByPersOrg() <br>
- * @param {String} pRelationId
+ * If you already have persId and orgId from the CONTACT table, use getContactTypeByPersOrg() <br>
+ * @param {String} pContactId
* <br>
* @return {Integer} 0 if relationId not found <br>
* 1 if organisation <br>
* 2 if privat person <br>
* 3 if person of an organisation <br>
*/
-ContactUtils.getRelationTypeByRelation = function(pRelationId)
+ContactUtils.getContactTypeByContact = function(pContactId)
{
- var relationData = ContactUtils.getPersOrgIds(pRelationId);
+ var relationData = ContactUtils.getPersOrgIds(pContactId);
if (relationData[0])
{
- return this.getRelationTypeByPersOrg(relationData[1], relationData[2]);
+ return this.getContactTypeByPersOrg(relationData[1], relationData[2]);
}
else
{
@@ -102,7 +102,7 @@ ContactUtils.getRelationTypeByRelation = function(pRelationId)
* !!It does not check if the person / org ids really exist!! <br>
* !!And it does not check if really any contact with this person / org ids exist!! <br>
* <br>
- * This function is more performant than getRelationTypeByRelation, <br>
+ * This function is more performant than getContactTypeByContact, <br>
* because it doesn't load something from the db. <br>
* <br>
* It is meant to be used by entitys, where you can load person and org with the DataRecord. <br>
@@ -116,7 +116,7 @@ ContactUtils.getRelationTypeByRelation = function(pRelationId)
* 2 if privat person <br>
* 3 if person of an organisation <br>
*/
-ContactUtils.getRelationTypeByPersOrg = function(pPersId, pOrgId)
+ContactUtils.getContactTypeByPersOrg = function(pPersId, pOrgId)
{
if (!pPersId)
{
@@ -147,7 +147,7 @@ ContactUtils.getRelationTypeByPersOrg = function(pPersId, pOrgId)
* !!It does not check if the person / org ids really exist!! <br>
* !!And it does not check if really any contact with this person / org ids exist!! <br>
* <br>
- * This function is more performant than getContextByRelationId, <br>
+ * This function is more performant than getContextByContactId, <br>
* because it doesn't load something from the db. <br>
* <br>
* It is meant to be used by entitys, where you can load person and org with the DataRecord. <br>
@@ -161,7 +161,7 @@ ContactUtils.getRelationTypeByPersOrg = function(pPersId, pOrgId)
*/
ContactUtils.getContextByPersOrg = function(pPersId, pOrgId)
{
- switch (ContactUtils.getRelationTypeByPersOrg(pPersId, pOrgId))
+ switch (ContactUtils.getContactTypeByPersOrg(pPersId, pOrgId))
{
case 1: // Org
return ContextUtils.getContextName("Organisation");
@@ -177,27 +177,27 @@ ContactUtils.getContextByPersOrg = function(pPersId, pOrgId)
* return the corresponding context of the contact <br>
* If you already have persId and orgId from the CONTACT table, use getContextByPersOrg() <br>
*
- * @param {String} pRelationId
+ * @param {String} pContactId
* @return {String} contextname or "" if contact not found
*/
-ContactUtils.getContextByRelationId = function(pRelationId)
+ContactUtils.getContextByContactId = function(pContactId)
{
- var relationData = ContactUtils.getPersOrgIds(pRelationId);
+ var relationData = ContactUtils.getPersOrgIds(pContactId);
return ContactUtils.getContextByPersOrg(relationData[1], relationData[2])
}
/**
* get the person- and org-id from a contact as array
*
- * @param {String} pRelationId
+ * @param {String} pContactId
* @return {String[]} result as [persid, orgid] if one of them is null in the db, "" will be returned as the id.
*/
-ContactUtils.getPersOrgIds = function(pRelationId)
+ContactUtils.getPersOrgIds = function(pContactId)
{
- if (pRelationId) {
+ if (pContactId) {
return db.array(db.ROW,
SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", pRelationId)
+ .andPrepare("CONTACT.CONTACTID", pContactId)
.buildSql("select CONTACTID, PERSON_ID, ORGANISATION_ID from CONTACT", "1=0"));
}
@@ -264,14 +264,13 @@ ContactUtils.getTitleByPersonId = function(pPersonId)
*
* @return {String}
*/
-ContactUtils.getFullRelationString = function()
+ContactUtils.getFullContactString = function()
{
return " CONTACT join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID"
+ " left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID"
+ " left join ADDRESS on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID";
}
-
/**
* object for handling of a single contact
* provides static- and instance-functions
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 40445e11ec..7c96f2e623 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -63,8 +63,8 @@ AddressUtils.getFormattedOnlineAddressById = function(pAddressId)
*
* @return {String}
*/
-AddressUtils.getAddress = function(pRelationId) {
- var address = db.array(db.ROW, SqlCondition.begin().andPrepare("CONTACT.CONTACTID", pRelationId).buildSql('select CONTACTID, ADDRESS, BUILDINGNO, ZIP, CITY, "NAME", FIRSTNAME, LASTNAME, TITLE from' + ContactUtils.getFullRelationString(), "1=0"));
+AddressUtils.getAddress = function(pContactId) {
+ var address = db.array(db.ROW, SqlCondition.begin().andPrepare("CONTACT.CONTACTID", pContactId).buildSql('select CONTACTID, ADDRESS, BUILDINGNO, ZIP, CITY, "NAME", FIRSTNAME, LASTNAME, TITLE from' + ContactUtils.getFullContactString(), "1=0"));
// TODO: currently there are some relations without standard address. Use Hardcoded one.
if (!address[1]) {
@@ -75,7 +75,7 @@ AddressUtils.getAddress = function(pRelationId) {
address[4] = dummyAddress[3];
}
- var type = ContactUtils.getRelationTypeByRelation(pRelationId);
+ var type = ContactUtils.getContactTypeByContact(pContactId);
return AddressUtils.formatAddress(type, address[1], address[2], address[3], address[4], address[5], address[6], address[7], address[8]);
}
@@ -103,7 +103,7 @@ AddressUtils.getAddressById = function(pAddressId) {
address[4] = dummyAddress[4];
}
- var type = ContactUtils.getRelationTypeByRelation(address[0]);
+ var type = ContactUtils.getContactTypeByContact(address[0]);
var names = db.array(db.ROW, SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", address[0])
--
GitLab
From 6ff3683c9c094019d15b815ccdba8f7fb03c9109 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 15:27:29 +0100
Subject: [PATCH 040/250] rename functions: relation to contact
---
process/Contact_lib/process.js | 6 +++---
process/PostalAddress_lib/process.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index c3b389da09..4dc852d62e 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -63,7 +63,7 @@ ContactUtils.getContactType = function(pContactId, pPersId, pOrgId)
{
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- return ContactUtils.getContactTypeByContact(pContactId);
+ return ContactUtils.getContactTypeByContactId(pContactId);
}
else
{
@@ -81,7 +81,7 @@ ContactUtils.getContactType = function(pContactId, pPersId, pOrgId)
* 2 if privat person <br>
* 3 if person of an organisation <br>
*/
-ContactUtils.getContactTypeByContact = function(pContactId)
+ContactUtils.getContactTypeByContactId = function(pContactId)
{
var relationData = ContactUtils.getPersOrgIds(pContactId);
if (relationData[0])
@@ -102,7 +102,7 @@ ContactUtils.getContactTypeByContact = function(pContactId)
* !!It does not check if the person / org ids really exist!! <br>
* !!And it does not check if really any contact with this person / org ids exist!! <br>
* <br>
- * This function is more performant than getContactTypeByContact, <br>
+ * This function is more performant than getContactTypeByContactId, <br>
* because it doesn't load something from the db. <br>
* <br>
* It is meant to be used by entitys, where you can load person and org with the DataRecord. <br>
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 7c96f2e623..f3f2b67f1b 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -75,7 +75,7 @@ AddressUtils.getAddress = function(pContactId) {
address[4] = dummyAddress[3];
}
- var type = ContactUtils.getContactTypeByContact(pContactId);
+ var type = ContactUtils.getContactTypeByContactId(pContactId);
return AddressUtils.formatAddress(type, address[1], address[2], address[3], address[4], address[5], address[6], address[7], address[8]);
}
@@ -103,7 +103,7 @@ AddressUtils.getAddressById = function(pAddressId) {
address[4] = dummyAddress[4];
}
- var type = ContactUtils.getContactTypeByContact(address[0]);
+ var type = ContactUtils.getContactTypeByContactId(address[0]);
var names = db.array(db.ROW, SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", address[0])
--
GitLab
From 349752b40cada4636cb5ce60e09cf2374e391876 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 25 Mar 2019 16:04:54 +0100
Subject: [PATCH 041/250] #1035782: Context_lib: updated selectMap
---
process/Context_lib/process.js | 145 ++++++++++++++++++++++++---------
1 file changed, 107 insertions(+), 38 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 6423127c07..c6ff5abe8d 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -2,24 +2,25 @@ import("system.translate");
import("system.project");
import("system.vars");
import("system.SQLTYPES");
+import("Keyword_lib");
import("Sql_lib");
import("Contact_lib");
/**
* Methods to manage contexts.
* Do not create an instance of this!
- *
+ *
* @class
*/
function ContextUtils() {}
-
+
/**
* Get the id of the current context
* TODO: use a UUID of the current context which doesn't change
- *
+ *
* @return {String} Id of the current context
*/
-ContextUtils.getCurrentContextId = function()
+ContextUtils.getCurrentContextId = function()
{
return vars.getString("$sys.currentcontextname");
}
@@ -27,40 +28,40 @@ ContextUtils.getCurrentContextId = function()
/**
* TODO: use System function. Currently the Name is also the id.
* Returns the Name of a context by the Id
- *
+ *
* @param {String} pContextId the id of a context
* @return {String} Name of the current context
*/
-ContextUtils.getContextName = function(pContextId)
+ContextUtils.getContextName = function(pContextId)
{
// TODO: currently the Id is the context name. This will be changed maybe
return pContextId;
}
/**
- *
+ *
* @param {Boolean} [pFilter=false] filter only for contexts which have a mapping in ContextUtils._getSelectMap
- *
+ *
* @return {String[][]} the contexts [[contextId, contextName, contextTitle], [... ], ...]
*/
ContextUtils.getContexts = function(pFilter)
{
- if (pFilter == undefined)
+ if (pFilter == undefined)
pFilter = false;
-
+
var contexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
-
+
if (pFilter)
{
- contexts = contexts.filter(function(pContext)
+ contexts = contexts.filter(function(pContext)
{
// filter only contexts which have defined mappings in Context_lib
return ContextUtils._getSelectMap()[pContext[0]] != undefined;
});
}
-
-
- return contexts.map(ContextUtils._contextDataMapping).sort(function(pContext1, pContext2)
+
+
+ return contexts.map(ContextUtils._contextDataMapping).sort(function(pContext1, pContext2)
{
// sort after ContextTitle
if (pContext1[2] > pContext2[2])
@@ -75,9 +76,9 @@ ContextUtils.getContexts = function(pFilter)
/**
* get the data of a context
- *
+ *
* @param {String} pContextId the id of the context
- *
+ *
* @return {String[]} the contextdata [contextId, contextName, contextTitle]
*/
ContextUtils.getContext = function(pContextId)
@@ -87,9 +88,9 @@ ContextUtils.getContext = function(pContextId)
/**
* map the contextData from the system.project-lib to [contextId, contextName, contextTitle]
- *
+ *
* @param {String[]} pContext the data of a context (e.g. from project.getDataModel())
- *
+ *
* @return {String[]} the contextdata [contextId, contextName, contextTitle]
* @ignore
*/
@@ -107,19 +108,87 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, override Tablename (needed if Tablename is a join clause)
- "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", ""],
- "Person": [(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()), "PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ", "CONTACTID", "", "CONTACT"],
- "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID", ""],
- "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", "CONTACT_ID"],
- // TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
- // maskingUtils.concat([SqlMaskingUtils.cast("CONTRACTCODE", "varchar", 10), getKeySQL("CONTRACTTYPE", "CONTRACTTYPE" )])
- "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID", "CONTACT_ID"],
-// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
- "Offer": [maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10), "OFFER", "OFFERID", "CONTACT_ID"],
- "Order": [maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10), "SALESORDER", "SALESORDERID", "CONTACT_ID"],
- "Product": ["PRODUCTNAME", "PRODUCT", "PRODUCTID", ""],
- "Task": ["SUBJECT", "TASK", "TASKID", translate.text("Task"), ""]
+ // contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, override Tablename (needed if Tablename is a join clause)
+ // "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
+ "Organisation": [
+ "\"NAME\"",
+ "ORGANISATION",
+ "ORGANISATIONID",
+ ""
+ ],
+ "Person": [
+ (new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()),
+ "PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ",
+ "CONTACTID",
+ "",
+ "CONTACT"
+ ],
+ "Activity": [
+ "SUBJECT",
+ "ACTIVITY",
+ "ACTIVITYID",
+ ""
+ ],
+ "Salesproject": [
+ maskingUtils.concat([
+ "'" + translate.text("Salesproject") + "'",
+ "' '",
+ maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10),
+ "' | '",
+ "PROJECTTITLE"
+ ], "", false),
+ "SALESPROJECT",
+ "SALESPROJECTID",
+ "CONTACT_ID"],
+ "Contract": [
+ maskingUtils.concat([
+ KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
+ maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10)
+ ], " "),
+ "CONTRACT",
+ "CONTRACTID",
+ "CONTACT_ID"
+ ],
+ "Offer": [
+ maskingUtils.concat([
+ "'" + translate.text("Offer") + "'",
+ "' '",
+ maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10),
+ "'-'",
+ maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
+ ], "", false),
+ "OFFER",
+ "OFFERID",
+ "CONTACT_ID"],
+ "Order": [
+ maskingUtils.concat([
+ "'" + translate.text("Order") + "'",
+ "' '",
+ maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10),
+ "'-'",
+ maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
+ ], "", false),
+ "SALESORDER",
+ "SALESORDERID",
+ "CONTACT_ID"
+ ],
+ "Product": [
+ maskingUtils.concat([
+ "PRODUCTCODE",
+ "' | '",
+ "PRODUCTNAME"
+ ], "", false),
+ "PRODUCT",
+ "PRODUCTID",
+ ""
+ ],
+ "Task": [
+ "SUBJECT",
+ "TASK",
+ "TASKID",
+ translate.text("Task"),
+ ""
+ ]
}
}
@@ -127,7 +196,7 @@ ContextUtils.getFieldTitle = function(pContextId, pDefault)
{
if (ContextUtils._getSelectMap()[pContextId] != undefined && ContextUtils._getSelectMap()[pContextId].length >= 3)
return ContextUtils._getSelectMap()[pContextId][3];
-
+
return pDefault;
}
@@ -138,16 +207,16 @@ ContextUtils.getFieldTitle = function(pContextId, pDefault)
ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
{
var select = "(case " + pContextIdDbField + " ";
-
+
var selectMap = ContextUtils._getSelectMap()
- for (let contextId in selectMap)
+ for (let contextId in selectMap)
{
select += "when '" + contextId + "' then (select " + selectMap[contextId][0] + " from " + selectMap[contextId][1] + (pRowIdDbField ? " where " + selectMap[contextId][2] + " = " + pRowIdDbField : " ") + ") ";
}
-
+
select += "else 'Not defined in ContextUtils.getNameSql()!'";
select += "end)";
-
+
return select;
}
@@ -174,7 +243,7 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId)
{
cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][3], pRowId)
}
-
+
return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=1");
}
--
GitLab
From 4d11304da23f089aa9bccc64475ce55083905d9b Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 17:06:06 +0100
Subject: [PATCH 042/250] layout fix in task/activity
---
.../ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod | 4 ++--
neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
index dbb50a2c7e..3e74e530fc 100644
--- a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
+++ b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
@@ -3,9 +3,9 @@
<name>ActivityLinkMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericMultipleViewTemplate>
diff --git a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
index 5a43d5672c..80c5e84f4e 100644
--- a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
+++ b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
@@ -3,9 +3,9 @@
<name>TaskLinkMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericMultipleViewTemplate>
--
GitLab
From a6edf7e2c3ac6979a43f48cf3254dbb3d8ebc8fa Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 25 Mar 2019 17:34:31 +0100
Subject: [PATCH 043/250] create new keyword container
---
entity/KeywordEntry_entity/KeywordEntry_entity.aod | 1 +
1 file changed, 1 insertion(+)
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 4ee519d2d2..abec1dc43c 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -21,6 +21,7 @@
<title>Container</title>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
<groupable v="true" />
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
--
GitLab
From e230c028713fe759e7c5852a163eb77808de2dae Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 17:28:51 +0100
Subject: [PATCH 044/250] contact_entity: added workaround for
lookup-onvalidation
---
.../entityfields/organisation_id/onValidation.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValidation.js b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
index 7af59e488e..dc76ba738b 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValidation.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
@@ -8,6 +8,12 @@ import("Sql_lib");
var personId = vars.get("$field.PERSON_ID");
var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISATION_ID");
+//workaround for organisationId: $local.value will return the name of the organisation which is not what we want
+//but the field already contains the changed value; so let's load the field instead of the $local.value-variable
+//this is a bug within the ADITO-kernel
+//TODO: change the workaround behaviour when $local.value is retrieved correct
+organisationId = vars.get("$field.ORGANISATION_ID")
+
if (personId && organisationId)
{
var alreadyExistantContactId = db.cell(SqlCondition.begin()
--
GitLab
From 1375629550d0dd2a7b214479e7ff1fd836375704 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 25 Mar 2019 19:16:21 +0100
Subject: [PATCH 045/250] contact: validation of duplicated entry
---
.../entityfields/organisation_id/onValidation.js | 2 +-
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValidation.js b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
index dc76ba738b..1f8c6d2abe 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValidation.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
@@ -21,5 +21,5 @@ if (personId && organisationId)
.andPrepare("CONTACT.ORGANISATION_ID", organisationId)
.buildSql("select CONTACT.CONTACTID from CONTACT"));
if (alreadyExistantContactId != "")
- result.string(translate.text("The combination of person and organisation does already exist and can not be created once more."));
+ result.string(translate.text("This combination of person and organisation does already exist and can not be created once more."));
}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 38c7fc4a48..c1f94617e2 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -50,6 +50,10 @@
<key>Show all contracts</key>
<value>Alle Verträge anzeigen</value>
</entry>
+ <entry>
+ <key>This combination of person and organisation does already exist and can not be created once more.</key>
+ <value>Diese Kombination aus Person und Organisation existiert bereits und kann daher nicht nocht ein mal angelegt werden.</value>
+ </entry>
<entry>
<key>Communication data</key>
<value>Kommunikationsdaten</value>
--
GitLab
From 438979f1f6ca3ec457e12219007b0acdf714f943 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 25 Mar 2019 19:29:29 +0100
Subject: [PATCH 046/250] default grouping for 360 degree tree
---
neonView/360DegreeFilter_view/360DegreeFilter_view.aod | 3 +++
1 file changed, 3 insertions(+)
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index ae98a9499c..69e65dd43c 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -13,6 +13,9 @@
<name>Treetable</name>
<titleField>TITLE</titleField>
<descriptionField>CONTEXT_NAME</descriptionField>
+ <defaultGroupFields>
+ <element>CONTEXT_NAME</element>
+ </defaultGroupFields>
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
</children>
--
GitLab
From b112d771fee024ff85f53b73042116c4cd14c851 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 25 Mar 2019 19:34:06 +0100
Subject: [PATCH 047/250] default grouping for KeywordEntryFilter_view
---
.../KeywordEntryFilter_view.aod | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index 6f70290d77..c3d91906c2 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -9,6 +9,15 @@
</groupLayout>
</layout>
<children>
+ <treetableViewTemplate>
+ <name>EntriesTreetable</name>
+ <titleField>TITLE</titleField>
+ <descriptionField>KEYID</descriptionField>
+ <defaultGroupFields>
+ <element>CONTAINER</element>
+ </defaultGroupFields>
+ <entityField>#ENTITY</entityField>
+ </treetableViewTemplate>
<tableViewTemplate>
<name>EntriesTable</name>
<entityField>#ENTITY</entityField>
@@ -40,11 +49,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treetableViewTemplate>
- <name>EntriesTreetable</name>
- <titleField>TITLE</titleField>
- <descriptionField>KEYID</descriptionField>
- <entityField>#ENTITY</entityField>
- </treetableViewTemplate>
</children>
</neonView>
--
GitLab
From 999ff4140b1b3c767f84dab7ee18e73554db3b83 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 25 Mar 2019 19:50:42 +0100
Subject: [PATCH 048/250] 360 degree extensions
---
entity/360Degree_entity/360Degree_entity.aod | 6 +++++
.../recordcontainers/jdito/contentProcess.js | 9 ++++---
.../360DegreeFilter_view.aod | 2 +-
process/Context_lib/process.js | 27 +++++++++++++------
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index d46ac9f4dd..b06ecf030f 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -60,6 +60,11 @@
<groupable v="true" />
<valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/context_name/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>DATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -71,6 +76,7 @@
<element>TARGET_ID.value</element>
<element>TARGET_CONTEXT.value</element>
<element>TITLE.value</element>
+ <element>DATE.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 1f70304a1c..b0ff1bf408 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -15,10 +15,11 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
data.forEach(function (row)
{
var record = [];
- record[0] = util.getNewUUID();
- record[1] = row[0];
- record[2] = context;
- record[3] = row[1];
+ record[0] = util.getNewUUID(); // UID
+ record[1] = row[0]; // TARGET_ID
+ record[2] = context; // TARGET_CONTEXT
+ record[3] = row[1]; // TITLE
+ record[4] = row[2]; //DATE
resultList.push(record);
});
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index 69e65dd43c..3ad97c3f6f 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -12,7 +12,7 @@
<treetableViewTemplate>
<name>Treetable</name>
<titleField>TITLE</titleField>
- <descriptionField>CONTEXT_NAME</descriptionField>
+ <descriptionField>DATE</descriptionField>
<defaultGroupFields>
<element>CONTEXT_NAME</element>
</defaultGroupFields>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index c6ff5abe8d..c328d63048 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -108,12 +108,13 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, override Tablename (needed if Tablename is a join clause)
+ // contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, CreationDate override Tablename (needed if Tablename is a join clause)
// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
"Organisation": [
"\"NAME\"",
"ORGANISATION",
"ORGANISATIONID",
+ "",
""
],
"Person": [
@@ -121,12 +122,14 @@ ContextUtils._getSelectMap = function()
"PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ",
"CONTACTID",
"",
- "CONTACT"
+ "CONTACT",
+ ""
],
"Activity": [
"SUBJECT",
"ACTIVITY",
"ACTIVITYID",
+ "",
""
],
"Salesproject": [
@@ -139,7 +142,9 @@ ContextUtils._getSelectMap = function()
], "", false),
"SALESPROJECT",
"SALESPROJECTID",
- "CONTACT_ID"],
+ "CONTACT_ID",
+ "STARTDATE"
+ ],
"Contract": [
maskingUtils.concat([
KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
@@ -147,7 +152,8 @@ ContextUtils._getSelectMap = function()
], " "),
"CONTRACT",
"CONTRACTID",
- "CONTACT_ID"
+ "CONTACT_ID",
+ "CONTRACTSTART"
],
"Offer": [
maskingUtils.concat([
@@ -159,7 +165,9 @@ ContextUtils._getSelectMap = function()
], "", false),
"OFFER",
"OFFERID",
- "CONTACT_ID"],
+ "CONTACT_ID",
+ "OFFERDATE"
+ ],
"Order": [
maskingUtils.concat([
"'" + translate.text("Order") + "'",
@@ -170,7 +178,8 @@ ContextUtils._getSelectMap = function()
], "", false),
"SALESORDER",
"SALESORDERID",
- "CONTACT_ID"
+ "CONTACT_ID",
+ "ORDERDATE"
],
"Product": [
maskingUtils.concat([
@@ -180,6 +189,7 @@ ContextUtils._getSelectMap = function()
], "", false),
"PRODUCT",
"PRODUCTID",
+ "",
""
],
"Task": [
@@ -187,6 +197,7 @@ ContextUtils._getSelectMap = function()
"TASK",
"TASKID",
translate.text("Task"),
+ "",
""
]
}
@@ -243,7 +254,7 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId)
{
cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][3], pRowId)
}
-
- return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=1");
+
+ return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + ", " + selectMap[pContextId][4] + " from " + selectMap[pContextId][1], "1=1");
}
--
GitLab
From d3c585beb2cd3e38e19ad2dfcb74db845abcccd3 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 16:52:01 +0100
Subject: [PATCH 049/250] Product Fixes
---
entity/Prod2prod_entity/Prod2prod_entity.aod | 1 +
entity/Product_entity/Product_entity.aod | 2 +
.../language/displayValueProcess.js | 10 +++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 +
neonContext/Prod2prod/Prod2prod.aod | 4 --
.../Prod2prodTable_view.aod | 38 -------------------
.../ProductMain_view/ProductMain_view.aod | 5 ---
.../data/example_attribute/Attribute.xml | 10 ++++-
8 files changed, 23 insertions(+), 48 deletions(-)
create mode 100644 entity/Product_entity/entityfields/language/displayValueProcess.js
delete mode 100644 neonView/Prod2prodTable_view/Prod2prodTable_view.aod
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index ff0f7aa649..80bbc2d7cd 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,6 +1,7 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
<name>Prod2prod_entity</name>
+ <title>Parts list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index b7ab75cc4e..5501274d10 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -280,7 +280,9 @@
<entityField>
<name>LANGUAGE</name>
<consumer>Languages</consumer>
+ <searchable v="false" />
<titleProcess>%aditoprj%/entity/Product_entity/entityfields/language/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Languages</name>
diff --git a/entity/Product_entity/entityfields/language/displayValueProcess.js b/entity/Product_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 0000000000..de5246774f
--- /dev/null
+++ b/entity/Product_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.db");
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("Sql_lib");
+
+result.string(translate.text(db.cell(SqlCondition.begin().andPrepareVars("AB_LANGUAGE.ISO3", "$field.LANGUAGE")
+ .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=2"))));
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index c1f94617e2..08fc72b7af 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3317,6 +3317,7 @@
</entry>
<entry>
<key>VAT in %</key>
+ <value>UmsSt. in %</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonContext/Prod2prod/Prod2prod.aod b/neonContext/Prod2prod/Prod2prod.aod
index 5f3312e66d..3599d29114 100644
--- a/neonContext/Prod2prod/Prod2prod.aod
+++ b/neonContext/Prod2prod/Prod2prod.aod
@@ -16,9 +16,5 @@
<name>428b22a1-427f-4547-a478-964442078bc1</name>
<view>Prod2ProdEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>257aa20f-d6b4-4a64-8f61-bb62b6ef49c8</name>
- <view>Prod2prodTable_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/Prod2prodTable_view/Prod2prodTable_view.aod b/neonView/Prod2prodTable_view/Prod2prodTable_view.aod
deleted file mode 100644
index 7b14b322f3..0000000000
--- a/neonView/Prod2prodTable_view/Prod2prodTable_view.aod
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>Prod2prodTable_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>data</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>1a1880db-4a23-4c0f-9a87-7da546461cca</name>
- <entityField>PARENTID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>40710edc-b8ef-43fa-8f8c-99add3946c47</name>
- <entityField>SOURCE_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>673daab5-c779-49db-aaf4-851f2d0a2c95</name>
- <entityField>QUANTITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>0c99aadc-0798-45eb-b015-8cdef16bf0f1</name>
- <entityField>OPTIONAL</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>da0abba6-9ea0-4503-9b51-8d232f345aa8</name>
- <entityField>TAKEPRICE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index ed9d388e26..7ac4a87c4d 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -29,11 +29,6 @@
<entityField>#ENTITY</entityField>
<view>ProductDescription_view</view>
</neonViewReference>
- <neonViewReference>
- <name>cbcf23d7-1d80-41c5-8041-8e768fa91487</name>
- <entityField>ProductLinks</entityField>
- <view>Prod2prodTable_view</view>
- </neonViewReference>
<neonViewReference>
<name>7f416115-ff89-45ca-be10-ed568cac266c</name>
<entityField>ProductLinks</entityField>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 7ad3f95ced..6c2c36f53f 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -889,12 +889,20 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Preisliste"/>
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
+ <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="MIN_COUNT"/>
+ <column name="MAX_COUNT"/>
+</insert>
+
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
--
GitLab
From 937278a8ff162785a6ea250202bad700b296fb2a Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 09:50:01 +0100
Subject: [PATCH 050/250] Contact person: new Contact: exclude combinations
that already exist
---
entity/Contact_entity/Contact_entity.aod | 6 ++-
.../valueProcess.js | 5 +++
.../Organisation_entity.aod | 42 ++++++++++++++++---
.../recordcontainers/db/conditionProcess.js | 6 ++-
4 files changed, 51 insertions(+), 8 deletions(-)
create mode 100644 entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index ecdd154429..4ce8a38fd6 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -48,13 +48,17 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
+ <fieldName>WithPersonIdFilter</fieldName>
</dependency>
<children>
<entityParameter>
<name>WithPrivate_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityParameter>
diff --git a/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js b/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js
new file mode 100644
index 0000000000..b273dc66b2
--- /dev/null
+++ b/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+var personId = vars.get("$field.PERSON_ID");
+result.string(personId);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index ea7df11cc5..f16cf4d876 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -140,12 +140,6 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>7aa5f9b4-6986-4593-a6d8-c4fb03da9c68</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -156,6 +150,10 @@
<name>WithPrivate_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -633,6 +631,38 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>WithPersonIdFilter</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>5a456b04-f0ca-4a45-9c1f-bdfdf074434a</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <title></title>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>WithPrivate_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index d8bc46d7f9..d8f6c2d5a8 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -10,7 +10,11 @@ var cond = SqlCondition.begin()
if (vars.getString("$param.WithPrivate_param") != "true")
cond.andPrepare("ORGANISATION.ORGANISATIONID", "0", "# <> ?");
-//TODO: exclude already used (or validation of already used combinations)
+var excludeOrgsWithPersonId = vars.get("$param.ExcludeOrganisationsByPersonId")
+if (excludeOrgsWithPersonId)
+ cond.andAttachPrepared(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", excludeOrgsWithPersonId)
+ .buildSql("ORGANISATION.ORGANISATIONID not in (select CONTACT.ORGANISATION_ID from CONTACT", null, ")"));
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
--
GitLab
From 38862ed9fb6c461a80ae5abc93ab19ad8cd1491d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 09:56:21 +0100
Subject: [PATCH 051/250] Contact person: new Contact: exclude combinations
that already exist - documentation
---
entity/Organisation_entity/Organisation_entity.aod | 4 ++++
.../excludeorganisationsbypersonid/documentation.adoc | 2 ++
.../entityfields/withpersonidfilter/documentation.adoc | 2 ++
.../entityfields/withprivate_param/documentation.adoc | 9 +++++++++
4 files changed, 17 insertions(+)
create mode 100644 entity/Organisation_entity/entityfields/excludeorganisationsbypersonid/documentation.adoc
create mode 100644 entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc
create mode 100644 entity/Organisation_entity/entityfields/withprivate_param/documentation.adoc
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index f16cf4d876..64f7d41a88 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -589,6 +589,7 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/withprivate_param/valueProcess.js</valueProcess>
<expose v="true" />
<triggerRecalculation v="true" />
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withprivate_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
@@ -634,11 +635,13 @@
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<expose v="true" />
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/excludeorganisationsbypersonid/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>WithPersonIdFilter</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>5a456b04-f0ca-4a45-9c1f-bdfdf074434a</name>
@@ -656,6 +659,7 @@
<name>ExcludeOrganisationsByPersonId</name>
<title></title>
<expose v="true" />
+ <mandatory v="true" />
</entityParameter>
<entityParameter>
<name>WithPrivate_param</name>
diff --git a/entity/Organisation_entity/entityfields/excludeorganisationsbypersonid/documentation.adoc b/entity/Organisation_entity/entityfields/excludeorganisationsbypersonid/documentation.adoc
new file mode 100644
index 0000000000..df350126c6
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/excludeorganisationsbypersonid/documentation.adoc
@@ -0,0 +1,2 @@
+A param used to filter Organisations where a specific PersonId does already exist as contact-entry.
+In other words: The list of orgs is reduced by those where a Contact-entry does exist for the given Personid
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc b/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc
new file mode 100644
index 0000000000..417ca5b40f
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc
@@ -0,0 +1,2 @@
+Provides Organisations where a filter is applied:
+The list of Organisations is reduced by those where a Contact-entry does exist for a given PersonId.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/withprivate_param/documentation.adoc b/entity/Organisation_entity/entityfields/withprivate_param/documentation.adoc
new file mode 100644
index 0000000000..6465a654b7
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/withprivate_param/documentation.adoc
@@ -0,0 +1,9 @@
+Param that describes if the "private"-dummy-Organisation shall be returned or not.
+Possible values are:
+
+- `true`
+- `false`
+
+The Default value is `false`.
+
+If the value `true` is passed the "private"-dummy-Organisation will be returned. Otherwise the "private"-dummy-Organisation is filtered.
\ No newline at end of file
--
GitLab
From 13498ec8919d0961e440f6be54f5c87264b0baac Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Tue, 26 Mar 2019 11:17:09 +0100
Subject: [PATCH 052/250] Fixed selectMap (Context_lib)
---
.../recordcontainers/jdito/contentProcess.js | 2 +-
.../recordcontainers/jdito/contentProcess.js | 4 ++--
process/Context_lib/process.js | 11 +++++++----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index b0ff1bf408..f85cd0bacf 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -11,7 +11,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
contextList.forEach(function (context)
{
- var data = db.table(ContextUtils.getContextDataSql(context, vars.get("$param.ObjectRowId_param")));
+ var data = db.table(ContextUtils.getContextDataSql(context, vars.get("$param.ObjectRowId_param"), true));
data.forEach(function (row)
{
var record = [];
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index fa1404cf0a..49ee3565f7 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -7,11 +7,11 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
{
if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
{
- result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"))));
+ result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"), false)));
}
else
{
- result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"))))
+ result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false)))
}
}
else
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index c328d63048..698392214a 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -246,7 +246,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
-ContextUtils.getContextDataSql = function(pContextId, pRowId)
+ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate)
{
var selectMap = ContextUtils._getSelectMap()
var cond = SqlCondition.begin();
@@ -254,7 +254,10 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId)
{
cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][3], pRowId)
}
-
- return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + ", " + selectMap[pContextId][4] + " from " + selectMap[pContextId][1], "1=1");
-}
+ var dateColumn = "";
+ if (pWithDate === true)
+ dateColumn = ", " + selectMap[pContextId][4];
+
+ return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + dateColumn + " from " + selectMap[pContextId][1], "1=1");
+}
--
GitLab
From b0a18bb66080eba3ca30d3c836ecf7e306f891b7 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 11:28:57 +0100
Subject: [PATCH 053/250] Salesproject / Offer fixes
---
entity/Offer_entity/Offer_entity.aod | 1 +
entity/Offer_entity/entityfields/status/valueProcess.js | 6 ++++++
.../SalesprojectMember_entity.aod | 1 +
entity/Timetracking_entity/Timetracking_entity.aod | 1 +
.../entityfields/minutes/titleProcess.js | 9 +++++++++
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 ++++++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 ++++++
8 files changed, 34 insertions(+)
create mode 100644 entity/Offer_entity/entityfields/status/valueProcess.js
create mode 100644 entity/Timetracking_entity/entityfields/minutes/titleProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 42e32ee83e..ff52a60e35 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -78,6 +78,7 @@
<title>Status</title>
<consumer>KeywordOfferStates</consumer>
<state>EDITABLE</state>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js
new file mode 100644
index 0000000000..ea5cc54c96
--- /dev/null
+++ b/entity/Offer_entity/entityfields/status/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index c3eb99ba47..94831ab568 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -13,6 +13,7 @@
<title>Person</title>
<consumer>Contacts</consumer>
<linkedContext>Person</linkedContext>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 2030ef770a..2ed0a5850b 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -18,6 +18,7 @@
<title>Time</title>
<contentType>TEXT</contentType>
<mandatory v="true" />
+ <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess>
<displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
</entityField>
diff --git a/entity/Timetracking_entity/entityfields/minutes/titleProcess.js b/entity/Timetracking_entity/entityfields/minutes/titleProcess.js
new file mode 100644
index 0000000000..c089b7246e
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/minutes/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(translate.text("Time in minutes"));
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 8a08edeeb5..a4180005ab 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2574,6 +2574,12 @@
<entry>
<key>${QUANTITY_LOWER_THAN_1}</key>
</entry>
+ <entry>
+ <key>This combination of person and organisation does already exist and can not be created once more.</key>
+ </entry>
+ <entry>
+ <key>Time in minutes</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 08fc72b7af..7fe597e082 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3319,6 +3319,10 @@
<key>VAT in %</key>
<value>UmsSt. in %</value>
</entry>
+ <entry>
+ <key>Time in minutes</key>
+ <value>Zeit in Minuten</value>
+ </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 9007ab8c78..eec3b184f0 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2599,6 +2599,12 @@
<key>${QUANTITY_LOWER_THAN_1}</key>
<value>Quantity should be greater than 0.</value>
</entry>
+ <entry>
+ <key>This combination of person and organisation does already exist and can not be created once more.</key>
+ </entry>
+ <entry>
+ <key>Time in minutes</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 9204e2a29a44769447f325637508d173c26b7830 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@aschindlbeck-nb.aditosoftware.local>
Date: Tue, 26 Mar 2019 11:36:16 +0100
Subject: [PATCH 054/250] Merge + fixes
---
.../category/displayValueProcess.js | 12 +-
.../AppointmentLink_entity.aod | 264 +-
.../objectid/displayValueProcess.js | 14 +-
.../objecttype/displayValueProcess.js | 20 +-
.../opencontext/onActionProcess.js | 8 +-
.../Appointment_entity/Appointment_entity.aod | 408 +-
entity/Appointment_entity/afterUiInit.js | 44 +-
.../classification/valueProcess.js | 30 +-
.../entityfields/summary/onValueChange.js | 18 +-
.../entityfields/summary/valueProcess.js | 31 +-
.../recordcontainers/jdito/contentProcess.js | 174 +-
.../recordcontainers/jdito/onInsert.js | 584 +-
.../contractstatus/displayValueProcess.js | 12 +-
.../contracttype/displayValueProcess.js | 12 +-
.../payment/displayValueProcess.js | 12 +-
.../entityfields/type/displayValueProcess.js | 12 +-
.../deliveryterms/displayValueProcess.js | 12 +-
.../deliveryterms/valueProcess.js | 12 +-
.../paymentterms/displayValueProcess.js | 12 +-
.../entityfields/paymentterms/valueProcess.js | 12 +-
.../probability/displayValueProcess.js | 12 +-
.../status/displayValueProcess.js | 12 +-
entity/Offeritem_entity/Offeritem_entity.aod | 648 +-
.../groupcodeid/displayValueProcess.js | 12 +-
.../entityfields/quantity/onValidation.js | 24 +-
.../entityfields/quantity/onValueChange.js | 62 +-
.../status/displayValueProcess.js | 12 +-
.../groupcodeid/displayValueProcess.js | 12 +-
.../entityfields/unit/displayValueProcess.js | 12 +-
.../newappointment/onActionProcess.js | 28 +-
.../status/displayValueProcess.js | 12 +-
.../entityfields/type/displayValueProcess.js | 12 +-
.../groupcodeid/displayValueProcess.js | 12 +-
.../entityfields/unit/displayValueProcess.js | 12 +-
.../currency/displayValueProcess.js | 12 +-
.../entityfields/price/valueProcess.js | 10 +-
.../entityfields/vat/valueProcess.js | 10 +-
.../entityfields/phase/displayValueProcess.js | 12 +-
.../reason/displayValueProcess.js | 12 +-
.../status/displayValueProcess.js | 12 +-
.../groupcode/displayValueProcess.js | 12 +-
.../salesprojectid_param/valueProcess.js | 6 +-
.../salesproject_role/displayValueProcess.js | 12 +-
.../source/displayValueProcess.js | 12 +-
.../entityfields/phase/displayValueProcess.js | 12 +-
.../entityfields/phase/valueProcess.js | 10 +-
.../probability/displayValueProcess.js | 12 +-
.../entityfields/state/displayValueProcess.js | 12 +-
.../entityfields/state/valueProcess.js | 10 +-
.../warehouse/displayValueProcess.js | 12 +-
.../entityfields/type/displayValueProcess.js | 12 +-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 6639 +++++++++--------
.../AppointmentLink/AppointmentLink.aod | 38 +-
.../ActivityLinkPreviewList_view.aod | 52 +-
.../AppointmentEdit_view.aod | 82 +-
.../AppointmentLinkEdit_view.aod | 56 +-
.../AppointmentLinkFilter_view.aod | 40 +-
.../AppointmentPreview_view.aod | 72 +-
.../TaskLinkPreviewList_view.aod | 52 +-
process/Calendar_lib/process.js | 3806 +++++-----
process/Product_lib/process.js | 1212 +--
61 files changed, 7426 insertions(+), 7398 deletions(-)
diff --git a/entity/Activity_entity/entityfields/category/displayValueProcess.js b/entity/Activity_entity/entityfields/category/displayValueProcess.js
index e30329cc48..05aefdcf53 100644
--- a/entity/Activity_entity/entityfields/category/displayValueProcess.js
+++ b/entity/Activity_entity/entityfields/category/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index f5ead0f4e9..85253e1444 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,132 +1,132 @@
-<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>AppointmentLink_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityField>
- <name>AB_APPOINTMENTLINKID</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>APPOINTMENT_ID</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECTID</name>
- <consumer>Objects</consumer>
- <linkedContext>Object</linkedContext>
- <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>OBJECTTYPE</name>
- <consumer>Context</consumer>
- <linkedContext>Context</linkedContext>
- <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Links</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <targetContextField>OBJECTTYPE</targetContextField>
- <targetIdField>OBJECTID</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3dde1745-18a1-4499-83d0-61e414086997</name>
- <entityName>Appointment_entity</entityName>
- <fieldName>AppointmentLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Context</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Objects</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>opencontext</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
- </entityActionField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
- <tableName>AB_APPOINTMENTLINK</tableName>
- <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>APPOINTMENT_ID.value</name>
- <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTID.value</name>
- <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTTYPE.value</name>
- <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTID.displayValue</name>
- <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_APPOINTMENTLINKID.value</name>
- <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>AppointmentLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>AB_APPOINTMENTLINKID</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>APPOINTMENT_ID</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECTID</name>
+ <consumer>Objects</consumer>
+ <linkedContext>Object</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>OBJECTTYPE</name>
+ <consumer>Context</consumer>
+ <linkedContext>Context</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Links</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>OBJECTTYPE</targetContextField>
+ <targetIdField>OBJECTID</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>3dde1745-18a1-4499-83d0-61e414086997</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>AppointmentLinks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Context</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Objects</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>opencontext</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
+ </entityActionField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
+ <tableName>AB_APPOINTMENTLINK</tableName>
+ <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>APPOINTMENT_ID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTTYPE.value</name>
+ <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTID.displayValue</name>
+ <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_APPOINTMENTLINKID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
index 4667394dd7..48efd9fecb 100644
--- a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
@@ -1,8 +1,8 @@
-import("system.logging");
-import("system.db");
-import("system.vars");
-import("system.result");
-import("Context_lib")
-
-logging.log("name??")
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Context_lib")
+
+logging.log("name??")
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECTTYPE"), vars.get("$field.OBJECTID"))));
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
index 9600fe0fe7..9e7fb9a949 100644
--- a/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
@@ -1,11 +1,11 @@
-import("system.logging");
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("system.project");
-
-if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE"))
-{
- logging.log("objecttype value: " + project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
- result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.project");
+
+if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE"))
+{
+ logging.log("objecttype value: " + project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
+ result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
}
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js b/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
index 442af76990..961eba99f1 100644
--- a/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
@@ -1,5 +1,5 @@
-import("system.logging");
-
-
-
+import("system.logging");
+
+
+
logging.log("derp");
\ No newline at end of file
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 936bee1859..e3b7b3400b 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,202 +1,206 @@
-<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>Appointment_entity</name>
- <title>Termin</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
- <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityField>
- <name>SUMMARY</name>
- <title>Betreff</title>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- </entityField>
- <entityField>
- <name>CLASSIFICATION</name>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>BEGIN</name>
- <selectionMode>SINGLE</selectionMode>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>END</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
- </entityField>
- <entityFieldGroup>
- <name>STARTEND</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
- <description>FIELDGROUP</description>
- <fields>
- <element>BEGIN</element>
- <element>END</element>
- </fields>
- </entityFieldGroup>
- <entityField>
- <name>STATUS</name>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- <entityField>
- <name>LOCATION</name>
- </entityField>
- <entityField>
- <name>REMINDER_CHECK</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>REMINDER</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CATEGORIES</name>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- <entityField>
- <name>ATTENDEES</name>
- <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TRANSPARENCY</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
- </entityField>
- <entityActionGroup>
- <name>PartStatActionGroup</name>
- <children>
- <entityActionField>
- <name>accept</name>
- <fieldType>ACTION</fieldType>
- <title>accept</title>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
- <actionOrder v="0" />
- <iconId>VAADIN:CHECK</iconId>
- </entityActionField>
- <entityActionField>
- <name>decline</name>
- <fieldType>ACTION</fieldType>
- <title>decline</title>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CLOSE</iconId>
- </entityActionField>
- <entityActionField>
- <name>tentative</name>
- <fieldType>ACTION</fieldType>
- <title>tentative</title>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:QUESTION</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- </entityProvider>
- <entityParameter>
- <name>MasterEntry_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>ORGANIZER</name>
- </entityField>
- <entityField>
- <name>RRULE</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>RECURRENCEID</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SAFESCOPEFIELD</name>
- </entityField>
- <entityField>
- <name>MASTERBEGIN</name>
- </entityField>
- <entityField>
- <name>MASTEREND</name>
- </entityField>
- <entityField>
- <name>UID</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ATTENDEESLENGTH</name>
- </entityField>
- <entityField>
- <name>ICON</name>
- </entityField>
- <entityParameter>
- <name>Entry_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AnyObjectRowid_param</name>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AnyObjectType_param</name>
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>AppointmentLinks</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <title>jdito</title>
- <description></description>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ATTENDEESLENGTH.value</element>
- <element>BEGIN.value</element>
- <element>END.value</element>
- <element>SUMMARY.value</element>
- <element>ORGANIZER.value</element>
- <element>ATTENDEES.value</element>
- <element>STATUS.value</element>
- <element>LINKS.value</element>
- <element>DESCRIPTION.value</element>
- <element>LOCATION.value</element>
- <element>ICON.value</element>
- <element>CLASSIFICATION.value</element>
- <element>TRANSPARENCY.value</element>
- <element>CATEGORIES.value</element>
- <element>REMINDER.value</element>
- <element>REMINDER_CHECK.value</element>
- <element>RRULE.value</element>
- <element>RECURRENCEID.value</element>
- <element>SAFESCOPEFIELD.value</element>
- <element>MASTERBEGIN.value</element>
- <element>MASTEREND.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>Appointment_entity</name>
+ <title>Termin</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
+ <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>SUMMARY</name>
+ <title>Betreff</title>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATION</name>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>BEGIN</name>
+ <selectionMode>SINGLE</selectionMode>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>END</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
+ </entityField>
+ <entityFieldGroup>
+ <name>STARTEND</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>BEGIN</element>
+ <element>END</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>STATUS</name>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>LOCATION</name>
+ </entityField>
+ <entityField>
+ <name>REMINDER_CHECK</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>REMINDER</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CATEGORIES</name>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>ATTENDEES</name>
+ <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TRANSPARENCY</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>PartStatActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>accept</name>
+ <fieldType>ACTION</fieldType>
+ <title>accept</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
+ <actionOrder v="0" />
+ <iconId>VAADIN:CHECK</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>decline</name>
+ <fieldType>ACTION</fieldType>
+ <title>decline</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CLOSE</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>tentative</name>
+ <fieldType>ACTION</fieldType>
+ <title>tentative</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:QUESTION</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ </entityProvider>
+ <entityParameter>
+ <name>MasterEntry_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ORGANIZER</name>
+ </entityField>
+ <entityField>
+ <name>RRULE</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>RECURRENCEID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SAFESCOPEFIELD</name>
+ </entityField>
+ <entityField>
+ <name>MASTERBEGIN</name>
+ </entityField>
+ <entityField>
+ <name>MASTEREND</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ATTENDEESLENGTH</name>
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ </entityField>
+ <entityParameter>
+ <name>Entry_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectRowid_param</name>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectType_param</name>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>AppointmentLinks</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AppointmentLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <title>jdito</title>
+ <description></description>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>ATTENDEESLENGTH.value</element>
+ <element>BEGIN.value</element>
+ <element>END.value</element>
+ <element>SUMMARY.value</element>
+ <element>ORGANIZER.value</element>
+ <element>ATTENDEES.value</element>
+ <element>STATUS.value</element>
+ <element>LINKS.value</element>
+ <element>DESCRIPTION.value</element>
+ <element>LOCATION.value</element>
+ <element>ICON.value</element>
+ <element>CLASSIFICATION.value</element>
+ <element>TRANSPARENCY.value</element>
+ <element>CATEGORIES.value</element>
+ <element>REMINDER.value</element>
+ <element>REMINDER_CHECK.value</element>
+ <element>RRULE.value</element>
+ <element>RECURRENCEID.value</element>
+ <element>SAFESCOPEFIELD.value</element>
+ <element>MASTERBEGIN.value</element>
+ <element>MASTEREND.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Appointment_entity/afterUiInit.js b/entity/Appointment_entity/afterUiInit.js
index d55c53f2e1..c47e48d231 100644
--- a/entity/Appointment_entity/afterUiInit.js
+++ b/entity/Appointment_entity/afterUiInit.js
@@ -1,23 +1,23 @@
-import("system.util");
-import("system.neon");
-import("system.logging");
-import("system.vars");
-
-
-
-
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
- var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
- if(entry["AppLinkContext"] && entry["AppLinkId"])
- {
- logging.log("hier geht lohos... " + vars.get("$field.UID") + " id");
- neon.addRecord(null, "AppointmentLinks",
- {
- "AB_APPOINTMENTLINKID" : util.getNewUUID(),
- "OBJECTID" : entry["AppLinkId"],
- "OBJECTTYPE" : entry["AppLinkContext"]
- });
- }
+import("system.util");
+import("system.neon");
+import("system.logging");
+import("system.vars");
+
+
+
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+ var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(entry["AppLinkContext"] && entry["AppLinkId"])
+ {
+ logging.log("hier geht lohos... " + vars.get("$field.UID") + " id");
+ neon.addRecord(null, "AppointmentLinks",
+ {
+ "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+ "OBJECTID" : entry["AppLinkId"],
+ "OBJECTTYPE" : entry["AppLinkContext"]
+ });
+ }
}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/classification/valueProcess.js b/entity/Appointment_entity/entityfields/classification/valueProcess.js
index ec7def641b..a0ff98e63f 100644
--- a/entity/Appointment_entity/entityfields/classification/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/classification/valueProcess.js
@@ -1,16 +1,16 @@
-import("system.logging");
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-import("system.result");
-
-/**
- * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
- */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
-{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
-
- if(event[calendars.CLASSIFICATION])
- result.string(event[calendars.CLASSIFICATION]);
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.CLASSIFICATION])
+ result.string(event[calendars.CLASSIFICATION]);
}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/summary/onValueChange.js b/entity/Appointment_entity/entityfields/summary/onValueChange.js
index c2e271765a..5c77a90fc3 100644
--- a/entity/Appointment_entity/entityfields/summary/onValueChange.js
+++ b/entity/Appointment_entity/entityfields/summary/onValueChange.js
@@ -1,10 +1,10 @@
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-
-
-//var entry = JSON.parse(vars.get("$param.Entry_param"));
-//
-//entry[calendars.SUMMARY] = vars.get("$field.SUMMARY");
-//
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+
+
+//var entry = JSON.parse(vars.get("$param.Entry_param"));
+//
+//entry[calendars.SUMMARY] = vars.get("$field.SUMMARY");
+//
//neon.setFieldValue("$param.Entry_param", JSON.stringify(entry));
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/summary/valueProcess.js b/entity/Appointment_entity/entityfields/summary/valueProcess.js
index 432475ace3..72d7fc725d 100644
--- a/entity/Appointment_entity/entityfields/summary/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/summary/valueProcess.js
@@ -1,15 +1,18 @@
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-import("system.result");
-
-/**
- * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
- */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
-{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
-
- if(event[calendars.SUMMARY])
- result.string(event[calendars.SUMMARY]);
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ logging.log()
+
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.SUMMARY])
+ result.string(event[calendars.SUMMARY]);
}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index f215bb27df..af31672dba 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -1,87 +1,87 @@
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.datetime");
-import("system.eMath");
-import("system.util");
-import("system.neon");
-
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-
- var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
- var masterEntry = null;
- if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
- masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
- }
-
- var uid = entry[calendars.ID];
- var summary = entry[calendars.SUMMARY];
- var attendees = entry[calendars.AFFECTEDUSERS];
- var startdate = entry[calendars.DTSTART];
- var enddate = entry[calendars.DTEND];
- var links = entry[calendars.LINKS];
- var description = entry[calendars.DESCRIPTION];
- if(entry[calendars.ORGANIZER2] != undefined)
- var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
- var status = entry[calendars.STATUS];
- var location = entry[calendars.LOCATION];
- var reminder = entry[calendars.REMINDER_DURATION];
- var remindercheck = entry[calendars.HASREMINDER]
- var classification = entry[calendars.CLASSIFICATION];
- var transparency = entry[calendars.TRANSPARENCY];
- var categories = entry[calendars.CATEGORIES];
-
- var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
- var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
-
- // Recurrence
- var recurrenceID = entry[calendars.RECURRENCEID];
- var rrule = null;
- if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
- rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
- } else {
- rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
- }
-
-// if(entry["AppLinkContext"] && entry["AppLinkId"])
-// {
-// logging.log("hier geht lohos... " + uid + " id");
-// neon.addRecord(null, "AppointmentLinks",
-// {
-// "AB_APPOINTMENTLINKID" : util.getNewUUID(),
-// "APPOINTMENT_ID" : vars.get("$field.UID"),
-// "OBJECTID" : entry["AppLinkId"],
-// "OBJECTTYPE" : entry["AppLinkContext"]
-// });
-// }
-
- //@TODO Icon
- result.object([
- [
- uid,
- attendees.length,
- startdate,
- enddate,
- summary,
- organizer,
- attendees,
- status,
- links,
- description,
- location,
- '',
- classification,
- transparency,
- categories,
- reminder,
- remindercheck,
- rrule,
- recurrenceID,
- null,
- masterBegin,
- masterEnd
- ]
- ]);
-}
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.datetime");
+import("system.eMath");
+import("system.util");
+import("system.neon");
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+
+ var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+ var masterEntry = null;
+ if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
+ masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
+ }
+
+ var uid = entry[calendars.ID];
+ var summary = entry[calendars.SUMMARY];
+ var attendees = entry[calendars.AFFECTEDUSERS];
+ var startdate = entry[calendars.DTSTART];
+ var enddate = entry[calendars.DTEND];
+ var links = entry[calendars.LINKS];
+ var description = entry[calendars.DESCRIPTION];
+ if(entry[calendars.ORGANIZER2] != undefined)
+ var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
+ var status = entry[calendars.STATUS];
+ var location = entry[calendars.LOCATION];
+ var reminder = entry[calendars.REMINDER_DURATION];
+ var remindercheck = entry[calendars.HASREMINDER]
+ var classification = entry[calendars.CLASSIFICATION];
+ var transparency = entry[calendars.TRANSPARENCY];
+ var categories = entry[calendars.CATEGORIES];
+
+ var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
+ var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
+
+ // Recurrence
+ var recurrenceID = entry[calendars.RECURRENCEID];
+ var rrule = null;
+ if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
+ rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
+ } else {
+ rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
+ }
+
+// if(entry["AppLinkContext"] && entry["AppLinkId"])
+// {
+// logging.log("hier geht lohos... " + uid + " id");
+// neon.addRecord(null, "AppointmentLinks",
+// {
+// "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+// "APPOINTMENT_ID" : vars.get("$field.UID"),
+// "OBJECTID" : entry["AppLinkId"],
+// "OBJECTTYPE" : entry["AppLinkContext"]
+// });
+// }
+
+ //@TODO Icon
+ result.object([
+ [
+ uid,
+ attendees.length,
+ startdate,
+ enddate,
+ summary,
+ organizer,
+ attendees,
+ status,
+ links,
+ description,
+ location,
+ '',
+ classification,
+ transparency,
+ categories,
+ reminder,
+ remindercheck,
+ rrule,
+ recurrenceID,
+ null,
+ masterBegin,
+ masterEnd
+ ]
+ ]);
+}
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
index 8c5a320fa7..5c063693c6 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
@@ -1,293 +1,293 @@
-import("system.neon");
-import("system.calendars");
-import("system.vars");
-import("system.question");
-import("system.translate");
-import("system.text");
-import("system.datetime");
-import("system.db");
-import("system.result");
-import("system.tools");
-
-var event = JSON.parse(vars.getString("$param.Entry_param"));
-
-event[calendars.TYPE] = calendars.VEVENT;
-event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer.
-event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
-event[calendars.STATUS] = vars.getString("$field.STATUS");
-//event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
-event[calendars.LOCATION] = vars.get("$field.LOCATION");
-event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-event[calendars.DTSTART] = vars.get("$field.BEGIN");
-event[calendars.DTEND] = vars.get("$field.END");
-event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
-event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
-event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
-if(vars.get("$field.RRULE"))
- event[calendars.RRULE] = [vars.get("$field.RRULE")];
-if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
-{
- event[calendars.HASREMINDER] = "true";
- event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
-}
-var idstringarray = calendars.insert([event]);
-event[calendars.ID] = idstringarray[0];
-neon.setFieldValue("$field.UID", event[calendars.ID]);
-
-vars.set("$context.editmode", calendars.MODE_UPDATE);
-
-
-
-// Liefert die Benutzer zurück, auf die keine Schreibrechte bestehen
-function getReadOnlyUser()
-{
- var writeable = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);
- var affectedusers = vars.get("$context.affectedusers");
- var readonly = new Array();
-
- for ( i = 0; i < affectedusers.length; i++)
- {
- var user = affectedusers[i][0];
- if (!isWriteable(user, writeable))
- readonly.push(affectedusers[i][3]);
- }
- return readonly;
-}
-
-// Liefert TRUE, wenn der Benutzer bei denen mit Schreibberechtigungen enthalten ist
-function isWriteable(user, writeable)
-{
- for (var i = 0; i < writeable.length; i++)
- {
- if (writeable[i][0] == calendars.getCalendarUser(user))
- return true;
- }
- return false;
-}
-
-// Berechnet das Ende der Recurrence
-function recurrencend(event)
-{
- var rec_end = vars.getString("$field.rec_end");
-
- // Automatische Erkennung, was gewollt ist
- if (rec_end == "")
- {
- if (vars.get("$field.rec_end_count") != "")
- rec_end = "Endet nach Anzahl Terminen";
- else if (vars.get("$field.rec_end_date") != "")
- rec_end = "Endet am";
- }
-
- if (rec_end == "" || rec_end == "Kein Enddatum")
- {
- // Nichts
- }
- else if (rec_end == "Endet nach Anzahl Terminen")
- {
- event[calendars.RRULE][0] += (";COUNT=" + vars.get("$field.rec_end_count"));
- }
- else if (rec_end == "Endet am")
- {
- var dat = vars.get("$field.rec_end_date");
- var start = vars.get("$field.start_date");
- var localTime = datetime.toDate(dat, translate.text("yyyyMMdd")) + datetime.toDate(start, "HHmmss");
- var utcTime = datetime.toLong(localTime, "yyyyMMddHHmmss");
- event[calendars.RRULE][0] += (";UNTIL=" + datetime.toDate(utcTime, "yyyyMMdd\'T\'HHmmss\'Z\'", "UTC"));
- }
-}
-
-/**
- * Berechnet die Wiederholung
- *
- * @param event Das fertige Event. Hier die Reccurrence speichern
- */
-function calcrecurrence(event)
-{
- var rec_type = vars.get("$field.rec_type");
-
- if (rec_type == "")
- {
- // Nichts
- }
- else if (rec_type == "Keine")
- {
- }
- else if (rec_type == "Täglich")
- {
- rec_daily(event);
- }
- else if (rec_type == "Wöchentlich")
- {
- rec_weekly(event);
- }
- else if (rec_type == "Monatlich")
- {
- rec_monthly(event);
- }
- else if (rec_type == "Jährlich")
- {
- rec_yearly(event);
- }
- else
- {
- question.showMessage("Internal (1) " + rec_type);
- }
-}
-/***********************/
-function rec_yearly(event)
-{
- var rec_year = vars.get("$field.rec_yearly");
- var rec_yearly_month = vars.get("$field.rec_yearly_month");
- var rec_yearly_day = vars.get("$field.rec_yearly_day");
- var month;
- var day;
-
- if (rec_year == "")
- {
- if (rec_yearly_month != "" && rec_yearly_day != "")
- rec_year = "Jeden # #";
- else if (rec_yearly_month != "" && vars.get("$field.rec_yearly_day2") != "" && vars.get("$field.rec_yearly_number2") != "")
- rec_year = "Am #. # im #";
- }
-
- if (rec_year == "" || (rec_yearly_month == "" && rec_yearly_day == "" ))
- {
- question.showMessage(translate.text("yearly series not specified"));
- }
- else if (rec_year == "Jeden # #")
- {
- month = rec_yearly_month;
- day = rec_yearly_day;
- event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTHDAY="+day+";BYMONTH="+month);
- }
- else if (rec_year == "Am #. # im #")
- {
- month = vars.get("$field.rec_yearly_month2");
- day = vars.get("$field.rec_yearly_day2");
- var number = vars.get("$field.rec_yearly_number2");
- event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTH="+month+";BYDAY="+number+day);
- }
-}
-/***********************/
-function rec_monthly(event)
-{
- var rec_month = vars.get("$field.rec_month");
- var rec_monthly_day = vars.get("$field.rec_monthly_day");
- var rec_monthly_interval = vars.get("$field.rec_monthly_interval");
- var day;
- var interval;
-
- if (rec_month == "")
-
- {
- if (rec_monthly_day != "" && rec_monthly_interval != "")
- rec_month = "Am #. jedes #. Monat";
- else if (vars.get("$field.rec_monthly_day2") != "" && vars.get("$field.rec_monthly_interval2") != "" && vars.get("$field.rec_monthly_weekday2") != "")
- rec_month = "Am #. # jeden #. Monat";
- }
-
- if (rec_month == "" || (rec_monthly_day == "" && rec_monthly_interval != ""))
- {
- question.showMessage(translate.text("Ignore series"));
- }
- else if (rec_month == "Am #. jedes #. Monat")
- {
- day = rec_monthly_day;
- interval = rec_monthly_interval;
- event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYMONTHDAY=" + day);
- }
- else if(rec_month == "Am #. # jeden #. Monat")
- {
- day = vars.get("$field.rec_monthly_day2");
- interval = vars.get("$field.rec_monthly_interval2");
- var weekday = vars.get("$field.rec_monthly_weekday2");
- event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYDAY=" + day + weekday);
- }
-}
-/***********************/
-function rec_weekly(event)
-{
-
- var rec_weekly_intervall = vars.get("$field.rec_weekly_intervall");
- if (rec_weekly_intervall == "")
- rec_weekly_intervall = "1";
-
- var days = new Array();
- var count = 0;
- if (vars.get("$field.rec_weekly_mo") == "true")
- {
- days[count] = "MO";
- count++;
- }
- if (vars.get("$field.rec_weekly_di") == "true")
- {
- days[count] = "TU";
- count++;
- }
- if (vars.get("$field.rec_weekly_mi") == "true")
- {
- days[count] = "WE";
- count++;
- }
- if (vars.get("$field.rec_weekly_do") == "true")
- {
- days[count] = "TH";
- count++;
- }
- if (vars.get("$field.rec_weekly_fr") == "true")
- {
- days[count] = "FR";
- count++;
- }
- if (vars.get("$field.rec_weekly_sa") == "true")
- {
- days[count] = "SA";
- count++;
- }
- if (vars.get("$field.rec_weekly_so") == "true")
- {
- days[count] = "SU";
- count++;
- }
- if (count > 0)
- {
- event[calendars.RRULE] = new Array("FREQ=WEEKLY;INTERVAL=" + rec_weekly_intervall + ";WKST=MO;BYDAY=");
- for (var i = 0; i < count; i++)
- {
- event[calendars.RRULE][0] += days[i];
- if (i+1 < count)
- {
- event[calendars.RRULE][0] += ",";
- }
- }
- }
-}
-/***********************/
-function rec_daily(event)
-{
- var rec_dailytype = vars.get("$field.rec_dailytype");
- var rec_dailydays = vars.get("$field.rec_daily_days");
- if (rec_dailytype == "")
- {
- if (rec_dailydays != "")
- rec_dailytype = "Alle # Tage";
- }
-
- if (rec_dailytype == "" || rec_dailydays == "")
- {
- question.showMessage(translate.text("Ignore daily series"));
- }
- else if (rec_dailytype == "Alle # Tage")
- {
- event[calendars.RRULE] = new Array("FREQ=DAILY;INTERVAL=" + rec_dailydays);
- }
- else if (rec_dailytype == "Jeden Arbeitstag")
- {
- event[calendars.RRULE][0] = new Array("FREQ=WEEKLY;WKST=MO;BYDAY=MO,TU,WE,TH,FR");
- }
- else
- {
- question.showMessage(translate.text("Internal (2)") + " " + rec_dailytype);
- }
+import("system.neon");
+import("system.calendars");
+import("system.vars");
+import("system.question");
+import("system.translate");
+import("system.text");
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.tools");
+
+var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+event[calendars.TYPE] = calendars.VEVENT;
+event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer.
+event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
+event[calendars.STATUS] = vars.getString("$field.STATUS");
+//event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
+event[calendars.LOCATION] = vars.get("$field.LOCATION");
+event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
+event[calendars.DTSTART] = vars.get("$field.BEGIN");
+event[calendars.DTEND] = vars.get("$field.END");
+event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
+event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
+event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
+if(vars.get("$field.RRULE"))
+ event[calendars.RRULE] = [vars.get("$field.RRULE")];
+if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
+{
+ event[calendars.HASREMINDER] = "true";
+ event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
+}
+var idstringarray = calendars.insert([event]);
+event[calendars.ID] = idstringarray[0];
+neon.setFieldValue("$field.UID", event[calendars.ID]);
+
+vars.set("$context.editmode", calendars.MODE_UPDATE);
+
+
+
+// Liefert die Benutzer zurück, auf die keine Schreibrechte bestehen
+function getReadOnlyUser()
+{
+ var writeable = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);
+ var affectedusers = vars.get("$context.affectedusers");
+ var readonly = new Array();
+
+ for ( i = 0; i < affectedusers.length; i++)
+ {
+ var user = affectedusers[i][0];
+ if (!isWriteable(user, writeable))
+ readonly.push(affectedusers[i][3]);
+ }
+ return readonly;
+}
+
+// Liefert TRUE, wenn der Benutzer bei denen mit Schreibberechtigungen enthalten ist
+function isWriteable(user, writeable)
+{
+ for (var i = 0; i < writeable.length; i++)
+ {
+ if (writeable[i][0] == calendars.getCalendarUser(user))
+ return true;
+ }
+ return false;
+}
+
+// Berechnet das Ende der Recurrence
+function recurrencend(event)
+{
+ var rec_end = vars.getString("$field.rec_end");
+
+ // Automatische Erkennung, was gewollt ist
+ if (rec_end == "")
+ {
+ if (vars.get("$field.rec_end_count") != "")
+ rec_end = "Endet nach Anzahl Terminen";
+ else if (vars.get("$field.rec_end_date") != "")
+ rec_end = "Endet am";
+ }
+
+ if (rec_end == "" || rec_end == "Kein Enddatum")
+ {
+ // Nichts
+ }
+ else if (rec_end == "Endet nach Anzahl Terminen")
+ {
+ event[calendars.RRULE][0] += (";COUNT=" + vars.get("$field.rec_end_count"));
+ }
+ else if (rec_end == "Endet am")
+ {
+ var dat = vars.get("$field.rec_end_date");
+ var start = vars.get("$field.start_date");
+ var localTime = datetime.toDate(dat, translate.text("yyyyMMdd")) + datetime.toDate(start, "HHmmss");
+ var utcTime = datetime.toLong(localTime, "yyyyMMddHHmmss");
+ event[calendars.RRULE][0] += (";UNTIL=" + datetime.toDate(utcTime, "yyyyMMdd\'T\'HHmmss\'Z\'", "UTC"));
+ }
+}
+
+/**
+ * Berechnet die Wiederholung
+ *
+ * @param event Das fertige Event. Hier die Reccurrence speichern
+ */
+function calcrecurrence(event)
+{
+ var rec_type = vars.get("$field.rec_type");
+
+ if (rec_type == "")
+ {
+ // Nichts
+ }
+ else if (rec_type == "Keine")
+ {
+ }
+ else if (rec_type == "Täglich")
+ {
+ rec_daily(event);
+ }
+ else if (rec_type == "Wöchentlich")
+ {
+ rec_weekly(event);
+ }
+ else if (rec_type == "Monatlich")
+ {
+ rec_monthly(event);
+ }
+ else if (rec_type == "Jährlich")
+ {
+ rec_yearly(event);
+ }
+ else
+ {
+ question.showMessage("Internal (1) " + rec_type);
+ }
+}
+/***********************/
+function rec_yearly(event)
+{
+ var rec_year = vars.get("$field.rec_yearly");
+ var rec_yearly_month = vars.get("$field.rec_yearly_month");
+ var rec_yearly_day = vars.get("$field.rec_yearly_day");
+ var month;
+ var day;
+
+ if (rec_year == "")
+ {
+ if (rec_yearly_month != "" && rec_yearly_day != "")
+ rec_year = "Jeden # #";
+ else if (rec_yearly_month != "" && vars.get("$field.rec_yearly_day2") != "" && vars.get("$field.rec_yearly_number2") != "")
+ rec_year = "Am #. # im #";
+ }
+
+ if (rec_year == "" || (rec_yearly_month == "" && rec_yearly_day == "" ))
+ {
+ question.showMessage(translate.text("yearly series not specified"));
+ }
+ else if (rec_year == "Jeden # #")
+ {
+ month = rec_yearly_month;
+ day = rec_yearly_day;
+ event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTHDAY="+day+";BYMONTH="+month);
+ }
+ else if (rec_year == "Am #. # im #")
+ {
+ month = vars.get("$field.rec_yearly_month2");
+ day = vars.get("$field.rec_yearly_day2");
+ var number = vars.get("$field.rec_yearly_number2");
+ event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTH="+month+";BYDAY="+number+day);
+ }
+}
+/***********************/
+function rec_monthly(event)
+{
+ var rec_month = vars.get("$field.rec_month");
+ var rec_monthly_day = vars.get("$field.rec_monthly_day");
+ var rec_monthly_interval = vars.get("$field.rec_monthly_interval");
+ var day;
+ var interval;
+
+ if (rec_month == "")
+
+ {
+ if (rec_monthly_day != "" && rec_monthly_interval != "")
+ rec_month = "Am #. jedes #. Monat";
+ else if (vars.get("$field.rec_monthly_day2") != "" && vars.get("$field.rec_monthly_interval2") != "" && vars.get("$field.rec_monthly_weekday2") != "")
+ rec_month = "Am #. # jeden #. Monat";
+ }
+
+ if (rec_month == "" || (rec_monthly_day == "" && rec_monthly_interval != ""))
+ {
+ question.showMessage(translate.text("Ignore series"));
+ }
+ else if (rec_month == "Am #. jedes #. Monat")
+ {
+ day = rec_monthly_day;
+ interval = rec_monthly_interval;
+ event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYMONTHDAY=" + day);
+ }
+ else if(rec_month == "Am #. # jeden #. Monat")
+ {
+ day = vars.get("$field.rec_monthly_day2");
+ interval = vars.get("$field.rec_monthly_interval2");
+ var weekday = vars.get("$field.rec_monthly_weekday2");
+ event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYDAY=" + day + weekday);
+ }
+}
+/***********************/
+function rec_weekly(event)
+{
+
+ var rec_weekly_intervall = vars.get("$field.rec_weekly_intervall");
+ if (rec_weekly_intervall == "")
+ rec_weekly_intervall = "1";
+
+ var days = new Array();
+ var count = 0;
+ if (vars.get("$field.rec_weekly_mo") == "true")
+ {
+ days[count] = "MO";
+ count++;
+ }
+ if (vars.get("$field.rec_weekly_di") == "true")
+ {
+ days[count] = "TU";
+ count++;
+ }
+ if (vars.get("$field.rec_weekly_mi") == "true")
+ {
+ days[count] = "WE";
+ count++;
+ }
+ if (vars.get("$field.rec_weekly_do") == "true")
+ {
+ days[count] = "TH";
+ count++;
+ }
+ if (vars.get("$field.rec_weekly_fr") == "true")
+ {
+ days[count] = "FR";
+ count++;
+ }
+ if (vars.get("$field.rec_weekly_sa") == "true")
+ {
+ days[count] = "SA";
+ count++;
+ }
+ if (vars.get("$field.rec_weekly_so") == "true")
+ {
+ days[count] = "SU";
+ count++;
+ }
+ if (count > 0)
+ {
+ event[calendars.RRULE] = new Array("FREQ=WEEKLY;INTERVAL=" + rec_weekly_intervall + ";WKST=MO;BYDAY=");
+ for (var i = 0; i < count; i++)
+ {
+ event[calendars.RRULE][0] += days[i];
+ if (i+1 < count)
+ {
+ event[calendars.RRULE][0] += ",";
+ }
+ }
+ }
+}
+/***********************/
+function rec_daily(event)
+{
+ var rec_dailytype = vars.get("$field.rec_dailytype");
+ var rec_dailydays = vars.get("$field.rec_daily_days");
+ if (rec_dailytype == "")
+ {
+ if (rec_dailydays != "")
+ rec_dailytype = "Alle # Tage";
+ }
+
+ if (rec_dailytype == "" || rec_dailydays == "")
+ {
+ question.showMessage(translate.text("Ignore daily series"));
+ }
+ else if (rec_dailytype == "Alle # Tage")
+ {
+ event[calendars.RRULE] = new Array("FREQ=DAILY;INTERVAL=" + rec_dailydays);
+ }
+ else if (rec_dailytype == "Jeden Arbeitstag")
+ {
+ event[calendars.RRULE][0] = new Array("FREQ=WEEKLY;WKST=MO;BYDAY=MO,TU,WE,TH,FR");
+ }
+ else
+ {
+ question.showMessage(translate.text("Internal (2)") + " " + rec_dailytype);
+ }
}
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js b/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js
index d2a99e1754..66bf177f66 100644
--- a/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.contractStatus(), vars.get("$field.CONTRACTSTATUS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contractStatus(), vars.get("$field.CONTRACTSTATUS")));
diff --git a/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js b/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js
index a6d267e87e..71f2a895f0 100644
--- a/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.get("$field.CONTRACTTYPE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.get("$field.CONTRACTTYPE")));
diff --git a/entity/Contract_entity/entityfields/payment/displayValueProcess.js b/entity/Contract_entity/entityfields/payment/displayValueProcess.js
index 70c898b2f5..3129346218 100644
--- a/entity/Contract_entity/entityfields/payment/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/payment/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.contractPayment(), vars.get("$field.PAYMENT")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contractPayment(), vars.get("$field.PAYMENT")));
diff --git a/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js b/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js
index b2d3eaf819..9c4c0c7870 100644
--- a/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js
+++ b/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.keywordAttributeType(), vars.get("$field.TYPE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.keywordAttributeType(), vars.get("$field.TYPE")));
diff --git a/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js
index cfacf44952..61db9c5b10 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), vars.get("$field.DELIVERYTERMS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), vars.get("$field.DELIVERYTERMS")));
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
index 14d10fe37d..c1fc17cc44 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
-{
- result.string(vars.get("$param.OfferDeliveryTerm_param"));
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
+{
+ result.string(vars.get("$param.OfferDeliveryTerm_param"));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js b/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js
index 720b4205ef..28d34ae5de 100644
--- a/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.paymentTerm(), vars.get("$field.PAYMENTTERMS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.paymentTerm(), vars.get("$field.PAYMENTTERMS")));
diff --git a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
index 45aef72b91..298cb1a859 100644
--- a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param"))
-{
- result.string(vars.get("$param.OfferPaymentTerm_param"));
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param"))
+{
+ result.string(vars.get("$param.OfferPaymentTerm_param"));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/probability/displayValueProcess.js b/entity/Offer_entity/entityfields/probability/displayValueProcess.js
index 956270d63c..888f3e80c6 100644
--- a/entity/Offer_entity/entityfields/probability/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/probability/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.offerProbability(), vars.get("$field.PROBABILITY")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.offerProbability(), vars.get("$field.PROBABILITY")));
diff --git a/entity/Offer_entity/entityfields/status/displayValueProcess.js b/entity/Offer_entity/entityfields/status/displayValueProcess.js
index 70befa7529..5e51722dd9 100644
--- a/entity/Offer_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.offerStatus(), vars.get("$field.STATUS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.offerStatus(), vars.get("$field.STATUS")));
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 3c9b8ae970..bca109621b 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,324 +1,324 @@
-<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>Offeritem_entity</name>
- <title>Offeritem</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
- <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ASSIGNEDTO</name>
- </entityField>
- <entityField>
- <name>DISCOUNT</name>
- <title>Discount %</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0</outputFormat>
- </entityField>
- <entityField>
- <name>GROUPCODEID</name>
- <title>Commodity group</title>
- <consumer>KeywordProductGroupcodes</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ITEMNAME</name>
- <title>Designation</title>
- </entityField>
- <entityField>
- <name>ITEMPOSITION</name>
- <title>Position</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>ITEMSORT</name>
- </entityField>
- <entityField>
- <name>OFFERITEMID</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OFFER_ID</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRICE</name>
- <title>Unit price</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
- <title>Article</title>
- <consumer>Products</consumer>
- <linkedContext>Product</linkedContext>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
- <title>Quantity</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#</outputFormat>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
- <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>UNIT</name>
- <title>Unit</title>
- <consumer>KeywordQuantityUnits</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>PROCESS</element>
- <element>MASK</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>VAT</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <state>READONLY</state>
- </entityField>
- <entityParameter>
- <name>OfferId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>TotalPrice</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
- <title>Sum</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OfferStatus_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>OfferItems</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Offeritems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferStatus_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>INFO</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
- <title>Note</title>
- <contentType>LONG_TEXT</contentType>
- <state>READONLY</state>
- </entityField>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </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>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
- <tableName>OFFERITEM</tableName>
- <primaryKey>OFFERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ASSIGNEDTO.value</name>
- <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISCOUNT.value</name>
- <recordfield>OFFERITEM.DISCOUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.value</name>
- <recordfield>OFFERITEM.GROUPCODEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMNAME.value</name>
- <recordfield>OFFERITEM.ITEMNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMPOSITION.value</name>
- <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMSORT.value</name>
- <recordfield>OFFERITEM.ITEMSORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFERITEMID.value</name>
- <recordfield>OFFERITEM.OFFERITEMID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFER_ID.value</name>
- <recordfield>OFFERITEM.OFFER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OPTIONAL.value</name>
- <recordfield>OFFERITEM.OPTIONAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICE.value</name>
- <recordfield>OFFERITEM.PRICE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>QUANTITY.value</name>
- <recordfield>OFFERITEM.QUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.value</name>
- <recordfield>OFFERITEM.UNIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>OFFERITEM.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>OFFERITEM.INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.displayValue</name>
- <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <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>
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>Offeritem_entity</name>
+ <title>Offeritem</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
+ <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ASSIGNEDTO</name>
+ </entityField>
+ <entityField>
+ <name>DISCOUNT</name>
+ <title>Discount %</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0</outputFormat>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <title>Commodity group</title>
+ <consumer>KeywordProductGroupcodes</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMNAME</name>
+ <title>Designation</title>
+ </entityField>
+ <entityField>
+ <name>ITEMPOSITION</name>
+ <title>Position</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>ITEMSORT</name>
+ </entityField>
+ <entityField>
+ <name>OFFERITEMID</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OFFER_ID</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <title>Optional</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <title>Unit price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
+ <title>Article</title>
+ <consumer>Products</consumer>
+ <linkedContext>Product</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
+ <title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
+ <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <title>Unit</title>
+ <consumer>KeywordQuantityUnits</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>PROCESS</element>
+ <element>MASK</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>VAT in %</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <state>READONLY</state>
+ </entityField>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TotalPrice</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
+ <title>Sum</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>OfferItems</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Offeritems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>INFO</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
+ <title>Note</title>
+ <contentType>LONG_TEXT</contentType>
+ <state>READONLY</state>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </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>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
+ <tableName>OFFERITEM</tableName>
+ <primaryKey>OFFERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ASSIGNEDTO.value</name>
+ <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT.value</name>
+ <recordfield>OFFERITEM.DISCOUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.value</name>
+ <recordfield>OFFERITEM.GROUPCODEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMNAME.value</name>
+ <recordfield>OFFERITEM.ITEMNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMPOSITION.value</name>
+ <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMSORT.value</name>
+ <recordfield>OFFERITEM.ITEMSORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFERITEMID.value</name>
+ <recordfield>OFFERITEM.OFFERITEMID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFER_ID.value</name>
+ <recordfield>OFFERITEM.OFFER_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OPTIONAL.value</name>
+ <recordfield>OFFERITEM.OPTIONAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE.value</name>
+ <recordfield>OFFERITEM.PRICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ <recordfield>OFFERITEM.QUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.value</name>
+ <recordfield>OFFERITEM.UNIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>OFFERITEM.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>OFFERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.displayValue</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <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>
diff --git a/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js b/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js
index 7a80b7d032..ce477b6704 100644
--- a/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js
+++ b/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValidation.js b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
index 7797e12bfd..aa24a80d84 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValidation.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
@@ -1,8 +1,16 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if (parseInt(vars.get("$field.QUANTITY")) <= 0)
-{
- result.string(translate.text("${QUANTITY_LOWER_THAN_1}"));
-}
+import("system.logging");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Entity_lib");
+
+logging.log("valid test 1: " + vars.get("$field.QUANTITY"));
+
+var quatity = vars.exists("$field.QUANTITY") ? vars.get("$field.QUANTITY") : "";
+quatity = ProcessHandlingUtils.getOnValidationValue(quatity);
+
+if (parseInt(quatity) <= 0)
+{
+ logging("valid test 2: " + vars.get("$field.QUANTITY"));
+ result.string(translate.text("${QUANTITY_LOWER_THAN_1}"));
+}
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index e0c1c63a3d..dea8c2c669 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -1,25 +1,37 @@
-import("system.vars");
-import("system.neon");
-import("Product_lib");
-import("Util_lib");
-import("Entity_lib");
-import("Attribute_lib");
-
-var pid = vars.get("$field.PRODUCT_ID");
-var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUANTITY"));
-if(pid != "" && newQuantity != "")
-{
- var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
- var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
-
- var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid, priceList: pricelist };
-
- var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
-
- if(ProductDetails.productId != undefined && ProductDetails.PriceListToUse != null)
- {
- vars.set("$field.PRICE", ProductDetails.PriceListToUse.price);
- vars.set("$field.VAT", ProductDetails.PriceListToUse.vat);
- }
-}
\ No newline at end of file
+import("system.logging");
+import("system.vars");
+import("system.neon");
+import("Product_lib");
+import("Util_lib");
+import("Entity_lib");
+import("Attribute_lib");
+
+var pid = vars.get("$field.PRODUCT_ID");
+var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUANTITY"));
+if(pid != "" && newQuantity != "")
+{
+ var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
+
+ var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid, priceList: pricelist };
+
+ var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
+
+ if(ProductDetails.productId != undefined && ProductDetails.PriceListToUse != null)
+ {
+ vars.set("$field.PRICE", ProductDetails.PriceListToUse.price);
+ vars.set("$field.VAT", ProductDetails.PriceListToUse.vat);
+ }
+}
+
+
+//checks if the value is <= 0, if so fallback to 1
+var quatity = vars.exists("$field.QUANTITY") ? vars.get("$field.QUANTITY") : "";
+quatity = ProcessHandlingUtils.getOnValidationValue(quatity);
+
+if (parseInt(quatity) <= 0)
+{
+ neon.setFieldValue("$field.QUANTITY", "1");
+}
+
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/status/displayValueProcess.js b/entity/Order_entity/entityfields/status/displayValueProcess.js
index 4a9b7bcc8b..70976b2e02 100644
--- a/entity/Order_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.get("$field.STATUS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.get("$field.STATUS")));
diff --git a/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js b/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js
index 7a80b7d032..ce477b6704 100644
--- a/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js
+++ b/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
diff --git a/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js b/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js
index a63ec78941..0149bf2040 100644
--- a/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js
+++ b/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), vars.get("$field.UNIT")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), vars.get("$field.UNIT")));
diff --git a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
index 804ae6cd1e..475936e138 100644
--- a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
@@ -1,14 +1,14 @@
-import("system.vars");
-import("system.logging");
-import("system.neon");
-import("system.calendars");
-import("Calendar_lib");
-import("system.date");
-import("Context_lib");
-
-
-var params = {};
-params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
-
-neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
-
+import("system.vars");
+import("system.logging");
+import("system.neon");
+import("system.calendars");
+import("Calendar_lib");
+import("system.date");
+import("Context_lib");
+
+
+var params = {};
+params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
+
+neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+
diff --git a/entity/Organisation_entity/entityfields/status/displayValueProcess.js b/entity/Organisation_entity/entityfields/status/displayValueProcess.js
index 1cdc4fe4d1..cc03068b7c 100644
--- a/entity/Organisation_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.STATUS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.STATUS")));
diff --git a/entity/Organisation_entity/entityfields/type/displayValueProcess.js b/entity/Organisation_entity/entityfields/type/displayValueProcess.js
index 3c6de801e3..06795c5d70 100644
--- a/entity/Organisation_entity/entityfields/type/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/type/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.organisationType(), vars.get("$field.TYPE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.organisationType(), vars.get("$field.TYPE")));
diff --git a/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js b/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js
index 7a80b7d032..ce477b6704 100644
--- a/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js
+++ b/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODEID")));
diff --git a/entity/Product_entity/entityfields/unit/displayValueProcess.js b/entity/Product_entity/entityfields/unit/displayValueProcess.js
index a63ec78941..0149bf2040 100644
--- a/entity/Product_entity/entityfields/unit/displayValueProcess.js
+++ b/entity/Product_entity/entityfields/unit/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), vars.get("$field.UNIT")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), vars.get("$field.UNIT")));
diff --git a/entity/Productprice_entity/entityfields/currency/displayValueProcess.js b/entity/Productprice_entity/entityfields/currency/displayValueProcess.js
index c82b4d7480..c268b6c47a 100644
--- a/entity/Productprice_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Productprice_entity/entityfields/currency/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
diff --git a/entity/Productprice_entity/entityfields/price/valueProcess.js b/entity/Productprice_entity/entityfields/price/valueProcess.js
index 29d1e86f67..723d0252aa 100644
--- a/entity/Productprice_entity/entityfields/price/valueProcess.js
+++ b/entity/Productprice_entity/entityfields/price/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
result.string("0");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/vat/valueProcess.js b/entity/Productprice_entity/entityfields/vat/valueProcess.js
index 29d1e86f67..723d0252aa 100644
--- a/entity/Productprice_entity/entityfields/vat/valueProcess.js
+++ b/entity/Productprice_entity/entityfields/vat/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
result.string("0");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
index 55842533e0..dda454b255 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
diff --git a/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js
index 98c348b13e..4058d229ee 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectWonLost(), vars.get("$field.REASON")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectWonLost(), vars.get("$field.REASON")));
diff --git a/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
index fbea558b69..9dd81c4237 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATUS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATUS")));
diff --git a/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js b/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
index b969a4ff0b..aa76ca3c49 100644
--- a/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
+++ b/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODE")));
diff --git a/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
index f02d4b6443..0456b23233 100644
--- a/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.SALESPROJECT_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js b/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
index 68e3eb50fa..c44ff2976c 100644
--- a/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectMemberRole(), vars.get("$field.SALESPROJECT_ROLE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectMemberRole(), vars.get("$field.SALESPROJECT_ROLE")));
diff --git a/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js b/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
index b23ba494cb..b3db488792 100644
--- a/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
+++ b/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectSource(), vars.get("$field.SOURCE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectSource(), vars.get("$field.SOURCE")));
diff --git a/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js b/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js
index 55842533e0..dda454b255 100644
--- a/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js
+++ b/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
diff --git a/entity/Salesproject_entity/entityfields/phase/valueProcess.js b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
index 38df879fe8..49280bb32c 100644
--- a/entity/Salesproject_entity/entityfields/phase/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("9f7d1fa9-7c09-4037-8f7c-8458def14d89"); //NQC
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js b/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js
index 471bc2cd6e..883b399d25 100644
--- a/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js
+++ b/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectProbability(), vars.get("$field.PROBABILITY")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectProbability(), vars.get("$field.PROBABILITY")));
diff --git a/entity/Salesproject_entity/entityfields/state/displayValueProcess.js b/entity/Salesproject_entity/entityfields/state/displayValueProcess.js
index e105f7507c..4b194ebac2 100644
--- a/entity/Salesproject_entity/entityfields/state/displayValueProcess.js
+++ b/entity/Salesproject_entity/entityfields/state/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATE")));
diff --git a/entity/Salesproject_entity/entityfields/state/valueProcess.js b/entity/Salesproject_entity/entityfields/state/valueProcess.js
index ea5cc54c96..1ca1654d0c 100644
--- a/entity/Salesproject_entity/entityfields/state/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/state/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js b/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js
index ac24ae5ca9..11e584c4e1 100644
--- a/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js
+++ b/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.stockWarehouse(), vars.get("$field.WAREHOUSE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.stockWarehouse(), vars.get("$field.WAREHOUSE")));
diff --git a/entity/Task_entity/entityfields/type/displayValueProcess.js b/entity/Task_entity/entityfields/type/displayValueProcess.js
index 7012c7589c..b8b8e7a4a3 100644
--- a/entity/Task_entity/entityfields/type/displayValueProcess.js
+++ b/entity/Task_entity/entityfields/type/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.taskType(), vars.get("$field.TYPE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskType(), vars.get("$field.TYPE")));
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 38c7fc4a48..f46e6ab319 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1,3319 +1,3320 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language 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/language/1.2.0">
- <name>_____LANGUAGE_de</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <language>de</language>
- <country></country>
- <variant></variant>
- <keyValueMap>
- <entry>
- <key>Company</key>
- <value>Firma</value>
- </entry>
- <entry>
- <key>Entrydate (Day)</key>
- <value>Eingangsdatum (Tag)</value>
- </entry>
- <entry>
- <key>Turnover</key>
- <value>Umsatz</value>
- </entry>
- <entry>
- <key>Discount %</key>
- <value>Rabatt %</value>
- </entry>
- <entry>
- <key>E-Mail</key>
- <value>E-Mail</value>
- </entry>
- <entry>
- <key>Maximal Count</key>
- <value>Maximale Anzahl</value>
- </entry>
- <entry>
- <key>Entrydate (Month)</key>
- <value>Eingangsdatum (Monat)</value>
- </entry>
- <entry>
- <key>Usage</key>
- <value>Verwendung</value>
- </entry>
- <entry>
- <key>Show all activities</key>
- <value>Alle Aktivitäten anzeigen</value>
- </entry>
- <entry>
- <key>${ADDRESS_STATE}</key>
- <value>Staat</value>
- </entry>
- <entry>
- <key>Show all contracts</key>
- <value>Alle Verträge anzeigen</value>
- </entry>
- <entry>
- <key>Communication data</key>
- <value>Kommunikationsdaten</value>
- </entry>
- <entry>
- <key>${SALESPROJECT_NEGOTIATION}</key>
- <value>Negotiation</value>
- </entry>
- <entry>
- <key>Filename</key>
- <value>Dateiname</value>
- </entry>
- <entry>
- <key>Male</key>
- <value>Männlich</value>
- </entry>
- <entry>
- <key>Activity</key>
- <value>Aktivität</value>
- </entry>
- <entry>
- <key>Name</key>
- <value>Name</value>
- </entry>
- <entry>
- <key>Austria</key>
- <value>Österreich</value>
- </entry>
- <entry>
- <key>New time tracking</key>
- <value>Neuer Zeiteintrag</value>
- </entry>
- <entry>
- <key>Customercode</key>
- <value>Kundennummer</value>
- </entry>
- <entry>
- <key>Time expenses</key>
- <value>Aufwand</value>
- </entry>
- <entry>
- <key>${SALESPROJECT_OFFER}</key>
- <value>Offer</value>
- </entry>
- <entry>
- <key>Status</key>
- <value>Status</value>
- </entry>
- <entry>
- <key>${SALESPROJECT_MEMBER}</key>
- <value>Projektteam</value>
- </entry>
- <entry>
- <key>${QUANTITY_LOWER_THAN_1}</key>
- <value>Die Menge muss mindestens 1 sein.</value>
- </entry>
- <entry>
- <key>Days inactive</key>
- <value>Tage inaktiv</value>
- </entry>
- <entry>
- <key>Active</key>
- <value>Aktiv</value>
- </entry>
- <entry>
- <key>Medium</key>
- <value>Medium</value>
- </entry>
- <entry>
- <key>Internet</key>
- <value>Internet</value>
- </entry>
- <entry>
- <key>Germany</key>
- <value>Deutschland</value>
- </entry>
- <entry>
- <key>Online-Meeting</key>
- <value>Online-Meeting</value>
- </entry>
- <entry>
- <key>Choose address</key>
- <value>Adresse auswählen</value>
- </entry>
- <entry>
- <key>Social Media</key>
- <value>Social Media</value>
- </entry>
- <entry>
- <key>Visit</key>
- <value>Besuch</value>
- </entry>
- <entry>
- <key>Information</key>
- <value>Information</value>
- </entry>
- <entry>
- <key>Language</key>
- <value>Sprache</value>
- </entry>
- <entry>
- <key>Phone</key>
- <value>Telefon</value>
- </entry>
- <entry>
- <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
- </entry>
- <entry>
- <key>360 Degree</key>
- <value>360 Grad</value>
- </entry>
- <entry>
- <key>Activities</key>
- <value>Aktivitäten</value>
- </entry>
- <entry>
- <key>Female</key>
- <value>Weiblich</value>
- </entry>
- <entry>
- <key>Contactmanagement</key>
- <value>Kontaktmanagement</value>
- </entry>
- <entry>
- <key>Mobile</key>
- <value>Mobil</value>
- </entry>
- <entry>
- <key>Office address</key>
- <value>Firmenadresse</value>
- </entry>
- <entry>
- <key>Contact</key>
- <value>Kontakt</value>
- </entry>
- <entry>
- <key>Home address</key>
- <value>Privatadresse</value>
- </entry>
- <entry>
- <key>Type</key>
- <value>Typ</value>
- </entry>
- <entry>
- <key>Contacts</key>
- <value>Kontakte</value>
- </entry>
- <entry>
- <key>Norway</key>
- <value>Norwegen</value>
- </entry>
- <entry>
- <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
- </entry>
- <entry>
- <key>Address</key>
- <value>Adresse</value>
- </entry>
- <entry>
- <key>Addresses</key>
- <value>Adressen</value>
- </entry>
- <entry>
- <key>Contact type</key>
- <value>Kontaktart</value>
- </entry>
- <entry>
- <key>${COMM_ADDRESS}</key>
- <value>Adresse</value>
- </entry>
- <entry>
- <key>Gender</key>
- <value>Geschlecht</value>
- </entry>
- <entry>
- <key>Show all companies</key>
- <value>Alle Firmen anzeigen</value>
- </entry>
- <entry>
- <key>Date of birth</key>
- <value>Geburtsdatum</value>
- </entry>
- <entry>
- <key>Lastname</key>
- <value>Nachname</value>
- </entry>
- <entry>
- <key>Salutation</key>
- <value>Anrede</value>
- </entry>
- <entry>
- <key>Middlename</key>
- <value>Zwischenname</value>
- </entry>
- <entry>
- <key>Title</key>
- <value>Titel</value>
- </entry>
- <entry>
- <key>Addresstype</key>
- <value>Adresstyp</value>
- </entry>
- <entry>
- <key>Firstname</key>
- <value>Vorname</value>
- </entry>
- <entry>
- <key>Show all contacts</key>
- <value>Alle Kontaktpersonen anzeigen</value>
- </entry>
- <entry>
- <key>Description</key>
- <value>Beschreibung</value>
- </entry>
- <entry>
- <key>Direction</key>
- <value>Richtung</value>
- </entry>
- <entry>
- <key>Entrydate</key>
- <value>Eingangsdatum</value>
- </entry>
- <entry>
- <key>Subject</key>
- <value>Betreff</value>
- </entry>
- <entry>
- <key>Post office box</key>
- <value>Postfach</value>
- </entry>
- <entry>
- <key>Delivery address</key>
- <value>Lieferadresse</value>
- </entry>
- <entry>
- <key>House number</key>
- <value>Hausnummer</value>
- </entry>
- <entry>
- <key>Country</key>
- <value>Land</value>
- </entry>
- <entry>
- <key>Communication</key>
- <value>Kommunikation</value>
- </entry>
- <entry>
- <key>postcode</key>
- <value>Postleitzahl</value>
- </entry>
- <entry>
- <key>City</key>
- <value>Ort</value>
- </entry>
- <entry>
- <key>State</key>
- <value>Status</value>
- </entry>
- <entry>
- <key>Region</key>
- <value>Region</value>
- </entry>
- <entry>
- <key>District</key>
- <value>Kreis</value>
- </entry>
- <entry>
- <key>Companies</key>
- <value>Firmen</value>
- </entry>
- <entry>
- <key>Switzerland</key>
- <value>Schweiz</value>
- </entry>
- <entry>
- <key>Confirmed</key>
- <value>Bestätigt</value>
- </entry>
- <entry>
- <key>Free</key>
- <value>Frei</value>
- </entry>
- <entry>
- <key>Tentative</key>
- <value>Vorläufig</value>
- </entry>
- <entry>
- <key>Ignore series</key>
- <value>Monatliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
- </entry>
- <entry>
- <key>Internal (2)</key>
- </entry>
- <entry>
- <key>Touchpoints</key>
- <value>Kontaktpunkte</value>
- </entry>
- <entry>
- <key>Company Addresses</key>
- <value>Firmenadressen</value>
- </entry>
- <entry>
- <key>yearly series not specified</key>
- <value>Jährliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
- </entry>
- <entry>
- <key>OutOfOffice</key>
- <value>Außer Haus</value>
- </entry>
- <entry>
- <key>Cancelled</key>
- <value>Abgesagt</value>
- </entry>
- <entry>
- <key>Ignore daily series</key>
- <value>Tägliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
- </entry>
- <entry>
- <key>yyyyMMdd</key>
- <value>yyyyMMdd</value>
- </entry>
- <entry>
- <key>standard address</key>
- <value>Standard-Adresse</value>
- </entry>
- <entry>
- <key>Create receipt</key>
- <value>Beleg erstellen</value>
- </entry>
- <entry>
- <key>PP</key>
- <value>EK</value>
- </entry>
- <entry>
- <key>Liter</key>
- </entry>
- <entry>
- <key>Key account</key>
- <value>Großkunde</value>
- </entry>
- <entry>
- <key>Cover letter</key>
- <value>Anschreiben</value>
- </entry>
- <entry>
- <key>VAT</key>
- <value>UmsSt.</value>
- </entry>
- <entry>
- <key>The expiry date must be after the start date!</key>
- <value>Das Ende-Datum muss nach dem Beginn-Datum liegen!</value>
- </entry>
- <entry>
- <key>Product</key>
- <value>Produkt</value>
- </entry>
- <entry>
- <key>Developer</key>
- <value>Hersteller</value>
- </entry>
- <entry>
- <key>Valid until</key>
- <value>gültig bis</value>
- </entry>
- <entry>
- <key>Department</key>
- <value>Abteilung</value>
- </entry>
- <entry>
- <key>Price list</key>
- <value>Preisliste</value>
- </entry>
- <entry>
- <key>Currency</key>
- <value>Währung</value>
- </entry>
- <entry>
- <key>Payment method</key>
- <value>Zahlungsweise</value>
- </entry>
- <entry>
- <key>Price list / Company</key>
- <value>Preisliste / Firma</value>
- </entry>
- <entry>
- <key>Curr. sales price</key>
- <value>akt. VK-Preis</value>
- </entry>
- <entry>
- <key>Contract</key>
- <value>Vertrag</value>
- </entry>
- <entry>
- <key>Stock</key>
- <value>Lagerbestand</value>
- </entry>
- <entry>
- <key>PP/SP</key>
- <value>EK/VK</value>
- </entry>
- <entry>
- <key>Next due date</key>
- <value>nächste Fälligkeit</value>
- </entry>
- <entry>
- <key>Discount</key>
- <value>Rabatt</value>
- </entry>
- <entry>
- <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
- <value>Nächste Fälligkeit muss nach Vertragsbeginn und vor Vertragsende liegen!</value>
- </entry>
- <entry>
- <key>Sales</key>
- <value>Vertrieb</value>
- </entry>
- <entry>
- <key>Contract number</key>
- <value>Vertragsnummer</value>
- </entry>
- <entry>
- <key>Min. stock</key>
- <value>Min.-Bestand</value>
- </entry>
- <entry>
- <key>SP</key>
- <value>VK</value>
- </entry>
- <entry>
- <key>Commodity group 3</key>
- <value>Warengruppe 3</value>
- </entry>
- <entry>
- <key>Commodity group 2</key>
- <value>Warengruppe 2</value>
- </entry>
- <entry>
- <key>Commodity group 1</key>
- <value>Warengruppe 1</value>
- </entry>
- <entry>
- <key>Contract start date</key>
- <value>Vertragsbeginn</value>
- </entry>
- <entry>
- <key>Spare parts</key>
- <value>Ersatzteile</value>
- </entry>
- <entry>
- <key>Employee</key>
- <value>Mitarbeiter</value>
- </entry>
- <entry>
- <key>Unit</key>
- <value>Einheit</value>
- </entry>
- <entry>
- <key>Contract expiry date</key>
- <value>Vertragsende</value>
- </entry>
- <entry>
- <key>Yes</key>
- <value>Ja</value>
- </entry>
- <entry>
- <key>Type of contract</key>
- <value>Vertragsart</value>
- </entry>
- <entry>
- <key>No</key>
- <value>Nein</value>
- </entry>
- <entry>
- <key>Service</key>
- <value>Dienstleistung</value>
- </entry>
- <entry>
- <key>Advertising material</key>
- <value>Werbemittel</value>
- </entry>
- <entry>
- <key>Valid from</key>
- <value>gültig ab</value>
- </entry>
- <entry>
- <key>Product name</key>
- <value>Produktname</value>
- </entry>
- <entry>
- <key>Product group</key>
- <value>Produktgruppe</value>
- </entry>
- <entry>
- <key>${CONTRACT_STATUS}</key>
- <value>Status</value>
- </entry>
- <entry>
- <key>From no. of units</key>
- <value>ab Stückzahl</value>
- </entry>
- <entry>
- <key>Maindocuments</key>
- <value>Hauptdokumente</value>
- </entry>
- <entry>
- <key>Price</key>
- <value>Preis</value>
- </entry>
- <entry>
- <key>Conditions</key>
- <value>Konditionen</value>
- </entry>
- <entry>
- <key>Standard</key>
- </entry>
- <entry>
- <key>I / O</key>
- <value>E / A</value>
- </entry>
- <entry>
- <key>Date</key>
- <value>Datum</value>
- </entry>
- <entry>
- <key>IN</key>
- <value>EIN</value>
- </entry>
- <entry>
- <key>OUT</key>
- <value>AUS</value>
- </entry>
- <entry>
- <key>Warehouse</key>
- <value>Lager</value>
- </entry>
- <entry>
- <key>Reference</key>
- <value>Referenz</value>
- </entry>
- <entry>
- <key>The contract number already exists!</key>
- <value>Die Vertragsnummer existiert bereits!</value>
- </entry>
- <entry>
- <key>The product number already exists!</key>
- <value>Die Produktnummer existiert bereits!</value>
- </entry>
- <entry>
- <key>Quantity</key>
- <value>Menge</value>
- </entry>
- <entry>
- <key>Salesproject</key>
- <value>Vertriebsprojekt</value>
- </entry>
- <entry>
- <key>Rollout</key>
- <value>Roll Out</value>
- </entry>
- <entry>
- <key>Phase</key>
- <value>Phase</value>
- </entry>
- <entry>
- <key>Product number</key>
- <value>Produktnummer</value>
- </entry>
- <entry>
- <key>Project number</key>
- <value>Projektnummer</value>
- </entry>
- <entry>
- <key>Project title</key>
- <value>Projekttitel</value>
- </entry>
- <entry>
- <key>Project start</key>
- <value>Projektstart</value>
- </entry>
- <entry>
- <key>Volume</key>
- <value>Volumen</value>
- </entry>
- <entry>
- <key>Partial order</key>
- <value>Teilauftrag</value>
- </entry>
- <entry>
- <key>Open</key>
- <value>Offen</value>
- </entry>
- <entry>
- <key>Lost</key>
- <value>Verloren</value>
- </entry>
- <entry>
- <key>Order</key>
- <value>Auftrag</value>
- </entry>
- <entry>
- <key>Postponed</key>
- <value>Vertagt</value>
- </entry>
- <entry>
- <key>Aborted</key>
- <value>Abgebrochen</value>
- </entry>
- <entry>
- <key>Negotiation</key>
- <value>Verhandlung</value>
- </entry>
- <entry>
- <key>Workshop</key>
- <value>Workshop</value>
- </entry>
- <entry>
- <key>Presentation preparation</key>
- <value>Präsentationsvorbereitung</value>
- </entry>
- <entry>
- <key>Specifications in progress</key>
- <value>Lastenheft in Bearbeitung</value>
- </entry>
- <entry>
- <key>Project decision</key>
- <value>Projektentscheidung</value>
- </entry>
- <entry>
- <key>Lead</key>
- <value>Lead</value>
- </entry>
- <entry>
- <key>Total net</key>
- <value>Betrag netto</value>
- </entry>
- <entry>
- <key>Offer</key>
- <value>Angebot</value>
- </entry>
- <entry>
- <key>Offer number</key>
- <value>Angebotsnummer</value>
- </entry>
- <entry>
- <key>Show my activities</key>
- <value>Meine Aktivitäten anzeigen</value>
- </entry>
- <entry>
- <key>Probability</key>
- <value>Wahrscheinlichkeit</value>
- </entry>
- <entry>
- <key>Total VAT</key>
- <value>Betrag MWST</value>
- </entry>
- <entry>
- <key>The offer number already exists!</key>
- <value>Die Angebotsnummer existiert bereits!</value>
- </entry>
- <entry>
- <key>0 %</key>
- </entry>
- <entry>
- <key>75 %</key>
- <value></value>
- </entry>
- <entry>
- <key>100 %</key>
- </entry>
- <entry>
- <key>25 %</key>
- </entry>
- <entry>
- <key>50 %</key>
- </entry>
- <entry>
- <key>Won</key>
- <value>Gewonnen</value>
- </entry>
- <entry>
- <key>Checked</key>
- <value>Geprüft</value>
- </entry>
- <entry>
- <key>Sent</key>
- <value>Versendet</value>
- </entry>
- <entry>
- <key>Offeritems</key>
- <value>Angebotsposten</value>
- </entry>
- <entry>
- <key>Header text</key>
- <value>Kopftext</value>
- </entry>
- <entry>
- <key>Commodity group</key>
- <value>Warengruppe</value>
- </entry>
- <entry>
- <key>Footer text</key>
- <value>Fußtext</value>
- </entry>
- <entry>
- <key>Designation</key>
- <value>Bezeichnung</value>
- </entry>
- <entry>
- <key>Position</key>
- <value>Position</value>
- </entry>
- <entry>
- <key>Receipt</key>
- <value>Beleg</value>
- </entry>
- <entry>
- <key>Show all receipts</key>
- <value>Alle Belege anzeigen</value>
- </entry>
- <entry>
- <key>Optional</key>
- <value>Optional</value>
- </entry>
- <entry>
- <key>Article</key>
- <value>Artikel</value>
- </entry>
- <entry>
- <key>Show open salesprojects</key>
- <value>Offene Vertriebsprojekte anzeigen</value>
- </entry>
- <entry>
- <key>Receipt number</key>
- <value>Belegnummer</value>
- </entry>
- <entry>
- <key>Offeritem</key>
- <value>Angebotsposten</value>
- </entry>
- <entry>
- <key>Sum</key>
- <value>Summe</value>
- </entry>
- <entry>
- <key>Option4</key>
- </entry>
- <entry>
- <key>Offers</key>
- <value>Angebote</value>
- </entry>
- <entry>
- <key>Option3</key>
- </entry>
- <entry>
- <key>Option2</key>
- </entry>
- <entry>
- <key>Option1</key>
- </entry>
- <entry>
- <key>Countries</key>
- <value>Länder</value>
- </entry>
- <entry>
- <key>Options</key>
- </entry>
- <entry>
- <key>Total gross</key>
- <value>Betrag brutto</value>
- </entry>
- <entry>
- <key>Minimal Count</key>
- <value>Minimale Anzahl</value>
- </entry>
- <entry>
- <key>Identical price list found!</key>
- <value>Identische Preisliste gefunden!</value>
- </entry>
- <entry>
- <key>Parts list</key>
- <value>Stückliste</value>
- </entry>
- <entry>
- <key>${THOUSAND_SHORT}</key>
- <value>T</value>
- </entry>
- <entry>
- <key>Deliver opinion</key>
- <value>Stellungnahme abgeben</value>
- </entry>
- <entry>
- <key>Presentation follow-up</key>
- <value>Präsentationsnachbereitung</value>
- </entry>
- <entry>
- <key>Waiting for requirements</key>
- <value>Warten auf Anforderungen</value>
- </entry>
- <entry>
- <key>Parent</key>
- </entry>
- <entry>
- <key>${EURO_SIGN}</key>
- <value>€</value>
- </entry>
- <entry>
- <key>Planned</key>
- <value>Geplant
-</value>
- </entry>
- <entry>
- <key>Info</key>
- <value>Info
-</value>
- </entry>
- <entry>
- <key>${VOLUME_MONEY}</key>
- <value>Wert
-</value>
- </entry>
- <entry>
- <key>Milestones</key>
- <value>Meilensteine
-</value>
- </entry>
- <entry>
- <key>Milestone</key>
- <value>Meilenstein
-</value>
- </entry>
- <entry>
- <key>Excreted</key>
- <value>Ausgeschieden
-</value>
- </entry>
- <entry>
- <key>Reason</key>
- <value>Begründung</value>
- </entry>
- <entry>
- <key>Document</key>
- <value>Dokument</value>
- </entry>
- <entry>
- <key>Remark</key>
- <value>Anmerkung</value>
- </entry>
- <entry>
- <key>Competition</key>
- <value>Mitbewerber</value>
- </entry>
- <entry>
- <key>Forecast</key>
- <value>Forecast</value>
- </entry>
- <entry>
- <key>Show all products</key>
- <value>Alle Produkte anzeigen</value>
- </entry>
- <entry>
- <key>Role</key>
- <value>Rolle</value>
- </entry>
- <entry>
- <key>End date</key>
- <value>Enddatum</value>
- </entry>
- <entry>
- <key>Documents</key>
- <value>Dokumente</value>
- </entry>
- <entry>
- <key>New offer version</key>
- <value>Neue Angebotsversion</value>
- </entry>
- <entry>
- <key>Copy offer</key>
- <value>Angebot kopieren</value>
- </entry>
- <entry>
- <key>Vers. no.</key>
- <value>Vers.-Nr.</value>
- </entry>
- <entry>
- <key>Curr. purchase price</key>
- <value>akt. EK-Preis</value>
- </entry>
- <entry>
- <key>Industry 3</key>
- <value>Branche 3</value>
- </entry>
- <entry>
- <key>Industry 2</key>
- <value>Branche 2</value>
- </entry>
- <entry>
- <key>Show all offers</key>
- <value>Alle Angebote anzeigen</value>
- </entry>
- <entry>
- <key>Filetype</key>
- <value>Dateityp</value>
- </entry>
- <entry>
- <key>child of</key>
- <value>Kind von</value>
- </entry>
- <entry>
- <key>Products</key>
- <value>Produkte</value>
- </entry>
- <entry>
- <key>Filesize</key>
- <value>Dateigrösse</value>
- </entry>
- <entry>
- <key>Industry 1</key>
- <value>Branche 1</value>
- </entry>
- <entry>
- <key>Contracts</key>
- <value>Verträge</value>
- </entry>
- <entry>
- <key>Classification</key>
- <value>Klassifizierung</value>
- </entry>
- <entry>
- <key>Class A</key>
- <value>Klasse A</value>
- </entry>
- <entry>
- <key>Class C</key>
- <value>Klasse C</value>
- </entry>
- <entry>
- <key>Class B</key>
- <value>Klasse B</value>
- </entry>
- <entry>
- <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
- <value>fieldOrTableName muss ein String oder ein Array aus 2 Strings sein.</value>
- </entry>
- <entry>
- <key>High price strategy</key>
- <value>Hochpreisstrategie</value>
- </entry>
- <entry>
- <key>Show all sent receipts</key>
- <value>Alle versendeten Belege anzeigen</value>
- </entry>
- <entry>
- <key>Low price strategy</key>
- <value>Niedrigpreisstrategie</value>
- </entry>
- <entry>
- <key>Uid</key>
- </entry>
- <entry>
- <key>in 6 Months</key>
- </entry>
- <entry>
- <key>Sent offers</key>
- <value>Versendete Angebote</value>
- </entry>
- <entry>
- <key>Budget (Project)</key>
- </entry>
- <entry>
- <key>responsible</key>
- <value>verantwortlich</value>
- </entry>
- <entry>
- <key>Show all Facebook posts of a user</key>
- <value>Alle Facebook Beiträge eines Benutzers anzeigen</value>
- </entry>
- <entry>
- <key>My Activities</key>
- <value>Meine Aktivitäten</value>
- </entry>
- <entry>
- <key>Combobox Value</key>
- <value>Combobox-Wert</value>
- </entry>
- <entry>
- <key>Salesprojects</key>
- <value>Vertriebsprojekte</value>
- </entry>
- <entry>
- <key>to</key>
- </entry>
- <entry>
- <key>Open salesprojects</key>
- <value>Offene Vertriebsprojekte</value>
- </entry>
- <entry>
- <key>Other</key>
- </entry>
- <entry>
- <key>Show all sent offers</key>
- <value>Alle versendeten Angebote anzeigen</value>
- </entry>
- <entry>
- <key>Show all Facebook posts of ADITO</key>
- <value>Alle Facebook Beiträge von ADITO anzeigen</value>
- </entry>
- <entry>
- <key>Individual</key>
- </entry>
- <entry>
- <key>Organisation</key>
- <value>Organisation</value>
- </entry>
- <entry>
- <key>Base</key>
- <value>Base</value>
- </entry>
- <entry>
- <key>Receipts</key>
- <value>Belege</value>
- </entry>
- <entry>
- <key>Show all salesprojects</key>
- <value>Alle Vertriebsprojekte anzeigen</value>
- </entry>
- <entry>
- <key>Abomodel</key>
- <value>Abomodell</value>
- </entry>
- <entry>
- <key>Show all tweets of ADITO</key>
- <value>Alle tweets von ADITO anzeigen</value>
- </entry>
- <entry>
- <key>Show all tweets of a user</key>
- <value>Alle tweets eines Benutzers anzeigen</value>
- </entry>
- <entry>
- <key>in 12 Months</key>
- </entry>
- <entry>
- <key>Standard / Individual</key>
- </entry>
- <entry>
- <key>Please update the ${FORECAST_ENGLISH}.</key>
- <value>Bitte den Forecast überprüfen.</value>
- </entry>
- <entry>
- <key>Industry</key>
- <value>Branche</value>
- </entry>
- <entry>
- <key>From</key>
- <value>Von</value>
- </entry>
- <entry>
- <key>no Project planned</key>
- </entry>
- <entry>
- <key>Strength 3</key>
- <value>Stärke 3</value>
- </entry>
- <entry>
- <key>Strength 1</key>
- <value>Stärke 1</value>
- </entry>
- <entry>
- <key>Strength 2</key>
- <value>Stärke 2</value>
- </entry>
- <entry>
- <key>Value</key>
- <value>Wert</value>
- </entry>
- <entry>
- <key>Weakness 1</key>
- <value>Schwäche 1</value>
- </entry>
- <entry>
- <key>Weakness 2</key>
- <value>Schwäche 2</value>
- </entry>
- <entry>
- <key>Weakness 3</key>
- <value>Schwäche 3</value>
- </entry>
- <entry>
- <key>Projectstart</key>
- <value>Projektstart</value>
- </entry>
- <entry>
- <key>no standard email office</key>
- <value>keine Standard-E-Mail Büro vorhanden !</value>
- </entry>
- <entry>
- <key>no valid format</key>
- </entry>
- <entry>
- <key>Deliveryspecification</key>
- <value>Lieferbedingung</value>
- </entry>
- <entry>
- <key>Plus Salestax</key>
- <value>zzgl.Summe UmSt</value>
- </entry>
- <entry>
- <key>Pos.</key>
- </entry>
- <entry>
- <key>ISO 3166-1 alpha-3</key>
- </entry>
- <entry>
- <key>ISO 3166-1 alpha-2</key>
- </entry>
- <entry>
- <key>0.00</key>
- </entry>
- <entry>
- <key>Conditions of payment</key>
- <value>Zahlungsbedingung</value>
- </entry>
- <entry>
- <key>Relationship</key>
- <value>Beziehung</value>
- </entry>
- <entry>
- <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
- <value>Für dieses Binärfeld ist nur ein Datensatz erlaubt.</value>
- </entry>
- <entry>
- <key>Put Reciever Into To</key>
- <value>Bitte einen Adressat in 'to' eintragen!</value>
- </entry>
- <entry>
- <key>History</key>
- <value>Verlauf</value>
- </entry>
- <entry>
- <key>Total</key>
- <value>Gesamt</value>
- </entry>
- <entry>
- <key>Articlenumber</key>
- <value>Artikelnummer</value>
- </entry>
- <entry>
- <key>Native Name</key>
- <value>Geburtsname</value>
- </entry>
- <entry>
- <key>#,##0</key>
- </entry>
- <entry>
- <key>Unitprice</key>
- <value>Einzelpreis</value>
- </entry>
- <entry>
- <key>Number</key>
- <value>Nummer</value>
- </entry>
- <entry>
- <key>Tasks</key>
- <value>Aufgaben</value>
- </entry>
- <entry>
- <key>New offer</key>
- <value>Angebot erstellen</value>
- </entry>
- <entry>
- <key>dd.MM.yyyy</key>
- <value>dd.MM.yyyy</value>
- </entry>
- <entry>
- <key>Articledescription</key>
- <value>Artikelbezeichnung</value>
- </entry>
- <entry>
- <key>Edit defaults</key>
- <value>Standards anpassen</value>
- </entry>
- <entry>
- <key>no valid mail-address format</key>
- </entry>
- <entry>
- <key>Amount</key>
- <value>Menge</value>
- </entry>
- <entry>
- <key>#,##0.00</key>
- </entry>
- <entry>
- <key>Latin Name</key>
- <value>Lateinischer Name</value>
- </entry>
- <entry>
- <key>Organisation name</key>
- <value>Name der Organisation</value>
- </entry>
- <entry>
- <key>Connection</key>
- <value>Verknüpfung</value>
- </entry>
- <entry>
- <key>standard email</key>
- <value>Standard-Email</value>
- </entry>
- <entry>
- <key>standard phone</key>
- <value>Standard-Telefon</value>
- </entry>
- <entry>
- <key>Creator</key>
- <value>Ersteller</value>
- </entry>
- <entry>
- <key>Timetracking</key>
- <value>Zeiterfassung</value>
- </entry>
- <entry>
- <key>Further informations</key>
- <value>Weitere Informationen</value>
- </entry>
- <entry>
- <key>Social</key>
- <value>Sozial</value>
- </entry>
- <entry>
- <key>Facebook Feed</key>
- <value>Facebook Feed</value>
- </entry>
- <entry>
- <key>Group1</key>
- </entry>
- <entry>
- <key>Group2</key>
- </entry>
- <entry>
- <key>Details</key>
- <value>Details</value>
- </entry>
- <entry>
- <key>Prices</key>
- <value>Preise</value>
- </entry>
- <entry>
- <key>Twitter</key>
- <value>Twitter</value>
- </entry>
- <entry>
- <key>Connections</key>
- <value>Verknüpfungen</value>
- </entry>
- <entry>
- <key>Object</key>
- <value>Objekt</value>
- </entry>
- <entry>
- <key>Attributes</key>
- <value>Eigenschaften</value>
- </entry>
- <entry>
- <key>Facebook</key>
- <value>Facebook</value>
- </entry>
- <entry>
- <key>Creation date</key>
- <value>Erstellungsdatum</value>
- </entry>
- <entry>
- <key>Year</key>
- <value>Jahr</value>
- </entry>
- <entry>
- <key>New receipt version</key>
- <value>Neue Quittungsversion</value>
- </entry>
- <entry>
- <key>Orderitems</key>
- <value>Belegposten</value>
- </entry>
- <entry>
- <key>Sent receipts</key>
- <value>Versendete Belege</value>
- </entry>
- <entry>
- <key>Copy receipt</key>
- <value>Beleg kopieren</value>
- </entry>
- <entry>
- <key>Orderitem</key>
- </entry>
- <entry>
- <key>The order number already exists!</key>
- </entry>
- <entry>
- <key>New activity</key>
- <value>Neue Aktivität</value>
- </entry>
- <entry>
- <key>July</key>
- <value>Juli</value>
- </entry>
- <entry>
- <key>ADITO Facebook Feed</key>
- </entry>
- <entry>
- <key>ADITO Twitter Feed</key>
- </entry>
- <entry>
- <key>June</key>
- <value>Juni</value>
- </entry>
- <entry>
- <key>October</key>
- <value>Oktober</value>
- </entry>
- <entry>
- <key>Take price</key>
- <value>Preis übernehmen</value>
- </entry>
- <entry>
- <key>Customer Base Sheet</key>
- <value>Kundenstammblatt</value>
- </entry>
- <entry>
- <key>Twitter Feed</key>
- <value>Twitter Feed</value>
- </entry>
- <entry>
- <key>November</key>
- <value>November</value>
- </entry>
- <entry>
- <key>December</key>
- <value>Dezember</value>
- </entry>
- <entry>
- <key>May</key>
- <value>Mai</value>
- </entry>
- <entry>
- <key>April</key>
- <value>April</value>
- </entry>
- <entry>
- <key>January</key>
- <value>Januar</value>
- </entry>
- <entry>
- <key>March</key>
- <value>März</value>
- </entry>
- <entry>
- <key>September</key>
- <value>September</value>
- </entry>
- <entry>
- <key>August</key>
- <value>August</value>
- </entry>
- <entry>
- <key>Category</key>
- <value>Kategorie</value>
- </entry>
- <entry>
- <key>February</key>
- <value>Februar</value>
- </entry>
- <entry>
- <key>asdf</key>
- </entry>
- <entry>
- <key>maturity date</key>
- <value>Fälligkeitsdatum</value>
- </entry>
- <entry>
- <key>{$TASK_STATUS}</key>
- <value>Status</value>
- </entry>
- <entry>
- <key>Task</key>
- <value>Aufgabe</value>
- </entry>
- <entry>
- <key>subject</key>
- <value>Betreff</value>
- </entry>
- <entry>
- <key>{$TASK_REQUESTOR}</key>
- <value>Anforderer</value>
- </entry>
- <entry>
- <key>start date</key>
- <value>Beginndatum</value>
- </entry>
- <entry>
- <key>task number</key>
- <value>Aufgabennummer</value>
- </entry>
- <entry>
- <key>description</key>
- <value>Beschreibung</value>
- </entry>
- <entry>
- <key>priority</key>
- <value>Priorität</value>
- </entry>
- <entry>
- <key>{$TASK_EDITOR}</key>
- <value>Bearbeiter</value>
- </entry>
- <entry>
- <key>{$TASK_PRIORITY_HIGH}</key>
- <value>hoch</value>
- </entry>
- <entry>
- <key>Seite</key>
- </entry>
- <entry>
- <key>Note</key>
- <value>Notiz</value>
- </entry>
- <entry>
- <key>Senden per E-Mail</key>
- </entry>
- <entry>
- <key>Hauptdokument</key>
- </entry>
- <entry>
- <key>Betreff</key>
- </entry>
- <entry>
- <key>private</key>
- <value>privat</value>
- </entry>
- <entry>
- <key>title</key>
- <value>Titel</value>
- </entry>
- <entry>
- <key>von</key>
- </entry>
- <entry>
- <key>{$TASK_PRIORITY_LOW}</key>
- <value>niedrig</value>
- </entry>
- <entry>
- <key>Nur Eigene anzeigen</key>
- </entry>
- <entry>
- <key>{$TASK_PRIORITY_NORMAL}</key>
- <value>normal</value>
- </entry>
- <entry>
- <key>Beschreibung</key>
- </entry>
- <entry>
- <key>Unit price</key>
- <value>Einzelpreis</value>
- </entry>
- <entry>
- <key>Firma</key>
- </entry>
- <entry>
- <key>type</key>
- <value>Typ</value>
- </entry>
- <entry>
- <key>Benutzer</key>
- </entry>
- <entry>
- <key>Schlüsselwort</key>
- </entry>
- <entry>
- <key>{$TASK_PRIORITY_NONE}</key>
- <value>keine</value>
- </entry>
- <entry>
- <key>Directly responsible:</key>
- <value>Ihr zuständiger Betreuer:</value>
- </entry>
- <entry>
- <key>Termin</key>
- </entry>
- <entry>
- <key>Vorschau</key>
- </entry>
- <entry>
- <key>Angebot</key>
- </entry>
- <entry>
- <key>Salesdashboard</key>
- <value>Vertriebsdashboard</value>
- </entry>
- <entry>
- <key>details</key>
- <value>details</value>
- </entry>
- <entry>
- <key>Kundenstammblatt</key>
- </entry>
- <entry>
- <key>Person</key>
- </entry>
- <entry>
- <key>Detail</key>
- <value>Detail</value>
- </entry>
- <entry>
- <key>Object 2</key>
- <value>Objekt 2</value>
- </entry>
- <entry>
- <key>Object 1</key>
- <value>Objekt 1</value>
- </entry>
- <entry>
- <key>Type 2</key>
- <value>Typ 2</value>
- </entry>
- <entry>
- <key>Type 1</key>
- <value>Typ 1</value>
- </entry>
- <entry>
- <key>Relations</key>
- <value>Beziehungen</value>
- </entry>
- <entry>
- <key>${FORECAST_ENGLISH}</key>
- <value>Forecast</value>
- </entry>
- <entry>
- <key>Title (original language)</key>
- <value>Titel (ursprüngliche Sprache)</value>
- </entry>
- <entry>
- <key>Attribute Relation</key>
- <value>Eigenschaftsbeziehung</value>
- </entry>
- <entry>
- <key>My Dashboard</key>
- <value>My Dashboard</value>
- </entry>
- <entry>
- <key>Attribute Usage</key>
- <value>Eigenschaftsverwendung</value>
- </entry>
- <entry>
- <key>Beziehung</key>
- </entry>
- <entry>
- <key>Key</key>
- </entry>
- <entry>
- <key>Attribute</key>
- <value>Eigenschaft</value>
- </entry>
- <entry>
- <key>Container</key>
- </entry>
- <entry>
- <key>Administration</key>
- <value>Administration</value>
- </entry>
- <entry>
- <key>Keyword</key>
- <value>Schlüsselwort</value>
- </entry>
- <entry>
- <key>Sorting</key>
- <value>Sortierung</value>
- </entry>
- <entry>
- <key>jdito</key>
- </entry>
- <entry>
- <key>Context id</key>
- </entry>
- <entry>
- <key>Context name</key>
- </entry>
- <entry>
- <key>Cambodia</key>
- <value>Kambodscha</value>
- </entry>
- <entry>
- <key>Resigned</key>
- <value>gekündigt</value>
- </entry>
- <entry>
- <key>Customer</key>
- <value>Kunde</value>
- </entry>
- <entry>
- <key>Outgoing</key>
- <value>ausgehend</value>
- </entry>
- <entry>
- <key>Paraguay</key>
- <value>Paraguay</value>
- </entry>
- <entry>
- <key>New attribute</key>
- <value>Neues Attribut</value>
- </entry>
- <entry>
- <key>Solomon Islands</key>
- <value>Salomon-Inseln</value>
- </entry>
- <entry>
- <key>Montserrat</key>
- <value>Montserrat</value>
- </entry>
- <entry>
- <key>Guadeloupe</key>
- <value>Guadeloupe</value>
- </entry>
- <entry>
- <key>Product_technic</key>
- <value>Produkt_Technik</value>
- </entry>
- <entry>
- <key>Moldova (Republic of)</key>
- <value>Republik Moldau</value>
- </entry>
- <entry>
- <key>Seychelles</key>
- <value>Seychellen</value>
- </entry>
- <entry>
- <key>Canadian dollar</key>
- <value>Kanadischer Dollar</value>
- </entry>
- <entry>
- <key>Bahrain</key>
- <value>Bahrain</value>
- </entry>
- <entry>
- <key>Comoros</key>
- <value>Komoren</value>
- </entry>
- <entry>
- <key>Faroe Islands</key>
- <value>Färöer Inseln</value>
- </entry>
- <entry>
- <key>Finland</key>
- <value>Finnland</value>
- </entry>
- <entry>
- <key>Project_duration</key>
- <value>Projekt_Dauer</value>
- </entry>
- <entry>
- <key>Company_internationality</key>
- <value>Unternehmen_Internationalität</value>
- </entry>
- <entry>
- <key>Eritrea</key>
- <value>Eritrea</value>
- </entry>
- <entry>
- <key>Puerto Rico</key>
- <value>Puerto Rico</value>
- </entry>
- <entry>
- <key>Viet Nam</key>
- <value>Vietnam</value>
- </entry>
- <entry>
- <key>Libya</key>
- <value>Libyen</value>
- </entry>
- <entry>
- <key>French</key>
- <value>Französisch</value>
- </entry>
- <entry>
- <key>Cocos (Keeling) Islands</key>
- <value>Kokosinseln (Keelinginseln)</value>
- </entry>
- <entry>
- <key>Saint Helena, Ascension and Tristan da Cunha</key>
- <value>St. Helena, Himmelfahrt und Tristan da Cunha</value>
- </entry>
- <entry>
- <key>Liechtenstein</key>
- <value>Liechtenstein</value>
- </entry>
- <entry>
- <key>Product_functionality</key>
- <value>Produkt_Funktionalität</value>
- </entry>
- <entry>
- <key>New appointment</key>
- <value>Neuer Termin</value>
- </entry>
- <entry>
- <key>Bulgaria</key>
- <value>Bulgarien</value>
- </entry>
- <entry>
- <key>Jordan</key>
- <value>Jordan</value>
- </entry>
- <entry>
- <key>Côte d'Ivoire</key>
- <value>Elfenbeinküste</value>
- </entry>
- <entry>
- <key>United Arab Emirates</key>
- <value>Vereinigte Arabische Emirate</value>
- </entry>
- <entry>
- <key>Kenya</key>
- <value>Kenia</value>
- </entry>
- <entry>
- <key>None, individual count</key>
- <value>keiner, Einzelberechnung</value>
- </entry>
- <entry>
- <key>French Polynesia</key>
- <value>Französisch Polynesien</value>
- </entry>
- <entry>
- <key>Djibouti</key>
- <value>Dschibuti</value>
- </entry>
- <entry>
- <key>Cuba</key>
- <value>Kuba</value>
- </entry>
- <entry>
- <key>Saint Lucia</key>
- <value>St. Lucia</value>
- </entry>
- <entry>
- <key>Mayotte</key>
- <value>Mayotte</value>
- </entry>
- <entry>
- <key>Israel</key>
- <value>Israel</value>
- </entry>
- <entry>
- <key>San Marino</key>
- <value>San Marino</value>
- </entry>
- <entry>
- <key>Tajikistan</key>
- <value>Tadschikistan</value>
- </entry>
- <entry>
- <key>Warehouse 2</key>
- <value>Lager 2</value>
- </entry>
- <entry>
- <key>Warehouse 1</key>
- <value>Lager 1</value>
- </entry>
- <entry>
- <key>Gibraltar</key>
- <value>Gibraltar</value>
- </entry>
- <entry>
- <key>Warehouse 3</key>
- <value>Lager 3</value>
- </entry>
- <entry>
- <key>Cyprus</key>
- <value>Zypern</value>
- </entry>
- <entry>
- <key>Semiannually</key>
- <value>halbjährlich</value>
- </entry>
- <entry>
- <key>Northern Mariana Islands</key>
- <value>Nördliche Marianneninseln</value>
- </entry>
- <entry>
- <key>Malaysia</key>
- <value>Malaysia</value>
- </entry>
- <entry>
- <key>Armenia</key>
- <value>Armenien</value>
- </entry>
- <entry>
- <key>Brazil</key>
- <value>Brasilien</value>
- </entry>
- <entry>
- <key>Turks and Caicos Islands</key>
- <value>Turks- und Caicosinseln</value>
- </entry>
- <entry>
- <key>Cabo Verde</key>
- <value>Cabo Verde</value>
- </entry>
- <entry>
- <key>Ecuador</key>
- <value>Ecuador</value>
- </entry>
- <entry>
- <key>Iran (Islamic Republic of)</key>
- <value>Iran (Islamische Republik)</value>
- </entry>
- <entry>
- <key>Decision maker</key>
- <value>Entscheider</value>
- </entry>
- <entry>
- <key>Lao People's Democratic Republic</key>
- <value>Demokratische Volksrepublik Laos</value>
- </entry>
- <entry>
- <key>Maintenance contract</key>
- <value>Wartungsvertrag</value>
- </entry>
- <entry>
- <key>United States Minor Outlying Islands</key>
- <value>Kleinere abgelegene Inseln der Vereinigten Staaten</value>
- </entry>
- <entry>
- <key>Italy</key>
- <value>Italien</value>
- </entry>
- <entry>
- <key>${ORGTYPE_OTHER}</key>
- <value>Sonstiges</value>
- </entry>
- <entry>
- <key>Haiti</key>
- <value>Haiti</value>
- </entry>
- <entry>
- <key>Afghanistan</key>
- <value>Afghanistan</value>
- </entry>
- <entry>
- <key>Russian Federation</key>
- <value>Russische Föderation</value>
- </entry>
- <entry>
- <key>waiting</key>
- <value>warten auf Rückmeldung</value>
- </entry>
- <entry>
- <key>American Samoa</key>
- <value>Amerikanischen Samoa-Inseln</value>
- </entry>
- <entry>
- <key>Korea (Democratic People's Republic of)</key>
- <value>Korea, Demokratische Volksrepublik)</value>
- </entry>
- <entry>
- <key>United States dollar</key>
- <value>US-Dollar</value>
- </entry>
- <entry>
- <key>Superordinate Attribute</key>
- <value>Ãœbergeordnete Eigenschaft</value>
- </entry>
- <entry>
- <key>Kyrgyzstan</key>
- <value>Kirgisistan</value>
- </entry>
- <entry>
- <key>Togo</key>
- <value>Togo</value>
- </entry>
- <entry>
- <key>Other_existing Customer</key>
- <value>Sonstiges_Bestandskunde</value>
- </entry>
- <entry>
- <key>Uzbekistan</key>
- <value>Usbekistan</value>
- </entry>
- <entry>
- <key>Dominica</key>
- <value>Dominica</value>
- </entry>
- <entry>
- <key>Benin</key>
- <value>Benin</value>
- </entry>
- <entry>
- <key>Virgin Islands (British)</key>
- <value>Virgin Inseln, Britisch)</value>
- </entry>
- <entry>
- <key>Sudan</key>
- <value>Sudan</value>
- </entry>
- <entry>
- <key>Portugal</key>
- <value>Portugal</value>
- </entry>
- <entry>
- <key>Grenada</key>
- <value>Grenada</value>
- </entry>
- <entry>
- <key>Latvia</key>
- <value>Lettland</value>
- </entry>
- <entry>
- <key>Mongolia</key>
- <value>Mongolei</value>
- </entry>
- <entry>
- <key>Morocco</key>
- <value>Marokko</value>
- </entry>
- <entry>
- <key>Guatemala</key>
- <value>Guatemala</value>
- </entry>
- <entry>
- <key>Pieces</key>
- <value>Stück</value>
- </entry>
- <entry>
- <key>Heard Island and McDonald Islands</key>
- <value>Heard Island und McDonald Islands</value>
- </entry>
- <entry>
- <key>Incoming</key>
- <value>eingehend</value>
- </entry>
- <entry>
- <key>Ghana</key>
- <value>Ghana</value>
- </entry>
- <entry>
- <key>Holy See</key>
- <value>Heiliger Stuhl</value>
- </entry>
- <entry>
- <key>India</key>
- <value>Indien</value>
- </entry>
- <entry>
- <key>Canada</key>
- <value>Kanada</value>
- </entry>
- <entry>
- <key>Maldives</key>
- <value>Malediven</value>
- </entry>
- <entry>
- <key>Service contract</key>
- <value>Werksvertrag</value>
- </entry>
- <entry>
- <key>Taiwan</key>
- <value>Taiwan</value>
- </entry>
- <entry>
- <key>Central African Republic</key>
- <value>Zentralafrikanische Republik</value>
- </entry>
- <entry>
- <key>Fiji</key>
- <value>Fidschi</value>
- </entry>
- <entry>
- <key>Guinea</key>
- <value>Guinea</value>
- </entry>
- <entry>
- <key>Somalia</key>
- <value>Somalia</value>
- </entry>
- <entry>
- <key>Sao Tome and Principe</key>
- <value>Sao Tome und Principe</value>
- </entry>
- <entry>
- <key>United Kingdom of Great Britain and Northern Ireland</key>
- <value>Vereinigtes Königreich Großbritannien und Nordirland</value>
- </entry>
- <entry>
- <key>Equatorial Guinea</key>
- <value>Äquatorialguinea</value>
- </entry>
- <entry>
- <key>Kiribati</key>
- <value>Kiribati</value>
- </entry>
- <entry>
- <key>Costa Rica</key>
- <value>Costa Rica</value>
- </entry>
- <entry>
- <key>Supplier</key>
- <value>Lieferant</value>
- </entry>
- <entry>
- <key>Nigeria</key>
- <value>Nigeria</value>
- </entry>
- <entry>
- <key>Syrian Arab Republic</key>
- <value>Syrische Arabische Republik</value>
- </entry>
- <entry>
- <key>Timor-Leste</key>
- <value>Timor-Leste</value>
- </entry>
- <entry>
- <key>Product_mobile use</key>
- <value>Produkt_Mobiler Einsatz</value>
- </entry>
- <entry>
- <key>Samoa</key>
- <value>Samoa</value>
- </entry>
- <entry>
- <key>Spain</key>
- <value>Spanien</value>
- </entry>
- <entry>
- <key>Palau</key>
- <value>Palau</value>
- </entry>
- <entry>
- <key>Prospect</key>
- <value>Potenzieller Kunde</value>
- </entry>
- <entry>
- <key>Estonia</key>
- <value>Estland</value>
- </entry>
- <entry>
- <key>Not signed yet</key>
- <value>noch nicht unterschrieben</value>
- </entry>
- <entry>
- <key>Niue</key>
- <value>Niue</value>
- </entry>
- <entry>
- <key>Mozambique</key>
- <value>Mosambik</value>
- </entry>
- <entry>
- <key>El Salvador</key>
- <value>El Salvador</value>
- </entry>
- <entry>
- <key>Guam</key>
- <value>Guam</value>
- </entry>
- <entry>
- <key>Lesotho</key>
- <value>Lesotho</value>
- </entry>
- <entry>
- <key>Tonga</key>
- <value>Tonga</value>
- </entry>
- <entry>
- <key>Western Sahara</key>
- <value>Westsahara</value>
- </entry>
- <entry>
- <key>new</key>
- <value>neu</value>
- </entry>
- <entry>
- <key>Adviser</key>
- <value>Berater</value>
- </entry>
- <entry>
- <key>Company_size</key>
- <value>Unternehmen_Größe</value>
- </entry>
- <entry>
- <key>Republic of Kosovo</key>
- <value>Republik Kosovo</value>
- </entry>
- <entry>
- <key>South Sudan</key>
- <value>Südsudan</value>
- </entry>
- <entry>
- <key>Mauritius</key>
- <value>Mauritius</value>
- </entry>
- <entry>
- <key>Bouvet Island</key>
- <value>Bouvet Island</value>
- </entry>
- <entry>
- <key>Bolivia (Plurinational State of)</key>
- <value>Bolivien (plurinationaler Staat)</value>
- </entry>
- <entry>
- <key>Norfolk Island</key>
- <value>Norfolkinsel</value>
- </entry>
- <entry>
- <key>Sint Maarten (Dutch part)</key>
- <value>Sint Maarten (niederländischer Teil)</value>
- </entry>
- <entry>
- <key>Micronesia (Federated States of)</key>
- <value>Mikronesien (Föderierte Staaten von)</value>
- </entry>
- <entry>
- <key>Product_industry knowhow</key>
- <value>Produkt_Branchen KnowHow</value>
- </entry>
- <entry>
- <key>Progress</key>
- <value>Fortschritt</value>
- </entry>
- <entry>
- <key>United States of America</key>
- <value>Vereinigte Staaten von Amerika</value>
- </entry>
- <entry>
- <key>In review</key>
- <value>zur Prüfung</value>
- </entry>
- <entry>
- <key>Address purchase</key>
- <value>Adresserwerb</value>
- </entry>
- <entry>
- <key>Malta</key>
- <value>Malta</value>
- </entry>
- <entry>
- <key>Project_volume</key>
- <value>Projekt_Volumen</value>
- </entry>
- <entry>
- <key>Ireland</key>
- <value>Irland</value>
- </entry>
- <entry>
- <key>Inactive</key>
- <value>Inaktiv</value>
- </entry>
- <entry>
- <key>France</key>
- <value>Frankreich</value>
- </entry>
- <entry>
- <key>Lithuania</key>
- <value>Litauen</value>
- </entry>
- <entry>
- <key>Korea (Republic of)</key>
- <value>Korea (Republik)</value>
- </entry>
- <entry>
- <key>${PRICELIST_SERVICE}</key>
- <value>Service</value>
- </entry>
- <entry>
- <key>English</key>
- <value>Englisch</value>
- </entry>
- <entry>
- <key>Nicaragua</key>
- <value>Nicaragua</value>
- </entry>
- <entry>
- <key>Macao</key>
- <value>Macao</value>
- </entry>
- <entry>
- <key>Mexico</key>
- <value>Mexiko</value>
- </entry>
- <entry>
- <key>Uganda</key>
- <value>Uganda</value>
- </entry>
- <entry>
- <key>Suriname</key>
- <value>Suriname</value>
- </entry>
- <entry>
- <key>Greenland</key>
- <value>Grönland</value>
- </entry>
- <entry>
- <key>Papua New Guinea</key>
- <value>Papua Neu-Guinea</value>
- </entry>
- <entry>
- <key>Kazakhstan</key>
- <value>Kasachstan</value>
- </entry>
- <entry>
- <key>Ã…land Islands</key>
- <value>Ã…landinseln</value>
- </entry>
- <entry>
- <key>Bahamas</key>
- <value>Bahamas</value>
- </entry>
- <entry>
- <key>Mali</key>
- <value>Mali</value>
- </entry>
- <entry>
- <key>Marshall Islands</key>
- <value>Marshallinseln</value>
- </entry>
- <entry>
- <key>Panama</key>
- <value>Panama</value>
- </entry>
- <entry>
- <key>Bonaire, Sint Eustatius and Saba</key>
- <value>Bonaire, Sint Eustatius und Saba</value>
- </entry>
- <entry>
- <key>Tanzania, United Republic of</key>
- <value>Tansania, Vereinigte Republik</value>
- </entry>
- <entry>
- <key>Argentina</key>
- <value>Argentinien</value>
- </entry>
- <entry>
- <key>Belize</key>
- <value>Belize</value>
- </entry>
- <entry>
- <key>Zambia</key>
- <value>Sambia</value>
- </entry>
- <entry>
- <key>Congo</key>
- <value>Kongo</value>
- </entry>
- <entry>
- <key>Guinea-Bissau</key>
- <value>Guinea-Bissau</value>
- </entry>
- <entry>
- <key>Namibia</key>
- <value>Namibia</value>
- </entry>
- <entry>
- <key>External sales manager</key>
- <value>Externer Verkaufsleiter</value>
- </entry>
- <entry>
- <key>Georgia</key>
- <value>Georgia</value>
- </entry>
- <entry>
- <key>Saint Kitts and Nevis</key>
- <value>St. Kitts und Nevis</value>
- </entry>
- <entry>
- <key>Yemen</key>
- <value>Jemen</value>
- </entry>
- <entry>
- <key>Aruba</key>
- <value>Aruba</value>
- </entry>
- <entry>
- <key>Madagascar</key>
- <value>Madagaskar</value>
- </entry>
- <entry>
- <key>Valid, unlimited</key>
- <value>gültig, unbefristet</value>
- </entry>
- <entry>
- <key>Svalbard and Jan Mayen</key>
- <value>Svalbard und Jan Mayen</value>
- </entry>
- <entry>
- <key>South Georgia and the South Sandwich Islands</key>
- <value>Süd-Georgien und die südlichen Sandwich-Inseln</value>
- </entry>
- <entry>
- <key>Sweden</key>
- <value>Schweden</value>
- </entry>
- <entry>
- <key>Malawi</key>
- <value>Malawi</value>
- </entry>
- <entry>
- <key>Andorra</key>
- <value>Andorra</value>
- </entry>
- <entry>
- <key>Poland</key>
- <value>Polen</value>
- </entry>
- <entry>
- <key>Tunisia</key>
- <value>Tunesien</value>
- </entry>
- <entry>
- <key>Tuvalu</key>
- <value>Tuvalu</value>
- </entry>
- <entry>
- <key>Lebanon</key>
- <value>Libanon</value>
- </entry>
- <entry>
- <key>Azerbaijan</key>
- <value>Aserbaidschan</value>
- </entry>
- <entry>
- <key>Czech Republic</key>
- <value>Tschechische Republik</value>
- </entry>
- <entry>
- <key>Mauritania</key>
- <value>Mauretanien</value>
- </entry>
- <entry>
- <key>Guernsey</key>
- <value>Guernsey</value>
- </entry>
- <entry>
- <key>Kgs</key>
- <value>Kg</value>
- </entry>
- <entry>
- <key>Australia</key>
- <value>Australien</value>
- </entry>
- <entry>
- <key>Myanmar</key>
- <value>Myanmar</value>
- </entry>
- <entry>
- <key>Cameroon</key>
- <value>Kamerun</value>
- </entry>
- <entry>
- <key>Iceland</key>
- <value>Island</value>
- </entry>
- <entry>
- <key>Oman</key>
- <value>Oman</value>
- </entry>
- <entry>
- <key>Gabon</key>
- <value>Gabun</value>
- </entry>
- <entry>
- <key>Luxembourg</key>
- <value>Luxemburg</value>
- </entry>
- <entry>
- <key>Algeria</key>
- <value>Algerien</value>
- </entry>
- <entry>
- <key>Jersey</key>
- <value>Jersey</value>
- </entry>
- <entry>
- <key>Slovenia</key>
- <value>Slowenien</value>
- </entry>
- <entry>
- <key>Antigua and Barbuda</key>
- <value>Antigua und Barbuda</value>
- </entry>
- <entry>
- <key>Annually</key>
- <value>jährlich</value>
- </entry>
- <entry>
- <key>Colombia</key>
- <value>Kolumbien</value>
- </entry>
- <entry>
- <key>Project_reference</key>
- <value>Projekt_Referenz</value>
- </entry>
- <entry>
- <key>Vanuatu</key>
- <value>Vanuatu</value>
- </entry>
- <entry>
- <key>Valid, limited</key>
- <value>gültig, befristet</value>
- </entry>
- <entry>
- <key>Honduras</key>
- <value>Honduras</value>
- </entry>
- <entry>
- <key>Antarctica</key>
- <value>Antarktis</value>
- </entry>
- <entry>
- <key>Nauru</key>
- <value>Nauru</value>
- </entry>
- <entry>
- <key>Burundi</key>
- <value>Burundi</value>
- </entry>
- <entry>
- <key>Project manager</key>
- <value>Projektmanager</value>
- </entry>
- <entry>
- <key>Singapore</key>
- <value>Singapur</value>
- </entry>
- <entry>
- <key>French Guiana</key>
- <value>Französisch-Guayana</value>
- </entry>
- <entry>
- <key>Hours</key>
- <value>Stunden</value>
- </entry>
- <entry>
- <key>Special price list</key>
- <value>Sonderpreisliste</value>
- </entry>
- <entry>
- <key>Christmas Island</key>
- <value>Weihnachtsinsel</value>
- </entry>
- <entry>
- <key>Netherlands</key>
- <value>Niederlande</value>
- </entry>
- <entry>
- <key>Product_flexibility</key>
- <value>Produkt_Flexibilität</value>
- </entry>
- <entry>
- <key>China</key>
- <value>China</value>
- </entry>
- <entry>
- <key>Martinique</key>
- <value>Martinique</value>
- </entry>
- <entry>
- <key>Own website</key>
- <value>Eigene Website</value>
- </entry>
- <entry>
- <key>Saint Pierre and Miquelon</key>
- <value>Saint Pierre und Miquelon</value>
- </entry>
- <entry>
- <key>Bhutan</key>
- <value>Bhutan</value>
- </entry>
- <entry>
- <key>Romania</key>
- <value>Rumänien</value>
- </entry>
- <entry>
- <key>Falkland Islands (Malvinas)</key>
- <value>Falklandinseln (Malvinas)</value>
- </entry>
- <entry>
- <key>Philippines</key>
- <value>Philippinen</value>
- </entry>
- <entry>
- <key>Pitcairn</key>
- <value>Pitcairn</value>
- </entry>
- <entry>
- <key>Zimbabwe</key>
- <value>Zimbabwe</value>
- </entry>
- <entry>
- <key>British Indian Ocean Territory</key>
- <value>Britisches Territorium des Indischen Ozeans</value>
- </entry>
- <entry>
- <key>Montenegro</key>
- <value>Montenegro</value>
- </entry>
- <entry>
- <key>Quarterly</key>
- <value>vierteljährlich</value>
- </entry>
- <entry>
- <key>Indonesia</key>
- <value>Indonesien</value>
- </entry>
- <entry>
- <key>Module</key>
- <value>Modul</value>
- </entry>
- <entry>
- <key>Angola</key>
- <value>Angola</value>
- </entry>
- <entry>
- <key>Internal</key>
- <value>intern</value>
- </entry>
- <entry>
- <key>Brunei Darussalam</key>
- <value>Brunei Darussalam</value>
- </entry>
- <entry>
- <key>New Caledonia</key>
- <value>Neu-Kaledonien</value>
- </entry>
- <entry>
- <key>Cayman Islands</key>
- <value>Cayman Inseln</value>
- </entry>
- <entry>
- <key>Congo (Democratic Republic of the)</key>
- <value>Kongo (Demokratische Republik)</value>
- </entry>
- <entry>
- <key>Greece</key>
- <value>Griechenland</value>
- </entry>
- <entry>
- <key>Guyana</key>
- <value>Guyana</value>
- </entry>
- <entry>
- <key>Project assistant</key>
- <value>Projektassistent</value>
- </entry>
- <entry>
- <key>Iraq</key>
- <value>Irak</value>
- </entry>
- <entry>
- <key>Chile</key>
- <value>Chile</value>
- </entry>
- <entry>
- <key>Nepal</key>
- <value>Nepal</value>
- </entry>
- <entry>
- <key>${PRICELIST_DEFAULT}</key>
- <value>Standard</value>
- </entry>
- <entry>
- <key>Customer recommendation</key>
- <value>Kundenempfehlung</value>
- </entry>
- <entry>
- <key>Other_unknown</key>
- <value>Sonstiges_Unbekannt</value>
- </entry>
- <entry>
- <key>Isle of Man</key>
- <value>Isle of Man</value>
- </entry>
- <entry>
- <key>Ukraine</key>
- <value>Ukraine</value>
- </entry>
- <entry>
- <key>Curaçao</key>
- <value>Curacao</value>
- </entry>
- <entry>
- <key>Anguilla</key>
- <value>Anguilla</value>
- </entry>
- <entry>
- <key>Euro</key>
- <value>Euro</value>
- </entry>
- <entry>
- <key>Product_GUI</key>
- <value>Produkt_GUI</value>
- </entry>
- <entry>
- <key>${GENDER_OTHER}</key>
- <value>Divers</value>
- </entry>
- <entry>
- <key>Touchpoint</key>
- <value>Kontaktpunkt</value>
- </entry>
- <entry>
- <key>Turkey</key>
- <value>Türkei</value>
- </entry>
- <entry>
- <key>Belgium</key>
- <value>Belgien</value>
- </entry>
- <entry>
- <key>South Africa</key>
- <value>Südafrika</value>
- </entry>
- <entry>
- <key>Trinidad and Tobago</key>
- <value>Trinidad und Tobago</value>
- </entry>
- <entry>
- <key>Bermuda</key>
- <value>Bermuda</value>
- </entry>
- <entry>
- <key>Jamaica</key>
- <value>Jamaika</value>
- </entry>
- <entry>
- <key>Peru</key>
- <value>Peru</value>
- </entry>
- <entry>
- <key>Turkmenistan</key>
- <value>Turkmenistan</value>
- </entry>
- <entry>
- <key>Venezuela (Bolivarian Republic of)</key>
- <value>Venezuela (Bolivarische Republik)</value>
- </entry>
- <entry>
- <key>Tokelau</key>
- <value>Tokelau</value>
- </entry>
- <entry>
- <key>Hong Kong</key>
- <value>Hongkong</value>
- </entry>
- <entry>
- <key>Chad</key>
- <value>Tschad</value>
- </entry>
- <entry>
- <key>German</key>
- <value>Deutsch</value>
- </entry>
- <entry>
- <key>Thailand</key>
- <value>Thailand</value>
- </entry>
- <entry>
- <key>in process</key>
- <value>in Bearbeitung</value>
- </entry>
- <entry>
- <key>Saint Martin (French part)</key>
- <value>Saint Martin (französischer Teil)</value>
- </entry>
- <entry>
- <key>Kuwait</key>
- <value>Kuwait</value>
- </entry>
- <entry>
- <key>Palestine, State of</key>
- <value>Palästina, Bundesstaat</value>
- </entry>
- <entry>
- <key>Croatia</key>
- <value>Kroatien</value>
- </entry>
- <entry>
- <key>Cook Islands</key>
- <value>Cookinseln</value>
- </entry>
- <entry>
- <key>Fair</key>
- <value>Messe</value>
- </entry>
- <entry>
- <key>Sri Lanka</key>
- <value>Sri Lanka</value>
- </entry>
- <entry>
- <key>Uruguay</key>
- <value>Uruguay</value>
- </entry>
- <entry>
- <key>Liberia</key>
- <value>Liberia</value>
- </entry>
- <entry>
- <key>Burkina Faso</key>
- <value>Burkina Faso</value>
- </entry>
- <entry>
- <key>Swiss franc</key>
- <value>Schweizerfranken</value>
- </entry>
- <entry>
- <key>Swaziland</key>
- <value>Swasiland</value>
- </entry>
- <entry>
- <key>ended</key>
- <value>abgeschlossen</value>
- </entry>
- <entry>
- <key>Saint Barthélemy</key>
- <value>Saint Barthélemy</value>
- </entry>
- <entry>
- <key>Wallis and Futuna</key>
- <value>Wallis und Futuna</value>
- </entry>
- <entry>
- <key>Company_industry knowhow</key>
- <value>Unternehmen_Branchen KnowHow</value>
- </entry>
- <entry>
- <key>Monaco</key>
- <value>Monaco</value>
- </entry>
- <entry>
- <key>Spanish</key>
- <value>Spanisch</value>
- </entry>
- <entry>
- <key>Hungary</key>
- <value>Ungarn</value>
- </entry>
- <entry>
- <key>Réunion</key>
- <value>Réunion</value>
- </entry>
- <entry>
- <key>Belarus</key>
- <value>Weißrussland</value>
- </entry>
- <entry>
- <key>Albania</key>
- <value>Albanien</value>
- </entry>
- <entry>
- <key>Internal sales manager</key>
- <value>Interner Vertrieb</value>
- </entry>
- <entry>
- <key>Virgin Islands (U.S.)</key>
- <value>Jungferninseln (US)</value>
- </entry>
- <entry>
- <key>New Zealand</key>
- <value>Neuseeland</value>
- </entry>
- <entry>
- <key>Senegal</key>
- <value>Senegal</value>
- </entry>
- <entry>
- <key>Ethiopia</key>
- <value>Äthiopien</value>
- </entry>
- <entry>
- <key>Macedonia (the former Yugoslav Republic of)</key>
- <value>Mazedonien (ehemalige jugoslawische Republik)</value>
- </entry>
- <entry>
- <key>Egypt</key>
- <value>Ägypten</value>
- </entry>
- <entry>
- <key>Sierra Leone</key>
- <value>Sierra Leone</value>
- </entry>
- <entry>
- <key>Saudi Arabia</key>
- <value>Saudi Arabien</value>
- </entry>
- <entry>
- <key>Pakistan</key>
- <value>Pakistan</value>
- </entry>
- <entry>
- <key>Gambia</key>
- <value>Gambia</value>
- </entry>
- <entry>
- <key>Qatar</key>
- <value>Katar</value>
- </entry>
- <entry>
- <key>Slovakia</key>
- <value>Slowakei</value>
- </entry>
- <entry>
- <key>Serbia</key>
- <value>Serbien</value>
- </entry>
- <entry>
- <key>Bosnia and Herzegovina</key>
- <value>Bosnien und Herzegowina</value>
- </entry>
- <entry>
- <key>Framework contract</key>
- <value>Rahmenvertrag</value>
- </entry>
- <entry>
- <key>Niger</key>
- <value>Niger</value>
- </entry>
- <entry>
- <key>Rwanda</key>
- <value>Ruanda</value>
- </entry>
- <entry>
- <key>French Southern Territories</key>
- <value>Südfranzösische Territorien</value>
- </entry>
- <entry>
- <key>Bangladesh</key>
- <value>Bangladesch</value>
- </entry>
- <entry>
- <key>Barbados</key>
- <value>Barbados</value>
- </entry>
- <entry>
- <key>Botswana</key>
- <value>Botswana</value>
- </entry>
- <entry>
- <key>Saint Vincent and the Grenadines</key>
- <value>St. Vincent und die Grenadinen</value>
- </entry>
- <entry>
- <key>Denmark</key>
- <value>Dänemark</value>
- </entry>
- <entry>
- <key>Dominican Republic</key>
- <value>Dominikanische Republik</value>
- </entry>
- <entry>
- <key>MAL</key>
- </entry>
- <entry>
- <key>SQO</key>
- </entry>
- <entry>
- <key>NQC</key>
- </entry>
- <entry>
- <key>MQL</key>
- </entry>
- <entry>
- <key>SAL</key>
- </entry>
- <entry>
- <key>Checkbox</key>
- <value>Checkbox</value>
- </entry>
- <entry>
- <key>Numeric value</key>
- <value>Zahlenwert</value>
- </entry>
- <entry>
- <key>decline</key>
- <value>Ablehnen</value>
- </entry>
- <entry>
- <key>Text</key>
- </entry>
- <entry>
- <key>Group</key>
- </entry>
- <entry>
- <key>Combobox</key>
- <value>Combobox</value>
- </entry>
- <entry>
- <key>tentative</key>
- <value>Vorläufig</value>
- </entry>
- <entry>
- <key>${NUMBER}</key>
- <value>Zahl</value>
- </entry>
- <entry>
- <key>Name \"%0\" already used for container \"%1\"</key>
- </entry>
- <entry>
- <key>CHAR_VALUE</key>
- </entry>
- <entry>
- <key>Keyword Attribute</key>
- <value>Schlüsselwort-Attribut</value>
- </entry>
- <entry>
- <key>in</key>
- </entry>
- <entry>
- <key>Keyword Attribute Values</key>
- <value>Schlüsselwort-Attribut-Werte</value>
- </entry>
- <entry>
- <key>Boolean value</key>
- </entry>
- <entry>
- <key>accept</key>
- <value>akzeptieren</value>
- </entry>
- <entry>
- <key>The ZIP code does not match the format of the country.</key>
- <value>Die Postleitzahl hat nicht das Format des ausgewählten Landes.</value>
- </entry>
- <entry>
- <key>String value</key>
- <value>String-Wert</value>
- </entry>
- <entry>
- <key>The code number is not a valid number.</key>
- <value>The code number is not a valid number.</value>
- </entry>
- <entry>
- <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
- <value>Der DB-Typ wird in der Funktion %0 nicht unterstützt.</value>
- </entry>
- <entry>
- <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
- <value>Es wird der Funktion %0 keine Produktid übergeben.</value>
- </entry>
- <entry>
- <key>Object type</key>
- <value>Typ</value>
- </entry>
- <entry>
- <key>Level</key>
- </entry>
- <entry>
- <key>Print Offer</key>
- <value>Angebot drucken</value>
- </entry>
- <entry>
- <key>relations</key>
- </entry>
- <entry>
- <key>Time</key>
- <value>Zeit</value>
- </entry>
- <entry>
- <key>New task</key>
- <value>Neue Aufgabe</value>
- </entry>
- <entry>
- <key>MyTasks</key>
- <value>Meine Aufgaben</value>
- </entry>
- <entry>
- <key>Show my tasks</key>
- <value>Meine Aufgaben anzeigen</value>
- </entry>
- <entry>
- <key>the specified key has to be unique for that container but does already exist</key>
- </entry>
- <entry>
- <key>Tree Entity</key>
- </entry>
- <entry>
- <key>Relationtype</key>
- <value>Beziehungsart</value>
- </entry>
- <entry>
- <key>Tree</key>
- <value>Baum</value>
- </entry>
- <entry>
- <key>100%</key>
- </entry>
- <entry>
- <key>Mobil</key>
- </entry>
- <entry>
- <key>25%</key>
- </entry>
- <entry>
- <key>50%</key>
- </entry>
- <entry>
- <key>75%</key>
- </entry>
- <entry>
- <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
- </entry>
- <entry>
- <key>competitor</key>
- <value>Konkurrent</value>
- </entry>
- <entry>
- <key>0%</key>
- </entry>
- <entry>
- <key>acquainted with</key>
- <value>Bekannt mit</value>
- </entry>
- <entry>
- <key>collaboration with</key>
- <value>Zusammenarbeit mit</value>
- </entry>
- <entry>
- <key>parent company</key>
- <value>Konzernmutter</value>
- </entry>
- <entry>
- <key>society</key>
- <value>Verband</value>
- </entry>
- <entry>
- <key>ankle of</key>
- <value>Enkel/in von</value>
- </entry>
- <entry>
- <key>solicits</key>
- <value>Bewirbt</value>
- </entry>
- <entry>
- <key>supervisor of</key>
- <value>Vorgesetzter von</value>
- </entry>
- <entry>
- <key>reports to</key>
- <value>Berichtet an</value>
- </entry>
- <entry>
- <key>subsidiary</key>
- <value>Tochtergesellschaft</value>
- </entry>
- <entry>
- <key>supported by</key>
- <value>Wird unterstützt von</value>
- </entry>
- <entry>
- <key>member</key>
- <value>Mitglied</value>
- </entry>
- <entry>
- <key>promotion target of</key>
- <value>Werbezielgruppe von</value>
- </entry>
- <entry>
- <key>supports</key>
- <value>Unterstützt</value>
- </entry>
- <entry>
- <key>parent of</key>
- <value>Elternteil von</value>
- </entry>
- <entry>
- <key>grandparents of</key>
- <value>Großeltern von</value>
- </entry>
- <entry>
- <key>Memo</key>
- <value>Memo</value>
- </entry>
- <entry>
- <key>Function</key>
- <value>Funktion</value>
- </entry>
- <entry>
- <key>Relational</key>
- </entry>
- <entry>
- <key>Only numbers are allowed.</key>
- <value>Es sind nur Zahlen erlaubt.</value>
- </entry>
- <entry>
- <key>MQC</key>
- </entry>
- <entry>
- <key>Datei</key>
- </entry>
- <entry>
- <key>Japan</key>
- <value>Japan</value>
- </entry>
- <entry>
- <key>7 days net</key>
- <value>7 Tage netto</value>
- </entry>
- <entry>
- <key>carriage free</key>
- <value>frei Haus</value>
- </entry>
- <entry>
- <key>Relation tree</key>
- <value>Beziehungsbaum</value>
- </entry>
- <entry>
- <key>8 days 2% discount, 30 days net</key>
- <value>8 Tage 2% Skonto, 30 Tage netto</value>
- </entry>
- <entry>
- <key>CIF</key>
- </entry>
- <entry>
- <key>ex works</key>
- <value>ab Werk</value>
- </entry>
- <entry>
- <key>Relation</key>
- </entry>
- <entry>
- <key>Payment term</key>
- <value>Zahlungsbedingung</value>
- </entry>
- <entry>
- <key>30 days net</key>
- <value>30 Tage netto</value>
- </entry>
- <entry>
- <key>Contactrole</key>
- <value>Funktion</value>
- </entry>
- <entry>
- <key>Object tree</key>
- </entry>
- <entry>
- <key>&Aufg / Term (%0/%1)</key>
- </entry>
- <entry>
- <key>Verschieben auf Datum?</key>
- </entry>
- <entry>
- <key>niedrig</key>
- </entry>
- <entry>
- <key>Gebucht</key>
- </entry>
- <entry>
- <key>Other Contactroles</key>
- <value>Weitere Funktionen</value>
- </entry>
- <entry>
- <key>Bitte Datumseingabe prüfen!</key>
- </entry>
- <entry>
- <key>In Bearbeitung</key>
- </entry>
- <entry>
- <key>OK</key>
- </entry>
- <entry>
- <key>Nicht begonnen</key>
- </entry>
- <entry>
- <key>Bitte Filterbedingungen setzen</key>
- </entry>
- <entry>
- <key>Bestätigt</key>
- </entry>
- <entry>
- <key>Vorläufig</key>
- </entry>
- <entry>
- <key>keine</key>
- </entry>
- <entry>
- <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
- </entry>
- <entry>
- <key>Aufgaben von</key>
- </entry>
- <entry>
- <key>&Aufgaben (%0)</key>
- </entry>
- <entry>
- <key>erledigt / zurückgestellt</key>
- </entry>
- <entry>
- <key>hoch</key>
- </entry>
- <entry>
- <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
- </entry>
- <entry>
- <key>Zurückgestellt</key>
- </entry>
- <entry>
- <key>Erledigt</key>
- </entry>
- <entry>
- <key>Usages</key>
- </entry>
- <entry>
- <key>Abgesagt</key>
- </entry>
- <entry>
- <key>Außer Haus</key>
- </entry>
- <entry>
- <key>Abbrechen</key>
- </entry>
- <entry>
- <key>Benutzer auswählen</key>
- </entry>
- <entry>
- <key>delegiert</key>
- </entry>
- <entry>
- <key>frei</key>
- </entry>
- <entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
- </entry>
- <entry>
- <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
- </entry>
- <entry>
- <key>normal</key>
- </entry>
- <entry>
- <key>Termine von</key>
- </entry>
- <entry>
- <key>nur Verschiebung in die Zukunft erlaubt!</key>
- </entry>
- <entry>
- <key>Kategorie</key>
- </entry>
- <entry>
- <key>Product content</key>
- <value>Produktinhalt</value>
- </entry>
- <entry>
- <key>Know How</key>
- <value>Know How</value>
- </entry>
- <entry>
- <key>Personal appearance</key>
- <value>Persönliches Auftreten</value>
- </entry>
- <entry>
- <key>Market situation</key>
- <value>Marktsituation</value>
- </entry>
- <entry>
- <key>Liquidity</key>
- <value>Liquidität</value>
- </entry>
- <entry>
- <key>Price policy</key>
- <value>Preispolitik</value>
- </entry>
- <entry>
- <key>VAT in %</key>
- </entry>
- </keyValueMap>
- <font name="Dialog" style="0" size="11" />
-</language>
+<?xml version="1.0" encoding="UTF-8"?>
+<language 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/language/1.2.0">
+ <name>_____LANGUAGE_de</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <language>de</language>
+ <country></country>
+ <variant></variant>
+ <keyValueMap>
+ <entry>
+ <key>Company</key>
+ <value>Firma</value>
+ </entry>
+ <entry>
+ <key>Entrydate (Day)</key>
+ <value>Eingangsdatum (Tag)</value>
+ </entry>
+ <entry>
+ <key>Turnover</key>
+ <value>Umsatz</value>
+ </entry>
+ <entry>
+ <key>Discount %</key>
+ <value>Rabatt %</value>
+ </entry>
+ <entry>
+ <key>E-Mail</key>
+ <value>E-Mail</value>
+ </entry>
+ <entry>
+ <key>Maximal Count</key>
+ <value>Maximale Anzahl</value>
+ </entry>
+ <entry>
+ <key>Entrydate (Month)</key>
+ <value>Eingangsdatum (Monat)</value>
+ </entry>
+ <entry>
+ <key>Usage</key>
+ <value>Verwendung</value>
+ </entry>
+ <entry>
+ <key>Show all activities</key>
+ <value>Alle Aktivitäten anzeigen</value>
+ </entry>
+ <entry>
+ <key>${ADDRESS_STATE}</key>
+ <value>Staat</value>
+ </entry>
+ <entry>
+ <key>Show all contracts</key>
+ <value>Alle Verträge anzeigen</value>
+ </entry>
+ <entry>
+ <key>Communication data</key>
+ <value>Kommunikationsdaten</value>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_NEGOTIATION}</key>
+ <value>Negotiation</value>
+ </entry>
+ <entry>
+ <key>Filename</key>
+ <value>Dateiname</value>
+ </entry>
+ <entry>
+ <key>Male</key>
+ <value>Männlich</value>
+ </entry>
+ <entry>
+ <key>Activity</key>
+ <value>Aktivität</value>
+ </entry>
+ <entry>
+ <key>Name</key>
+ <value>Name</value>
+ </entry>
+ <entry>
+ <key>Austria</key>
+ <value>Österreich</value>
+ </entry>
+ <entry>
+ <key>New time tracking</key>
+ <value>Neuer Zeiteintrag</value>
+ </entry>
+ <entry>
+ <key>Customercode</key>
+ <value>Kundennummer</value>
+ </entry>
+ <entry>
+ <key>Time expenses</key>
+ <value>Aufwand</value>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_OFFER}</key>
+ <value>Offer</value>
+ </entry>
+ <entry>
+ <key>Status</key>
+ <value>Status</value>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_MEMBER}</key>
+ <value>Projektteam</value>
+ </entry>
+ <entry>
+ <key>${QUANTITY_LOWER_THAN_1}</key>
+ <value>Die Menge muss mindestens 1 sein.</value>
+ </entry>
+ <entry>
+ <key>Days inactive</key>
+ <value>Tage inaktiv</value>
+ </entry>
+ <entry>
+ <key>Active</key>
+ <value>Aktiv</value>
+ </entry>
+ <entry>
+ <key>Medium</key>
+ <value>Medium</value>
+ </entry>
+ <entry>
+ <key>Internet</key>
+ <value>Internet</value>
+ </entry>
+ <entry>
+ <key>Germany</key>
+ <value>Deutschland</value>
+ </entry>
+ <entry>
+ <key>Online-Meeting</key>
+ <value>Online-Meeting</value>
+ </entry>
+ <entry>
+ <key>Choose address</key>
+ <value>Adresse auswählen</value>
+ </entry>
+ <entry>
+ <key>Social Media</key>
+ <value>Social Media</value>
+ </entry>
+ <entry>
+ <key>Visit</key>
+ <value>Besuch</value>
+ </entry>
+ <entry>
+ <key>Information</key>
+ <value>Information</value>
+ </entry>
+ <entry>
+ <key>Language</key>
+ <value>Sprache</value>
+ </entry>
+ <entry>
+ <key>Phone</key>
+ <value>Telefon</value>
+ </entry>
+ <entry>
+ <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
+ </entry>
+ <entry>
+ <key>360 Degree</key>
+ <value>360 Grad</value>
+ </entry>
+ <entry>
+ <key>Activities</key>
+ <value>Aktivitäten</value>
+ </entry>
+ <entry>
+ <key>Female</key>
+ <value>Weiblich</value>
+ </entry>
+ <entry>
+ <key>Contactmanagement</key>
+ <value>Kontaktmanagement</value>
+ </entry>
+ <entry>
+ <key>Mobile</key>
+ <value>Mobil</value>
+ </entry>
+ <entry>
+ <key>Office address</key>
+ <value>Firmenadresse</value>
+ </entry>
+ <entry>
+ <key>Contact</key>
+ <value>Kontakt</value>
+ </entry>
+ <entry>
+ <key>Home address</key>
+ <value>Privatadresse</value>
+ </entry>
+ <entry>
+ <key>Type</key>
+ <value>Typ</value>
+ </entry>
+ <entry>
+ <key>Contacts</key>
+ <value>Kontakte</value>
+ </entry>
+ <entry>
+ <key>Norway</key>
+ <value>Norwegen</value>
+ </entry>
+ <entry>
+ <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
+ </entry>
+ <entry>
+ <key>Address</key>
+ <value>Adresse</value>
+ </entry>
+ <entry>
+ <key>Addresses</key>
+ <value>Adressen</value>
+ </entry>
+ <entry>
+ <key>Contact type</key>
+ <value>Kontaktart</value>
+ </entry>
+ <entry>
+ <key>${COMM_ADDRESS}</key>
+ <value>Adresse</value>
+ </entry>
+ <entry>
+ <key>Gender</key>
+ <value>Geschlecht</value>
+ </entry>
+ <entry>
+ <key>Show all companies</key>
+ <value>Alle Firmen anzeigen</value>
+ </entry>
+ <entry>
+ <key>Date of birth</key>
+ <value>Geburtsdatum</value>
+ </entry>
+ <entry>
+ <key>Lastname</key>
+ <value>Nachname</value>
+ </entry>
+ <entry>
+ <key>Salutation</key>
+ <value>Anrede</value>
+ </entry>
+ <entry>
+ <key>Middlename</key>
+ <value>Zwischenname</value>
+ </entry>
+ <entry>
+ <key>Title</key>
+ <value>Titel</value>
+ </entry>
+ <entry>
+ <key>Addresstype</key>
+ <value>Adresstyp</value>
+ </entry>
+ <entry>
+ <key>Firstname</key>
+ <value>Vorname</value>
+ </entry>
+ <entry>
+ <key>Show all contacts</key>
+ <value>Alle Kontaktpersonen anzeigen</value>
+ </entry>
+ <entry>
+ <key>Description</key>
+ <value>Beschreibung</value>
+ </entry>
+ <entry>
+ <key>Direction</key>
+ <value>Richtung</value>
+ </entry>
+ <entry>
+ <key>Entrydate</key>
+ <value>Eingangsdatum</value>
+ </entry>
+ <entry>
+ <key>Subject</key>
+ <value>Betreff</value>
+ </entry>
+ <entry>
+ <key>Post office box</key>
+ <value>Postfach</value>
+ </entry>
+ <entry>
+ <key>Delivery address</key>
+ <value>Lieferadresse</value>
+ </entry>
+ <entry>
+ <key>House number</key>
+ <value>Hausnummer</value>
+ </entry>
+ <entry>
+ <key>Country</key>
+ <value>Land</value>
+ </entry>
+ <entry>
+ <key>Communication</key>
+ <value>Kommunikation</value>
+ </entry>
+ <entry>
+ <key>postcode</key>
+ <value>Postleitzahl</value>
+ </entry>
+ <entry>
+ <key>City</key>
+ <value>Ort</value>
+ </entry>
+ <entry>
+ <key>State</key>
+ <value>Status</value>
+ </entry>
+ <entry>
+ <key>Region</key>
+ <value>Region</value>
+ </entry>
+ <entry>
+ <key>District</key>
+ <value>Kreis</value>
+ </entry>
+ <entry>
+ <key>Companies</key>
+ <value>Firmen</value>
+ </entry>
+ <entry>
+ <key>Switzerland</key>
+ <value>Schweiz</value>
+ </entry>
+ <entry>
+ <key>Confirmed</key>
+ <value>Bestätigt</value>
+ </entry>
+ <entry>
+ <key>Free</key>
+ <value>Frei</value>
+ </entry>
+ <entry>
+ <key>Tentative</key>
+ <value>Vorläufig</value>
+ </entry>
+ <entry>
+ <key>Ignore series</key>
+ <value>Monatliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
+ </entry>
+ <entry>
+ <key>Internal (2)</key>
+ </entry>
+ <entry>
+ <key>Touchpoints</key>
+ <value>Kontaktpunkte</value>
+ </entry>
+ <entry>
+ <key>Company Addresses</key>
+ <value>Firmenadressen</value>
+ </entry>
+ <entry>
+ <key>yearly series not specified</key>
+ <value>Jährliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
+ </entry>
+ <entry>
+ <key>OutOfOffice</key>
+ <value>Außer Haus</value>
+ </entry>
+ <entry>
+ <key>Cancelled</key>
+ <value>Abgesagt</value>
+ </entry>
+ <entry>
+ <key>Ignore daily series</key>
+ <value>Tägliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
+ </entry>
+ <entry>
+ <key>yyyyMMdd</key>
+ <value>yyyyMMdd</value>
+ </entry>
+ <entry>
+ <key>standard address</key>
+ <value>Standard-Adresse</value>
+ </entry>
+ <entry>
+ <key>Create receipt</key>
+ <value>Beleg erstellen</value>
+ </entry>
+ <entry>
+ <key>PP</key>
+ <value>EK</value>
+ </entry>
+ <entry>
+ <key>Liter</key>
+ </entry>
+ <entry>
+ <key>Key account</key>
+ <value>Großkunde</value>
+ </entry>
+ <entry>
+ <key>Cover letter</key>
+ <value>Anschreiben</value>
+ </entry>
+ <entry>
+ <key>VAT</key>
+ <value>UmsSt.</value>
+ </entry>
+ <entry>
+ <key>The expiry date must be after the start date!</key>
+ <value>Das Ende-Datum muss nach dem Beginn-Datum liegen!</value>
+ </entry>
+ <entry>
+ <key>Product</key>
+ <value>Produkt</value>
+ </entry>
+ <entry>
+ <key>Developer</key>
+ <value>Hersteller</value>
+ </entry>
+ <entry>
+ <key>Valid until</key>
+ <value>gültig bis</value>
+ </entry>
+ <entry>
+ <key>Department</key>
+ <value>Abteilung</value>
+ </entry>
+ <entry>
+ <key>Price list</key>
+ <value>Preisliste</value>
+ </entry>
+ <entry>
+ <key>Currency</key>
+ <value>Währung</value>
+ </entry>
+ <entry>
+ <key>Payment method</key>
+ <value>Zahlungsweise</value>
+ </entry>
+ <entry>
+ <key>Price list / Company</key>
+ <value>Preisliste / Firma</value>
+ </entry>
+ <entry>
+ <key>Curr. sales price</key>
+ <value>akt. VK-Preis</value>
+ </entry>
+ <entry>
+ <key>Contract</key>
+ <value>Vertrag</value>
+ </entry>
+ <entry>
+ <key>Stock</key>
+ <value>Lagerbestand</value>
+ </entry>
+ <entry>
+ <key>PP/SP</key>
+ <value>EK/VK</value>
+ </entry>
+ <entry>
+ <key>Next due date</key>
+ <value>nächste Fälligkeit</value>
+ </entry>
+ <entry>
+ <key>Discount</key>
+ <value>Rabatt</value>
+ </entry>
+ <entry>
+ <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
+ <value>Nächste Fälligkeit muss nach Vertragsbeginn und vor Vertragsende liegen!</value>
+ </entry>
+ <entry>
+ <key>Sales</key>
+ <value>Vertrieb</value>
+ </entry>
+ <entry>
+ <key>Contract number</key>
+ <value>Vertragsnummer</value>
+ </entry>
+ <entry>
+ <key>Min. stock</key>
+ <value>Min.-Bestand</value>
+ </entry>
+ <entry>
+ <key>SP</key>
+ <value>VK</value>
+ </entry>
+ <entry>
+ <key>Commodity group 3</key>
+ <value>Warengruppe 3</value>
+ </entry>
+ <entry>
+ <key>Commodity group 2</key>
+ <value>Warengruppe 2</value>
+ </entry>
+ <entry>
+ <key>Commodity group 1</key>
+ <value>Warengruppe 1</value>
+ </entry>
+ <entry>
+ <key>Contract start date</key>
+ <value>Vertragsbeginn</value>
+ </entry>
+ <entry>
+ <key>Spare parts</key>
+ <value>Ersatzteile</value>
+ </entry>
+ <entry>
+ <key>Employee</key>
+ <value>Mitarbeiter</value>
+ </entry>
+ <entry>
+ <key>Unit</key>
+ <value>Einheit</value>
+ </entry>
+ <entry>
+ <key>Contract expiry date</key>
+ <value>Vertragsende</value>
+ </entry>
+ <entry>
+ <key>Yes</key>
+ <value>Ja</value>
+ </entry>
+ <entry>
+ <key>Type of contract</key>
+ <value>Vertragsart</value>
+ </entry>
+ <entry>
+ <key>No</key>
+ <value>Nein</value>
+ </entry>
+ <entry>
+ <key>Service</key>
+ <value>Dienstleistung</value>
+ </entry>
+ <entry>
+ <key>Advertising material</key>
+ <value>Werbemittel</value>
+ </entry>
+ <entry>
+ <key>Valid from</key>
+ <value>gültig ab</value>
+ </entry>
+ <entry>
+ <key>Product name</key>
+ <value>Produktname</value>
+ </entry>
+ <entry>
+ <key>Product group</key>
+ <value>Produktgruppe</value>
+ </entry>
+ <entry>
+ <key>${CONTRACT_STATUS}</key>
+ <value>Status</value>
+ </entry>
+ <entry>
+ <key>From no. of units</key>
+ <value>ab Stückzahl</value>
+ </entry>
+ <entry>
+ <key>Maindocuments</key>
+ <value>Hauptdokumente</value>
+ </entry>
+ <entry>
+ <key>Price</key>
+ <value>Preis</value>
+ </entry>
+ <entry>
+ <key>Conditions</key>
+ <value>Konditionen</value>
+ </entry>
+ <entry>
+ <key>Standard</key>
+ </entry>
+ <entry>
+ <key>I / O</key>
+ <value>E / A</value>
+ </entry>
+ <entry>
+ <key>Date</key>
+ <value>Datum</value>
+ </entry>
+ <entry>
+ <key>IN</key>
+ <value>EIN</value>
+ </entry>
+ <entry>
+ <key>OUT</key>
+ <value>AUS</value>
+ </entry>
+ <entry>
+ <key>Warehouse</key>
+ <value>Lager</value>
+ </entry>
+ <entry>
+ <key>Reference</key>
+ <value>Referenz</value>
+ </entry>
+ <entry>
+ <key>The contract number already exists!</key>
+ <value>Die Vertragsnummer existiert bereits!</value>
+ </entry>
+ <entry>
+ <key>The product number already exists!</key>
+ <value>Die Produktnummer existiert bereits!</value>
+ </entry>
+ <entry>
+ <key>Quantity</key>
+ <value>Menge</value>
+ </entry>
+ <entry>
+ <key>Salesproject</key>
+ <value>Vertriebsprojekt</value>
+ </entry>
+ <entry>
+ <key>Rollout</key>
+ <value>Roll Out</value>
+ </entry>
+ <entry>
+ <key>Phase</key>
+ <value>Phase</value>
+ </entry>
+ <entry>
+ <key>Product number</key>
+ <value>Produktnummer</value>
+ </entry>
+ <entry>
+ <key>Project number</key>
+ <value>Projektnummer</value>
+ </entry>
+ <entry>
+ <key>Project title</key>
+ <value>Projekttitel</value>
+ </entry>
+ <entry>
+ <key>Project start</key>
+ <value>Projektstart</value>
+ </entry>
+ <entry>
+ <key>Volume</key>
+ <value>Volumen</value>
+ </entry>
+ <entry>
+ <key>Partial order</key>
+ <value>Teilauftrag</value>
+ </entry>
+ <entry>
+ <key>Open</key>
+ <value>Offen</value>
+ </entry>
+ <entry>
+ <key>Lost</key>
+ <value>Verloren</value>
+ </entry>
+ <entry>
+ <key>Order</key>
+ <value>Auftrag</value>
+ </entry>
+ <entry>
+ <key>Postponed</key>
+ <value>Vertagt</value>
+ </entry>
+ <entry>
+ <key>Aborted</key>
+ <value>Abgebrochen</value>
+ </entry>
+ <entry>
+ <key>Negotiation</key>
+ <value>Verhandlung</value>
+ </entry>
+ <entry>
+ <key>Workshop</key>
+ <value>Workshop</value>
+ </entry>
+ <entry>
+ <key>Presentation preparation</key>
+ <value>Präsentationsvorbereitung</value>
+ </entry>
+ <entry>
+ <key>Specifications in progress</key>
+ <value>Lastenheft in Bearbeitung</value>
+ </entry>
+ <entry>
+ <key>Project decision</key>
+ <value>Projektentscheidung</value>
+ </entry>
+ <entry>
+ <key>Lead</key>
+ <value>Lead</value>
+ </entry>
+ <entry>
+ <key>Total net</key>
+ <value>Betrag netto</value>
+ </entry>
+ <entry>
+ <key>Offer</key>
+ <value>Angebot</value>
+ </entry>
+ <entry>
+ <key>Offer number</key>
+ <value>Angebotsnummer</value>
+ </entry>
+ <entry>
+ <key>Show my activities</key>
+ <value>Meine Aktivitäten anzeigen</value>
+ </entry>
+ <entry>
+ <key>Probability</key>
+ <value>Wahrscheinlichkeit</value>
+ </entry>
+ <entry>
+ <key>Total VAT</key>
+ <value>Betrag MWST</value>
+ </entry>
+ <entry>
+ <key>The offer number already exists!</key>
+ <value>Die Angebotsnummer existiert bereits!</value>
+ </entry>
+ <entry>
+ <key>0 %</key>
+ </entry>
+ <entry>
+ <key>75 %</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>100 %</key>
+ </entry>
+ <entry>
+ <key>25 %</key>
+ </entry>
+ <entry>
+ <key>50 %</key>
+ </entry>
+ <entry>
+ <key>Won</key>
+ <value>Gewonnen</value>
+ </entry>
+ <entry>
+ <key>Checked</key>
+ <value>Geprüft</value>
+ </entry>
+ <entry>
+ <key>Sent</key>
+ <value>Versendet</value>
+ </entry>
+ <entry>
+ <key>Offeritems</key>
+ <value>Angebotsposten</value>
+ </entry>
+ <entry>
+ <key>Header text</key>
+ <value>Kopftext</value>
+ </entry>
+ <entry>
+ <key>Commodity group</key>
+ <value>Warengruppe</value>
+ </entry>
+ <entry>
+ <key>Footer text</key>
+ <value>Fußtext</value>
+ </entry>
+ <entry>
+ <key>Designation</key>
+ <value>Bezeichnung</value>
+ </entry>
+ <entry>
+ <key>Position</key>
+ <value>Position</value>
+ </entry>
+ <entry>
+ <key>Receipt</key>
+ <value>Beleg</value>
+ </entry>
+ <entry>
+ <key>Show all receipts</key>
+ <value>Alle Belege anzeigen</value>
+ </entry>
+ <entry>
+ <key>Optional</key>
+ <value>Optional</value>
+ </entry>
+ <entry>
+ <key>Article</key>
+ <value>Artikel</value>
+ </entry>
+ <entry>
+ <key>Show open salesprojects</key>
+ <value>Offene Vertriebsprojekte anzeigen</value>
+ </entry>
+ <entry>
+ <key>Receipt number</key>
+ <value>Belegnummer</value>
+ </entry>
+ <entry>
+ <key>Offeritem</key>
+ <value>Angebotsposten</value>
+ </entry>
+ <entry>
+ <key>Sum</key>
+ <value>Summe</value>
+ </entry>
+ <entry>
+ <key>Option4</key>
+ </entry>
+ <entry>
+ <key>Offers</key>
+ <value>Angebote</value>
+ </entry>
+ <entry>
+ <key>Option3</key>
+ </entry>
+ <entry>
+ <key>Option2</key>
+ </entry>
+ <entry>
+ <key>Option1</key>
+ </entry>
+ <entry>
+ <key>Countries</key>
+ <value>Länder</value>
+ </entry>
+ <entry>
+ <key>Options</key>
+ </entry>
+ <entry>
+ <key>Total gross</key>
+ <value>Betrag brutto</value>
+ </entry>
+ <entry>
+ <key>Minimal Count</key>
+ <value>Minimale Anzahl</value>
+ </entry>
+ <entry>
+ <key>Identical price list found!</key>
+ <value>Identische Preisliste gefunden!</value>
+ </entry>
+ <entry>
+ <key>Parts list</key>
+ <value>Stückliste</value>
+ </entry>
+ <entry>
+ <key>${THOUSAND_SHORT}</key>
+ <value>T</value>
+ </entry>
+ <entry>
+ <key>Deliver opinion</key>
+ <value>Stellungnahme abgeben</value>
+ </entry>
+ <entry>
+ <key>Presentation follow-up</key>
+ <value>Präsentationsnachbereitung</value>
+ </entry>
+ <entry>
+ <key>Waiting for requirements</key>
+ <value>Warten auf Anforderungen</value>
+ </entry>
+ <entry>
+ <key>Parent</key>
+ </entry>
+ <entry>
+ <key>${EURO_SIGN}</key>
+ <value>€</value>
+ </entry>
+ <entry>
+ <key>Planned</key>
+ <value>Geplant
+</value>
+ </entry>
+ <entry>
+ <key>Info</key>
+ <value>Info
+</value>
+ </entry>
+ <entry>
+ <key>${VOLUME_MONEY}</key>
+ <value>Wert
+</value>
+ </entry>
+ <entry>
+ <key>Milestones</key>
+ <value>Meilensteine
+</value>
+ </entry>
+ <entry>
+ <key>Milestone</key>
+ <value>Meilenstein
+</value>
+ </entry>
+ <entry>
+ <key>Excreted</key>
+ <value>Ausgeschieden
+</value>
+ </entry>
+ <entry>
+ <key>Reason</key>
+ <value>Begründung</value>
+ </entry>
+ <entry>
+ <key>Document</key>
+ <value>Dokument</value>
+ </entry>
+ <entry>
+ <key>Remark</key>
+ <value>Anmerkung</value>
+ </entry>
+ <entry>
+ <key>Competition</key>
+ <value>Mitbewerber</value>
+ </entry>
+ <entry>
+ <key>Forecast</key>
+ <value>Forecast</value>
+ </entry>
+ <entry>
+ <key>Show all products</key>
+ <value>Alle Produkte anzeigen</value>
+ </entry>
+ <entry>
+ <key>Role</key>
+ <value>Rolle</value>
+ </entry>
+ <entry>
+ <key>End date</key>
+ <value>Enddatum</value>
+ </entry>
+ <entry>
+ <key>Documents</key>
+ <value>Dokumente</value>
+ </entry>
+ <entry>
+ <key>New offer version</key>
+ <value>Neue Angebotsversion</value>
+ </entry>
+ <entry>
+ <key>Copy offer</key>
+ <value>Angebot kopieren</value>
+ </entry>
+ <entry>
+ <key>Vers. no.</key>
+ <value>Vers.-Nr.</value>
+ </entry>
+ <entry>
+ <key>Curr. purchase price</key>
+ <value>akt. EK-Preis</value>
+ </entry>
+ <entry>
+ <key>Industry 3</key>
+ <value>Branche 3</value>
+ </entry>
+ <entry>
+ <key>Industry 2</key>
+ <value>Branche 2</value>
+ </entry>
+ <entry>
+ <key>Show all offers</key>
+ <value>Alle Angebote anzeigen</value>
+ </entry>
+ <entry>
+ <key>Filetype</key>
+ <value>Dateityp</value>
+ </entry>
+ <entry>
+ <key>child of</key>
+ <value>Kind von</value>
+ </entry>
+ <entry>
+ <key>Products</key>
+ <value>Produkte</value>
+ </entry>
+ <entry>
+ <key>Filesize</key>
+ <value>Dateigrösse</value>
+ </entry>
+ <entry>
+ <key>Industry 1</key>
+ <value>Branche 1</value>
+ </entry>
+ <entry>
+ <key>Contracts</key>
+ <value>Verträge</value>
+ </entry>
+ <entry>
+ <key>Classification</key>
+ <value>Klassifizierung</value>
+ </entry>
+ <entry>
+ <key>Class A</key>
+ <value>Klasse A</value>
+ </entry>
+ <entry>
+ <key>Class C</key>
+ <value>Klasse C</value>
+ </entry>
+ <entry>
+ <key>Class B</key>
+ <value>Klasse B</value>
+ </entry>
+ <entry>
+ <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
+ <value>fieldOrTableName muss ein String oder ein Array aus 2 Strings sein.</value>
+ </entry>
+ <entry>
+ <key>High price strategy</key>
+ <value>Hochpreisstrategie</value>
+ </entry>
+ <entry>
+ <key>Show all sent receipts</key>
+ <value>Alle versendeten Belege anzeigen</value>
+ </entry>
+ <entry>
+ <key>Low price strategy</key>
+ <value>Niedrigpreisstrategie</value>
+ </entry>
+ <entry>
+ <key>Uid</key>
+ </entry>
+ <entry>
+ <key>in 6 Months</key>
+ </entry>
+ <entry>
+ <key>Sent offers</key>
+ <value>Versendete Angebote</value>
+ </entry>
+ <entry>
+ <key>Budget (Project)</key>
+ </entry>
+ <entry>
+ <key>responsible</key>
+ <value>verantwortlich</value>
+ </entry>
+ <entry>
+ <key>Show all Facebook posts of a user</key>
+ <value>Alle Facebook Beiträge eines Benutzers anzeigen</value>
+ </entry>
+ <entry>
+ <key>My Activities</key>
+ <value>Meine Aktivitäten</value>
+ </entry>
+ <entry>
+ <key>Combobox Value</key>
+ <value>Combobox-Wert</value>
+ </entry>
+ <entry>
+ <key>Salesprojects</key>
+ <value>Vertriebsprojekte</value>
+ </entry>
+ <entry>
+ <key>to</key>
+ </entry>
+ <entry>
+ <key>Open salesprojects</key>
+ <value>Offene Vertriebsprojekte</value>
+ </entry>
+ <entry>
+ <key>Other</key>
+ </entry>
+ <entry>
+ <key>Show all sent offers</key>
+ <value>Alle versendeten Angebote anzeigen</value>
+ </entry>
+ <entry>
+ <key>Show all Facebook posts of ADITO</key>
+ <value>Alle Facebook Beiträge von ADITO anzeigen</value>
+ </entry>
+ <entry>
+ <key>Individual</key>
+ </entry>
+ <entry>
+ <key>Organisation</key>
+ <value>Organisation</value>
+ </entry>
+ <entry>
+ <key>Base</key>
+ <value>Base</value>
+ </entry>
+ <entry>
+ <key>Receipts</key>
+ <value>Belege</value>
+ </entry>
+ <entry>
+ <key>Show all salesprojects</key>
+ <value>Alle Vertriebsprojekte anzeigen</value>
+ </entry>
+ <entry>
+ <key>Abomodel</key>
+ <value>Abomodell</value>
+ </entry>
+ <entry>
+ <key>Show all tweets of ADITO</key>
+ <value>Alle tweets von ADITO anzeigen</value>
+ </entry>
+ <entry>
+ <key>Show all tweets of a user</key>
+ <value>Alle tweets eines Benutzers anzeigen</value>
+ </entry>
+ <entry>
+ <key>in 12 Months</key>
+ </entry>
+ <entry>
+ <key>Standard / Individual</key>
+ </entry>
+ <entry>
+ <key>Please update the ${FORECAST_ENGLISH}.</key>
+ <value>Bitte den Forecast überprüfen.</value>
+ </entry>
+ <entry>
+ <key>Industry</key>
+ <value>Branche</value>
+ </entry>
+ <entry>
+ <key>From</key>
+ <value>Von</value>
+ </entry>
+ <entry>
+ <key>no Project planned</key>
+ </entry>
+ <entry>
+ <key>Strength 3</key>
+ <value>Stärke 3</value>
+ </entry>
+ <entry>
+ <key>Strength 1</key>
+ <value>Stärke 1</value>
+ </entry>
+ <entry>
+ <key>Strength 2</key>
+ <value>Stärke 2</value>
+ </entry>
+ <entry>
+ <key>Value</key>
+ <value>Wert</value>
+ </entry>
+ <entry>
+ <key>Weakness 1</key>
+ <value>Schwäche 1</value>
+ </entry>
+ <entry>
+ <key>Weakness 2</key>
+ <value>Schwäche 2</value>
+ </entry>
+ <entry>
+ <key>Weakness 3</key>
+ <value>Schwäche 3</value>
+ </entry>
+ <entry>
+ <key>Projectstart</key>
+ <value>Projektstart</value>
+ </entry>
+ <entry>
+ <key>no standard email office</key>
+ <value>keine Standard-E-Mail Büro vorhanden !</value>
+ </entry>
+ <entry>
+ <key>no valid format</key>
+ </entry>
+ <entry>
+ <key>Deliveryspecification</key>
+ <value>Lieferbedingung</value>
+ </entry>
+ <entry>
+ <key>Plus Salestax</key>
+ <value>zzgl.Summe UmSt</value>
+ </entry>
+ <entry>
+ <key>Pos.</key>
+ </entry>
+ <entry>
+ <key>ISO 3166-1 alpha-3</key>
+ </entry>
+ <entry>
+ <key>ISO 3166-1 alpha-2</key>
+ </entry>
+ <entry>
+ <key>0.00</key>
+ </entry>
+ <entry>
+ <key>Conditions of payment</key>
+ <value>Zahlungsbedingung</value>
+ </entry>
+ <entry>
+ <key>Relationship</key>
+ <value>Beziehung</value>
+ </entry>
+ <entry>
+ <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
+ <value>Für dieses Binärfeld ist nur ein Datensatz erlaubt.</value>
+ </entry>
+ <entry>
+ <key>Put Reciever Into To</key>
+ <value>Bitte einen Adressat in 'to' eintragen!</value>
+ </entry>
+ <entry>
+ <key>History</key>
+ <value>Verlauf</value>
+ </entry>
+ <entry>
+ <key>Total</key>
+ <value>Gesamt</value>
+ </entry>
+ <entry>
+ <key>Articlenumber</key>
+ <value>Artikelnummer</value>
+ </entry>
+ <entry>
+ <key>Native Name</key>
+ <value>Geburtsname</value>
+ </entry>
+ <entry>
+ <key>#,##0</key>
+ </entry>
+ <entry>
+ <key>Unitprice</key>
+ <value>Einzelpreis</value>
+ </entry>
+ <entry>
+ <key>Number</key>
+ <value>Nummer</value>
+ </entry>
+ <entry>
+ <key>Tasks</key>
+ <value>Aufgaben</value>
+ </entry>
+ <entry>
+ <key>New offer</key>
+ <value>Angebot erstellen</value>
+ </entry>
+ <entry>
+ <key>dd.MM.yyyy</key>
+ <value>dd.MM.yyyy</value>
+ </entry>
+ <entry>
+ <key>Articledescription</key>
+ <value>Artikelbezeichnung</value>
+ </entry>
+ <entry>
+ <key>Edit defaults</key>
+ <value>Standards anpassen</value>
+ </entry>
+ <entry>
+ <key>no valid mail-address format</key>
+ </entry>
+ <entry>
+ <key>Amount</key>
+ <value>Menge</value>
+ </entry>
+ <entry>
+ <key>#,##0.00</key>
+ </entry>
+ <entry>
+ <key>Latin Name</key>
+ <value>Lateinischer Name</value>
+ </entry>
+ <entry>
+ <key>Organisation name</key>
+ <value>Name der Organisation</value>
+ </entry>
+ <entry>
+ <key>Connection</key>
+ <value>Verknüpfung</value>
+ </entry>
+ <entry>
+ <key>standard email</key>
+ <value>Standard-Email</value>
+ </entry>
+ <entry>
+ <key>standard phone</key>
+ <value>Standard-Telefon</value>
+ </entry>
+ <entry>
+ <key>Creator</key>
+ <value>Ersteller</value>
+ </entry>
+ <entry>
+ <key>Timetracking</key>
+ <value>Zeiterfassung</value>
+ </entry>
+ <entry>
+ <key>Further informations</key>
+ <value>Weitere Informationen</value>
+ </entry>
+ <entry>
+ <key>Social</key>
+ <value>Sozial</value>
+ </entry>
+ <entry>
+ <key>Facebook Feed</key>
+ <value>Facebook Feed</value>
+ </entry>
+ <entry>
+ <key>Group1</key>
+ </entry>
+ <entry>
+ <key>Group2</key>
+ </entry>
+ <entry>
+ <key>Details</key>
+ <value>Details</value>
+ </entry>
+ <entry>
+ <key>Prices</key>
+ <value>Preise</value>
+ </entry>
+ <entry>
+ <key>Twitter</key>
+ <value>Twitter</value>
+ </entry>
+ <entry>
+ <key>Connections</key>
+ <value>Verknüpfungen</value>
+ </entry>
+ <entry>
+ <key>Object</key>
+ <value>Objekt</value>
+ </entry>
+ <entry>
+ <key>Attributes</key>
+ <value>Eigenschaften</value>
+ </entry>
+ <entry>
+ <key>Facebook</key>
+ <value>Facebook</value>
+ </entry>
+ <entry>
+ <key>Creation date</key>
+ <value>Erstellungsdatum</value>
+ </entry>
+ <entry>
+ <key>Year</key>
+ <value>Jahr</value>
+ </entry>
+ <entry>
+ <key>New receipt version</key>
+ <value>Neue Quittungsversion</value>
+ </entry>
+ <entry>
+ <key>Orderitems</key>
+ <value>Belegposten</value>
+ </entry>
+ <entry>
+ <key>Sent receipts</key>
+ <value>Versendete Belege</value>
+ </entry>
+ <entry>
+ <key>Copy receipt</key>
+ <value>Beleg kopieren</value>
+ </entry>
+ <entry>
+ <key>Orderitem</key>
+ </entry>
+ <entry>
+ <key>The order number already exists!</key>
+ </entry>
+ <entry>
+ <key>New activity</key>
+ <value>Neue Aktivität</value>
+ </entry>
+ <entry>
+ <key>July</key>
+ <value>Juli</value>
+ </entry>
+ <entry>
+ <key>ADITO Facebook Feed</key>
+ </entry>
+ <entry>
+ <key>ADITO Twitter Feed</key>
+ </entry>
+ <entry>
+ <key>June</key>
+ <value>Juni</value>
+ </entry>
+ <entry>
+ <key>October</key>
+ <value>Oktober</value>
+ </entry>
+ <entry>
+ <key>Take price</key>
+ <value>Preis übernehmen</value>
+ </entry>
+ <entry>
+ <key>Customer Base Sheet</key>
+ <value>Kundenstammblatt</value>
+ </entry>
+ <entry>
+ <key>Twitter Feed</key>
+ <value>Twitter Feed</value>
+ </entry>
+ <entry>
+ <key>November</key>
+ <value>November</value>
+ </entry>
+ <entry>
+ <key>December</key>
+ <value>Dezember</value>
+ </entry>
+ <entry>
+ <key>May</key>
+ <value>Mai</value>
+ </entry>
+ <entry>
+ <key>April</key>
+ <value>April</value>
+ </entry>
+ <entry>
+ <key>January</key>
+ <value>Januar</value>
+ </entry>
+ <entry>
+ <key>March</key>
+ <value>März</value>
+ </entry>
+ <entry>
+ <key>September</key>
+ <value>September</value>
+ </entry>
+ <entry>
+ <key>August</key>
+ <value>August</value>
+ </entry>
+ <entry>
+ <key>Category</key>
+ <value>Kategorie</value>
+ </entry>
+ <entry>
+ <key>February</key>
+ <value>Februar</value>
+ </entry>
+ <entry>
+ <key>asdf</key>
+ </entry>
+ <entry>
+ <key>maturity date</key>
+ <value>Fälligkeitsdatum</value>
+ </entry>
+ <entry>
+ <key>{$TASK_STATUS}</key>
+ <value>Status</value>
+ </entry>
+ <entry>
+ <key>Task</key>
+ <value>Aufgabe</value>
+ </entry>
+ <entry>
+ <key>subject</key>
+ <value>Betreff</value>
+ </entry>
+ <entry>
+ <key>{$TASK_REQUESTOR}</key>
+ <value>Anforderer</value>
+ </entry>
+ <entry>
+ <key>start date</key>
+ <value>Beginndatum</value>
+ </entry>
+ <entry>
+ <key>task number</key>
+ <value>Aufgabennummer</value>
+ </entry>
+ <entry>
+ <key>description</key>
+ <value>Beschreibung</value>
+ </entry>
+ <entry>
+ <key>priority</key>
+ <value>Priorität</value>
+ </entry>
+ <entry>
+ <key>{$TASK_EDITOR}</key>
+ <value>Bearbeiter</value>
+ </entry>
+ <entry>
+ <key>{$TASK_PRIORITY_HIGH}</key>
+ <value>hoch</value>
+ </entry>
+ <entry>
+ <key>Seite</key>
+ </entry>
+ <entry>
+ <key>Note</key>
+ <value>Notiz</value>
+ </entry>
+ <entry>
+ <key>Senden per E-Mail</key>
+ </entry>
+ <entry>
+ <key>Hauptdokument</key>
+ </entry>
+ <entry>
+ <key>Betreff</key>
+ </entry>
+ <entry>
+ <key>private</key>
+ <value>privat</value>
+ </entry>
+ <entry>
+ <key>title</key>
+ <value>Titel</value>
+ </entry>
+ <entry>
+ <key>von</key>
+ </entry>
+ <entry>
+ <key>{$TASK_PRIORITY_LOW}</key>
+ <value>niedrig</value>
+ </entry>
+ <entry>
+ <key>Nur Eigene anzeigen</key>
+ </entry>
+ <entry>
+ <key>{$TASK_PRIORITY_NORMAL}</key>
+ <value>normal</value>
+ </entry>
+ <entry>
+ <key>Beschreibung</key>
+ </entry>
+ <entry>
+ <key>Unit price</key>
+ <value>Einzelpreis</value>
+ </entry>
+ <entry>
+ <key>Firma</key>
+ </entry>
+ <entry>
+ <key>type</key>
+ <value>Typ</value>
+ </entry>
+ <entry>
+ <key>Benutzer</key>
+ </entry>
+ <entry>
+ <key>Schlüsselwort</key>
+ </entry>
+ <entry>
+ <key>{$TASK_PRIORITY_NONE}</key>
+ <value>keine</value>
+ </entry>
+ <entry>
+ <key>Directly responsible:</key>
+ <value>Ihr zuständiger Betreuer:</value>
+ </entry>
+ <entry>
+ <key>Termin</key>
+ </entry>
+ <entry>
+ <key>Vorschau</key>
+ </entry>
+ <entry>
+ <key>Angebot</key>
+ </entry>
+ <entry>
+ <key>Salesdashboard</key>
+ <value>Vertriebsdashboard</value>
+ </entry>
+ <entry>
+ <key>details</key>
+ <value>details</value>
+ </entry>
+ <entry>
+ <key>Kundenstammblatt</key>
+ </entry>
+ <entry>
+ <key>Person</key>
+ </entry>
+ <entry>
+ <key>Detail</key>
+ <value>Detail</value>
+ </entry>
+ <entry>
+ <key>Object 2</key>
+ <value>Objekt 2</value>
+ </entry>
+ <entry>
+ <key>Object 1</key>
+ <value>Objekt 1</value>
+ </entry>
+ <entry>
+ <key>Type 2</key>
+ <value>Typ 2</value>
+ </entry>
+ <entry>
+ <key>Type 1</key>
+ <value>Typ 1</value>
+ </entry>
+ <entry>
+ <key>Relations</key>
+ <value>Beziehungen</value>
+ </entry>
+ <entry>
+ <key>${FORECAST_ENGLISH}</key>
+ <value>Forecast</value>
+ </entry>
+ <entry>
+ <key>Title (original language)</key>
+ <value>Titel (ursprüngliche Sprache)</value>
+ </entry>
+ <entry>
+ <key>Attribute Relation</key>
+ <value>Eigenschaftsbeziehung</value>
+ </entry>
+ <entry>
+ <key>My Dashboard</key>
+ <value>My Dashboard</value>
+ </entry>
+ <entry>
+ <key>Attribute Usage</key>
+ <value>Eigenschaftsverwendung</value>
+ </entry>
+ <entry>
+ <key>Beziehung</key>
+ </entry>
+ <entry>
+ <key>Key</key>
+ </entry>
+ <entry>
+ <key>Attribute</key>
+ <value>Eigenschaft</value>
+ </entry>
+ <entry>
+ <key>Container</key>
+ </entry>
+ <entry>
+ <key>Administration</key>
+ <value>Administration</value>
+ </entry>
+ <entry>
+ <key>Keyword</key>
+ <value>Schlüsselwort</value>
+ </entry>
+ <entry>
+ <key>Sorting</key>
+ <value>Sortierung</value>
+ </entry>
+ <entry>
+ <key>jdito</key>
+ </entry>
+ <entry>
+ <key>Context id</key>
+ </entry>
+ <entry>
+ <key>Context name</key>
+ </entry>
+ <entry>
+ <key>Cambodia</key>
+ <value>Kambodscha</value>
+ </entry>
+ <entry>
+ <key>Resigned</key>
+ <value>gekündigt</value>
+ </entry>
+ <entry>
+ <key>Customer</key>
+ <value>Kunde</value>
+ </entry>
+ <entry>
+ <key>Outgoing</key>
+ <value>ausgehend</value>
+ </entry>
+ <entry>
+ <key>Paraguay</key>
+ <value>Paraguay</value>
+ </entry>
+ <entry>
+ <key>New attribute</key>
+ <value>Neues Attribut</value>
+ </entry>
+ <entry>
+ <key>Solomon Islands</key>
+ <value>Salomon-Inseln</value>
+ </entry>
+ <entry>
+ <key>Montserrat</key>
+ <value>Montserrat</value>
+ </entry>
+ <entry>
+ <key>Guadeloupe</key>
+ <value>Guadeloupe</value>
+ </entry>
+ <entry>
+ <key>Product_technic</key>
+ <value>Produkt_Technik</value>
+ </entry>
+ <entry>
+ <key>Moldova (Republic of)</key>
+ <value>Republik Moldau</value>
+ </entry>
+ <entry>
+ <key>Seychelles</key>
+ <value>Seychellen</value>
+ </entry>
+ <entry>
+ <key>Canadian dollar</key>
+ <value>Kanadischer Dollar</value>
+ </entry>
+ <entry>
+ <key>Bahrain</key>
+ <value>Bahrain</value>
+ </entry>
+ <entry>
+ <key>Comoros</key>
+ <value>Komoren</value>
+ </entry>
+ <entry>
+ <key>Faroe Islands</key>
+ <value>Färöer Inseln</value>
+ </entry>
+ <entry>
+ <key>Finland</key>
+ <value>Finnland</value>
+ </entry>
+ <entry>
+ <key>Project_duration</key>
+ <value>Projekt_Dauer</value>
+ </entry>
+ <entry>
+ <key>Company_internationality</key>
+ <value>Unternehmen_Internationalität</value>
+ </entry>
+ <entry>
+ <key>Eritrea</key>
+ <value>Eritrea</value>
+ </entry>
+ <entry>
+ <key>Puerto Rico</key>
+ <value>Puerto Rico</value>
+ </entry>
+ <entry>
+ <key>Viet Nam</key>
+ <value>Vietnam</value>
+ </entry>
+ <entry>
+ <key>Libya</key>
+ <value>Libyen</value>
+ </entry>
+ <entry>
+ <key>French</key>
+ <value>Französisch</value>
+ </entry>
+ <entry>
+ <key>Cocos (Keeling) Islands</key>
+ <value>Kokosinseln (Keelinginseln)</value>
+ </entry>
+ <entry>
+ <key>Saint Helena, Ascension and Tristan da Cunha</key>
+ <value>St. Helena, Himmelfahrt und Tristan da Cunha</value>
+ </entry>
+ <entry>
+ <key>Liechtenstein</key>
+ <value>Liechtenstein</value>
+ </entry>
+ <entry>
+ <key>Product_functionality</key>
+ <value>Produkt_Funktionalität</value>
+ </entry>
+ <entry>
+ <key>New appointment</key>
+ <value>Neuer Termin</value>
+ </entry>
+ <entry>
+ <key>Bulgaria</key>
+ <value>Bulgarien</value>
+ </entry>
+ <entry>
+ <key>Jordan</key>
+ <value>Jordan</value>
+ </entry>
+ <entry>
+ <key>Côte d'Ivoire</key>
+ <value>Elfenbeinküste</value>
+ </entry>
+ <entry>
+ <key>United Arab Emirates</key>
+ <value>Vereinigte Arabische Emirate</value>
+ </entry>
+ <entry>
+ <key>Kenya</key>
+ <value>Kenia</value>
+ </entry>
+ <entry>
+ <key>None, individual count</key>
+ <value>keiner, Einzelberechnung</value>
+ </entry>
+ <entry>
+ <key>French Polynesia</key>
+ <value>Französisch Polynesien</value>
+ </entry>
+ <entry>
+ <key>Djibouti</key>
+ <value>Dschibuti</value>
+ </entry>
+ <entry>
+ <key>Cuba</key>
+ <value>Kuba</value>
+ </entry>
+ <entry>
+ <key>Saint Lucia</key>
+ <value>St. Lucia</value>
+ </entry>
+ <entry>
+ <key>Mayotte</key>
+ <value>Mayotte</value>
+ </entry>
+ <entry>
+ <key>Israel</key>
+ <value>Israel</value>
+ </entry>
+ <entry>
+ <key>San Marino</key>
+ <value>San Marino</value>
+ </entry>
+ <entry>
+ <key>Tajikistan</key>
+ <value>Tadschikistan</value>
+ </entry>
+ <entry>
+ <key>Warehouse 2</key>
+ <value>Lager 2</value>
+ </entry>
+ <entry>
+ <key>Warehouse 1</key>
+ <value>Lager 1</value>
+ </entry>
+ <entry>
+ <key>Gibraltar</key>
+ <value>Gibraltar</value>
+ </entry>
+ <entry>
+ <key>Warehouse 3</key>
+ <value>Lager 3</value>
+ </entry>
+ <entry>
+ <key>Cyprus</key>
+ <value>Zypern</value>
+ </entry>
+ <entry>
+ <key>Semiannually</key>
+ <value>halbjährlich</value>
+ </entry>
+ <entry>
+ <key>Northern Mariana Islands</key>
+ <value>Nördliche Marianneninseln</value>
+ </entry>
+ <entry>
+ <key>Malaysia</key>
+ <value>Malaysia</value>
+ </entry>
+ <entry>
+ <key>Armenia</key>
+ <value>Armenien</value>
+ </entry>
+ <entry>
+ <key>Brazil</key>
+ <value>Brasilien</value>
+ </entry>
+ <entry>
+ <key>Turks and Caicos Islands</key>
+ <value>Turks- und Caicosinseln</value>
+ </entry>
+ <entry>
+ <key>Cabo Verde</key>
+ <value>Cabo Verde</value>
+ </entry>
+ <entry>
+ <key>Ecuador</key>
+ <value>Ecuador</value>
+ </entry>
+ <entry>
+ <key>Iran (Islamic Republic of)</key>
+ <value>Iran (Islamische Republik)</value>
+ </entry>
+ <entry>
+ <key>Decision maker</key>
+ <value>Entscheider</value>
+ </entry>
+ <entry>
+ <key>Lao People's Democratic Republic</key>
+ <value>Demokratische Volksrepublik Laos</value>
+ </entry>
+ <entry>
+ <key>Maintenance contract</key>
+ <value>Wartungsvertrag</value>
+ </entry>
+ <entry>
+ <key>United States Minor Outlying Islands</key>
+ <value>Kleinere abgelegene Inseln der Vereinigten Staaten</value>
+ </entry>
+ <entry>
+ <key>Italy</key>
+ <value>Italien</value>
+ </entry>
+ <entry>
+ <key>${ORGTYPE_OTHER}</key>
+ <value>Sonstiges</value>
+ </entry>
+ <entry>
+ <key>Haiti</key>
+ <value>Haiti</value>
+ </entry>
+ <entry>
+ <key>Afghanistan</key>
+ <value>Afghanistan</value>
+ </entry>
+ <entry>
+ <key>Russian Federation</key>
+ <value>Russische Föderation</value>
+ </entry>
+ <entry>
+ <key>waiting</key>
+ <value>warten auf Rückmeldung</value>
+ </entry>
+ <entry>
+ <key>American Samoa</key>
+ <value>Amerikanischen Samoa-Inseln</value>
+ </entry>
+ <entry>
+ <key>Korea (Democratic People's Republic of)</key>
+ <value>Korea, Demokratische Volksrepublik)</value>
+ </entry>
+ <entry>
+ <key>United States dollar</key>
+ <value>US-Dollar</value>
+ </entry>
+ <entry>
+ <key>Superordinate Attribute</key>
+ <value>Ãœbergeordnete Eigenschaft</value>
+ </entry>
+ <entry>
+ <key>Kyrgyzstan</key>
+ <value>Kirgisistan</value>
+ </entry>
+ <entry>
+ <key>Togo</key>
+ <value>Togo</value>
+ </entry>
+ <entry>
+ <key>Other_existing Customer</key>
+ <value>Sonstiges_Bestandskunde</value>
+ </entry>
+ <entry>
+ <key>Uzbekistan</key>
+ <value>Usbekistan</value>
+ </entry>
+ <entry>
+ <key>Dominica</key>
+ <value>Dominica</value>
+ </entry>
+ <entry>
+ <key>Benin</key>
+ <value>Benin</value>
+ </entry>
+ <entry>
+ <key>Virgin Islands (British)</key>
+ <value>Virgin Inseln, Britisch)</value>
+ </entry>
+ <entry>
+ <key>Sudan</key>
+ <value>Sudan</value>
+ </entry>
+ <entry>
+ <key>Portugal</key>
+ <value>Portugal</value>
+ </entry>
+ <entry>
+ <key>Grenada</key>
+ <value>Grenada</value>
+ </entry>
+ <entry>
+ <key>Latvia</key>
+ <value>Lettland</value>
+ </entry>
+ <entry>
+ <key>Mongolia</key>
+ <value>Mongolei</value>
+ </entry>
+ <entry>
+ <key>Morocco</key>
+ <value>Marokko</value>
+ </entry>
+ <entry>
+ <key>Guatemala</key>
+ <value>Guatemala</value>
+ </entry>
+ <entry>
+ <key>Pieces</key>
+ <value>Stück</value>
+ </entry>
+ <entry>
+ <key>Heard Island and McDonald Islands</key>
+ <value>Heard Island und McDonald Islands</value>
+ </entry>
+ <entry>
+ <key>Incoming</key>
+ <value>eingehend</value>
+ </entry>
+ <entry>
+ <key>Ghana</key>
+ <value>Ghana</value>
+ </entry>
+ <entry>
+ <key>Holy See</key>
+ <value>Heiliger Stuhl</value>
+ </entry>
+ <entry>
+ <key>India</key>
+ <value>Indien</value>
+ </entry>
+ <entry>
+ <key>Canada</key>
+ <value>Kanada</value>
+ </entry>
+ <entry>
+ <key>Maldives</key>
+ <value>Malediven</value>
+ </entry>
+ <entry>
+ <key>Service contract</key>
+ <value>Werksvertrag</value>
+ </entry>
+ <entry>
+ <key>Taiwan</key>
+ <value>Taiwan</value>
+ </entry>
+ <entry>
+ <key>Central African Republic</key>
+ <value>Zentralafrikanische Republik</value>
+ </entry>
+ <entry>
+ <key>Fiji</key>
+ <value>Fidschi</value>
+ </entry>
+ <entry>
+ <key>Guinea</key>
+ <value>Guinea</value>
+ </entry>
+ <entry>
+ <key>Somalia</key>
+ <value>Somalia</value>
+ </entry>
+ <entry>
+ <key>Sao Tome and Principe</key>
+ <value>Sao Tome und Principe</value>
+ </entry>
+ <entry>
+ <key>United Kingdom of Great Britain and Northern Ireland</key>
+ <value>Vereinigtes Königreich Großbritannien und Nordirland</value>
+ </entry>
+ <entry>
+ <key>Equatorial Guinea</key>
+ <value>Äquatorialguinea</value>
+ </entry>
+ <entry>
+ <key>Kiribati</key>
+ <value>Kiribati</value>
+ </entry>
+ <entry>
+ <key>Costa Rica</key>
+ <value>Costa Rica</value>
+ </entry>
+ <entry>
+ <key>Supplier</key>
+ <value>Lieferant</value>
+ </entry>
+ <entry>
+ <key>Nigeria</key>
+ <value>Nigeria</value>
+ </entry>
+ <entry>
+ <key>Syrian Arab Republic</key>
+ <value>Syrische Arabische Republik</value>
+ </entry>
+ <entry>
+ <key>Timor-Leste</key>
+ <value>Timor-Leste</value>
+ </entry>
+ <entry>
+ <key>Product_mobile use</key>
+ <value>Produkt_Mobiler Einsatz</value>
+ </entry>
+ <entry>
+ <key>Samoa</key>
+ <value>Samoa</value>
+ </entry>
+ <entry>
+ <key>Spain</key>
+ <value>Spanien</value>
+ </entry>
+ <entry>
+ <key>Palau</key>
+ <value>Palau</value>
+ </entry>
+ <entry>
+ <key>Prospect</key>
+ <value>Potenzieller Kunde</value>
+ </entry>
+ <entry>
+ <key>Estonia</key>
+ <value>Estland</value>
+ </entry>
+ <entry>
+ <key>Not signed yet</key>
+ <value>noch nicht unterschrieben</value>
+ </entry>
+ <entry>
+ <key>Niue</key>
+ <value>Niue</value>
+ </entry>
+ <entry>
+ <key>Mozambique</key>
+ <value>Mosambik</value>
+ </entry>
+ <entry>
+ <key>El Salvador</key>
+ <value>El Salvador</value>
+ </entry>
+ <entry>
+ <key>Guam</key>
+ <value>Guam</value>
+ </entry>
+ <entry>
+ <key>Lesotho</key>
+ <value>Lesotho</value>
+ </entry>
+ <entry>
+ <key>Tonga</key>
+ <value>Tonga</value>
+ </entry>
+ <entry>
+ <key>Western Sahara</key>
+ <value>Westsahara</value>
+ </entry>
+ <entry>
+ <key>new</key>
+ <value>neu</value>
+ </entry>
+ <entry>
+ <key>Adviser</key>
+ <value>Berater</value>
+ </entry>
+ <entry>
+ <key>Company_size</key>
+ <value>Unternehmen_Größe</value>
+ </entry>
+ <entry>
+ <key>Republic of Kosovo</key>
+ <value>Republik Kosovo</value>
+ </entry>
+ <entry>
+ <key>South Sudan</key>
+ <value>Südsudan</value>
+ </entry>
+ <entry>
+ <key>Mauritius</key>
+ <value>Mauritius</value>
+ </entry>
+ <entry>
+ <key>Bouvet Island</key>
+ <value>Bouvet Island</value>
+ </entry>
+ <entry>
+ <key>Bolivia (Plurinational State of)</key>
+ <value>Bolivien (plurinationaler Staat)</value>
+ </entry>
+ <entry>
+ <key>Norfolk Island</key>
+ <value>Norfolkinsel</value>
+ </entry>
+ <entry>
+ <key>Sint Maarten (Dutch part)</key>
+ <value>Sint Maarten (niederländischer Teil)</value>
+ </entry>
+ <entry>
+ <key>Micronesia (Federated States of)</key>
+ <value>Mikronesien (Föderierte Staaten von)</value>
+ </entry>
+ <entry>
+ <key>Product_industry knowhow</key>
+ <value>Produkt_Branchen KnowHow</value>
+ </entry>
+ <entry>
+ <key>Progress</key>
+ <value>Fortschritt</value>
+ </entry>
+ <entry>
+ <key>United States of America</key>
+ <value>Vereinigte Staaten von Amerika</value>
+ </entry>
+ <entry>
+ <key>In review</key>
+ <value>zur Prüfung</value>
+ </entry>
+ <entry>
+ <key>Address purchase</key>
+ <value>Adresserwerb</value>
+ </entry>
+ <entry>
+ <key>Malta</key>
+ <value>Malta</value>
+ </entry>
+ <entry>
+ <key>Project_volume</key>
+ <value>Projekt_Volumen</value>
+ </entry>
+ <entry>
+ <key>Ireland</key>
+ <value>Irland</value>
+ </entry>
+ <entry>
+ <key>Inactive</key>
+ <value>Inaktiv</value>
+ </entry>
+ <entry>
+ <key>France</key>
+ <value>Frankreich</value>
+ </entry>
+ <entry>
+ <key>Lithuania</key>
+ <value>Litauen</value>
+ </entry>
+ <entry>
+ <key>Korea (Republic of)</key>
+ <value>Korea (Republik)</value>
+ </entry>
+ <entry>
+ <key>${PRICELIST_SERVICE}</key>
+ <value>Service</value>
+ </entry>
+ <entry>
+ <key>English</key>
+ <value>Englisch</value>
+ </entry>
+ <entry>
+ <key>Nicaragua</key>
+ <value>Nicaragua</value>
+ </entry>
+ <entry>
+ <key>Macao</key>
+ <value>Macao</value>
+ </entry>
+ <entry>
+ <key>Mexico</key>
+ <value>Mexiko</value>
+ </entry>
+ <entry>
+ <key>Uganda</key>
+ <value>Uganda</value>
+ </entry>
+ <entry>
+ <key>Suriname</key>
+ <value>Suriname</value>
+ </entry>
+ <entry>
+ <key>Greenland</key>
+ <value>Grönland</value>
+ </entry>
+ <entry>
+ <key>Papua New Guinea</key>
+ <value>Papua Neu-Guinea</value>
+ </entry>
+ <entry>
+ <key>Kazakhstan</key>
+ <value>Kasachstan</value>
+ </entry>
+ <entry>
+ <key>Ã…land Islands</key>
+ <value>Ã…landinseln</value>
+ </entry>
+ <entry>
+ <key>Bahamas</key>
+ <value>Bahamas</value>
+ </entry>
+ <entry>
+ <key>Mali</key>
+ <value>Mali</value>
+ </entry>
+ <entry>
+ <key>Marshall Islands</key>
+ <value>Marshallinseln</value>
+ </entry>
+ <entry>
+ <key>Panama</key>
+ <value>Panama</value>
+ </entry>
+ <entry>
+ <key>Bonaire, Sint Eustatius and Saba</key>
+ <value>Bonaire, Sint Eustatius und Saba</value>
+ </entry>
+ <entry>
+ <key>Tanzania, United Republic of</key>
+ <value>Tansania, Vereinigte Republik</value>
+ </entry>
+ <entry>
+ <key>Argentina</key>
+ <value>Argentinien</value>
+ </entry>
+ <entry>
+ <key>Belize</key>
+ <value>Belize</value>
+ </entry>
+ <entry>
+ <key>Zambia</key>
+ <value>Sambia</value>
+ </entry>
+ <entry>
+ <key>Congo</key>
+ <value>Kongo</value>
+ </entry>
+ <entry>
+ <key>Guinea-Bissau</key>
+ <value>Guinea-Bissau</value>
+ </entry>
+ <entry>
+ <key>Namibia</key>
+ <value>Namibia</value>
+ </entry>
+ <entry>
+ <key>External sales manager</key>
+ <value>Externer Verkaufsleiter</value>
+ </entry>
+ <entry>
+ <key>Georgia</key>
+ <value>Georgia</value>
+ </entry>
+ <entry>
+ <key>Saint Kitts and Nevis</key>
+ <value>St. Kitts und Nevis</value>
+ </entry>
+ <entry>
+ <key>Yemen</key>
+ <value>Jemen</value>
+ </entry>
+ <entry>
+ <key>Aruba</key>
+ <value>Aruba</value>
+ </entry>
+ <entry>
+ <key>Madagascar</key>
+ <value>Madagaskar</value>
+ </entry>
+ <entry>
+ <key>Valid, unlimited</key>
+ <value>gültig, unbefristet</value>
+ </entry>
+ <entry>
+ <key>Svalbard and Jan Mayen</key>
+ <value>Svalbard und Jan Mayen</value>
+ </entry>
+ <entry>
+ <key>South Georgia and the South Sandwich Islands</key>
+ <value>Süd-Georgien und die südlichen Sandwich-Inseln</value>
+ </entry>
+ <entry>
+ <key>Sweden</key>
+ <value>Schweden</value>
+ </entry>
+ <entry>
+ <key>Malawi</key>
+ <value>Malawi</value>
+ </entry>
+ <entry>
+ <key>Andorra</key>
+ <value>Andorra</value>
+ </entry>
+ <entry>
+ <key>Poland</key>
+ <value>Polen</value>
+ </entry>
+ <entry>
+ <key>Tunisia</key>
+ <value>Tunesien</value>
+ </entry>
+ <entry>
+ <key>Tuvalu</key>
+ <value>Tuvalu</value>
+ </entry>
+ <entry>
+ <key>Lebanon</key>
+ <value>Libanon</value>
+ </entry>
+ <entry>
+ <key>Azerbaijan</key>
+ <value>Aserbaidschan</value>
+ </entry>
+ <entry>
+ <key>Czech Republic</key>
+ <value>Tschechische Republik</value>
+ </entry>
+ <entry>
+ <key>Mauritania</key>
+ <value>Mauretanien</value>
+ </entry>
+ <entry>
+ <key>Guernsey</key>
+ <value>Guernsey</value>
+ </entry>
+ <entry>
+ <key>Kgs</key>
+ <value>Kg</value>
+ </entry>
+ <entry>
+ <key>Australia</key>
+ <value>Australien</value>
+ </entry>
+ <entry>
+ <key>Myanmar</key>
+ <value>Myanmar</value>
+ </entry>
+ <entry>
+ <key>Cameroon</key>
+ <value>Kamerun</value>
+ </entry>
+ <entry>
+ <key>Iceland</key>
+ <value>Island</value>
+ </entry>
+ <entry>
+ <key>Oman</key>
+ <value>Oman</value>
+ </entry>
+ <entry>
+ <key>Gabon</key>
+ <value>Gabun</value>
+ </entry>
+ <entry>
+ <key>Luxembourg</key>
+ <value>Luxemburg</value>
+ </entry>
+ <entry>
+ <key>Algeria</key>
+ <value>Algerien</value>
+ </entry>
+ <entry>
+ <key>Jersey</key>
+ <value>Jersey</value>
+ </entry>
+ <entry>
+ <key>Slovenia</key>
+ <value>Slowenien</value>
+ </entry>
+ <entry>
+ <key>Antigua and Barbuda</key>
+ <value>Antigua und Barbuda</value>
+ </entry>
+ <entry>
+ <key>Annually</key>
+ <value>jährlich</value>
+ </entry>
+ <entry>
+ <key>Colombia</key>
+ <value>Kolumbien</value>
+ </entry>
+ <entry>
+ <key>Project_reference</key>
+ <value>Projekt_Referenz</value>
+ </entry>
+ <entry>
+ <key>Vanuatu</key>
+ <value>Vanuatu</value>
+ </entry>
+ <entry>
+ <key>Valid, limited</key>
+ <value>gültig, befristet</value>
+ </entry>
+ <entry>
+ <key>Honduras</key>
+ <value>Honduras</value>
+ </entry>
+ <entry>
+ <key>Antarctica</key>
+ <value>Antarktis</value>
+ </entry>
+ <entry>
+ <key>Nauru</key>
+ <value>Nauru</value>
+ </entry>
+ <entry>
+ <key>Burundi</key>
+ <value>Burundi</value>
+ </entry>
+ <entry>
+ <key>Project manager</key>
+ <value>Projektmanager</value>
+ </entry>
+ <entry>
+ <key>Singapore</key>
+ <value>Singapur</value>
+ </entry>
+ <entry>
+ <key>French Guiana</key>
+ <value>Französisch-Guayana</value>
+ </entry>
+ <entry>
+ <key>Hours</key>
+ <value>Stunden</value>
+ </entry>
+ <entry>
+ <key>Special price list</key>
+ <value>Sonderpreisliste</value>
+ </entry>
+ <entry>
+ <key>Christmas Island</key>
+ <value>Weihnachtsinsel</value>
+ </entry>
+ <entry>
+ <key>Netherlands</key>
+ <value>Niederlande</value>
+ </entry>
+ <entry>
+ <key>Product_flexibility</key>
+ <value>Produkt_Flexibilität</value>
+ </entry>
+ <entry>
+ <key>China</key>
+ <value>China</value>
+ </entry>
+ <entry>
+ <key>Martinique</key>
+ <value>Martinique</value>
+ </entry>
+ <entry>
+ <key>Own website</key>
+ <value>Eigene Website</value>
+ </entry>
+ <entry>
+ <key>Saint Pierre and Miquelon</key>
+ <value>Saint Pierre und Miquelon</value>
+ </entry>
+ <entry>
+ <key>Bhutan</key>
+ <value>Bhutan</value>
+ </entry>
+ <entry>
+ <key>Romania</key>
+ <value>Rumänien</value>
+ </entry>
+ <entry>
+ <key>Falkland Islands (Malvinas)</key>
+ <value>Falklandinseln (Malvinas)</value>
+ </entry>
+ <entry>
+ <key>Philippines</key>
+ <value>Philippinen</value>
+ </entry>
+ <entry>
+ <key>Pitcairn</key>
+ <value>Pitcairn</value>
+ </entry>
+ <entry>
+ <key>Zimbabwe</key>
+ <value>Zimbabwe</value>
+ </entry>
+ <entry>
+ <key>British Indian Ocean Territory</key>
+ <value>Britisches Territorium des Indischen Ozeans</value>
+ </entry>
+ <entry>
+ <key>Montenegro</key>
+ <value>Montenegro</value>
+ </entry>
+ <entry>
+ <key>Quarterly</key>
+ <value>vierteljährlich</value>
+ </entry>
+ <entry>
+ <key>Indonesia</key>
+ <value>Indonesien</value>
+ </entry>
+ <entry>
+ <key>Module</key>
+ <value>Modul</value>
+ </entry>
+ <entry>
+ <key>Angola</key>
+ <value>Angola</value>
+ </entry>
+ <entry>
+ <key>Internal</key>
+ <value>intern</value>
+ </entry>
+ <entry>
+ <key>Brunei Darussalam</key>
+ <value>Brunei Darussalam</value>
+ </entry>
+ <entry>
+ <key>New Caledonia</key>
+ <value>Neu-Kaledonien</value>
+ </entry>
+ <entry>
+ <key>Cayman Islands</key>
+ <value>Cayman Inseln</value>
+ </entry>
+ <entry>
+ <key>Congo (Democratic Republic of the)</key>
+ <value>Kongo (Demokratische Republik)</value>
+ </entry>
+ <entry>
+ <key>Greece</key>
+ <value>Griechenland</value>
+ </entry>
+ <entry>
+ <key>Guyana</key>
+ <value>Guyana</value>
+ </entry>
+ <entry>
+ <key>Project assistant</key>
+ <value>Projektassistent</value>
+ </entry>
+ <entry>
+ <key>Iraq</key>
+ <value>Irak</value>
+ </entry>
+ <entry>
+ <key>Chile</key>
+ <value>Chile</value>
+ </entry>
+ <entry>
+ <key>Nepal</key>
+ <value>Nepal</value>
+ </entry>
+ <entry>
+ <key>${PRICELIST_DEFAULT}</key>
+ <value>Standard</value>
+ </entry>
+ <entry>
+ <key>Customer recommendation</key>
+ <value>Kundenempfehlung</value>
+ </entry>
+ <entry>
+ <key>Other_unknown</key>
+ <value>Sonstiges_Unbekannt</value>
+ </entry>
+ <entry>
+ <key>Isle of Man</key>
+ <value>Isle of Man</value>
+ </entry>
+ <entry>
+ <key>Ukraine</key>
+ <value>Ukraine</value>
+ </entry>
+ <entry>
+ <key>Curaçao</key>
+ <value>Curacao</value>
+ </entry>
+ <entry>
+ <key>Anguilla</key>
+ <value>Anguilla</value>
+ </entry>
+ <entry>
+ <key>Euro</key>
+ <value>Euro</value>
+ </entry>
+ <entry>
+ <key>Product_GUI</key>
+ <value>Produkt_GUI</value>
+ </entry>
+ <entry>
+ <key>${GENDER_OTHER}</key>
+ <value>Divers</value>
+ </entry>
+ <entry>
+ <key>Touchpoint</key>
+ <value>Kontaktpunkt</value>
+ </entry>
+ <entry>
+ <key>Turkey</key>
+ <value>Türkei</value>
+ </entry>
+ <entry>
+ <key>Belgium</key>
+ <value>Belgien</value>
+ </entry>
+ <entry>
+ <key>South Africa</key>
+ <value>Südafrika</value>
+ </entry>
+ <entry>
+ <key>Trinidad and Tobago</key>
+ <value>Trinidad und Tobago</value>
+ </entry>
+ <entry>
+ <key>Bermuda</key>
+ <value>Bermuda</value>
+ </entry>
+ <entry>
+ <key>Jamaica</key>
+ <value>Jamaika</value>
+ </entry>
+ <entry>
+ <key>Peru</key>
+ <value>Peru</value>
+ </entry>
+ <entry>
+ <key>Turkmenistan</key>
+ <value>Turkmenistan</value>
+ </entry>
+ <entry>
+ <key>Venezuela (Bolivarian Republic of)</key>
+ <value>Venezuela (Bolivarische Republik)</value>
+ </entry>
+ <entry>
+ <key>Tokelau</key>
+ <value>Tokelau</value>
+ </entry>
+ <entry>
+ <key>Hong Kong</key>
+ <value>Hongkong</value>
+ </entry>
+ <entry>
+ <key>Chad</key>
+ <value>Tschad</value>
+ </entry>
+ <entry>
+ <key>German</key>
+ <value>Deutsch</value>
+ </entry>
+ <entry>
+ <key>Thailand</key>
+ <value>Thailand</value>
+ </entry>
+ <entry>
+ <key>in process</key>
+ <value>in Bearbeitung</value>
+ </entry>
+ <entry>
+ <key>Saint Martin (French part)</key>
+ <value>Saint Martin (französischer Teil)</value>
+ </entry>
+ <entry>
+ <key>Kuwait</key>
+ <value>Kuwait</value>
+ </entry>
+ <entry>
+ <key>Palestine, State of</key>
+ <value>Palästina, Bundesstaat</value>
+ </entry>
+ <entry>
+ <key>Croatia</key>
+ <value>Kroatien</value>
+ </entry>
+ <entry>
+ <key>Cook Islands</key>
+ <value>Cookinseln</value>
+ </entry>
+ <entry>
+ <key>Fair</key>
+ <value>Messe</value>
+ </entry>
+ <entry>
+ <key>Sri Lanka</key>
+ <value>Sri Lanka</value>
+ </entry>
+ <entry>
+ <key>Uruguay</key>
+ <value>Uruguay</value>
+ </entry>
+ <entry>
+ <key>Liberia</key>
+ <value>Liberia</value>
+ </entry>
+ <entry>
+ <key>Burkina Faso</key>
+ <value>Burkina Faso</value>
+ </entry>
+ <entry>
+ <key>Swiss franc</key>
+ <value>Schweizerfranken</value>
+ </entry>
+ <entry>
+ <key>Swaziland</key>
+ <value>Swasiland</value>
+ </entry>
+ <entry>
+ <key>ended</key>
+ <value>abgeschlossen</value>
+ </entry>
+ <entry>
+ <key>Saint Barthélemy</key>
+ <value>Saint Barthélemy</value>
+ </entry>
+ <entry>
+ <key>Wallis and Futuna</key>
+ <value>Wallis und Futuna</value>
+ </entry>
+ <entry>
+ <key>Company_industry knowhow</key>
+ <value>Unternehmen_Branchen KnowHow</value>
+ </entry>
+ <entry>
+ <key>Monaco</key>
+ <value>Monaco</value>
+ </entry>
+ <entry>
+ <key>Spanish</key>
+ <value>Spanisch</value>
+ </entry>
+ <entry>
+ <key>Hungary</key>
+ <value>Ungarn</value>
+ </entry>
+ <entry>
+ <key>Réunion</key>
+ <value>Réunion</value>
+ </entry>
+ <entry>
+ <key>Belarus</key>
+ <value>Weißrussland</value>
+ </entry>
+ <entry>
+ <key>Albania</key>
+ <value>Albanien</value>
+ </entry>
+ <entry>
+ <key>Internal sales manager</key>
+ <value>Interner Vertrieb</value>
+ </entry>
+ <entry>
+ <key>Virgin Islands (U.S.)</key>
+ <value>Jungferninseln (US)</value>
+ </entry>
+ <entry>
+ <key>New Zealand</key>
+ <value>Neuseeland</value>
+ </entry>
+ <entry>
+ <key>Senegal</key>
+ <value>Senegal</value>
+ </entry>
+ <entry>
+ <key>Ethiopia</key>
+ <value>Äthiopien</value>
+ </entry>
+ <entry>
+ <key>Macedonia (the former Yugoslav Republic of)</key>
+ <value>Mazedonien (ehemalige jugoslawische Republik)</value>
+ </entry>
+ <entry>
+ <key>Egypt</key>
+ <value>Ägypten</value>
+ </entry>
+ <entry>
+ <key>Sierra Leone</key>
+ <value>Sierra Leone</value>
+ </entry>
+ <entry>
+ <key>Saudi Arabia</key>
+ <value>Saudi Arabien</value>
+ </entry>
+ <entry>
+ <key>Pakistan</key>
+ <value>Pakistan</value>
+ </entry>
+ <entry>
+ <key>Gambia</key>
+ <value>Gambia</value>
+ </entry>
+ <entry>
+ <key>Qatar</key>
+ <value>Katar</value>
+ </entry>
+ <entry>
+ <key>Slovakia</key>
+ <value>Slowakei</value>
+ </entry>
+ <entry>
+ <key>Serbia</key>
+ <value>Serbien</value>
+ </entry>
+ <entry>
+ <key>Bosnia and Herzegovina</key>
+ <value>Bosnien und Herzegowina</value>
+ </entry>
+ <entry>
+ <key>Framework contract</key>
+ <value>Rahmenvertrag</value>
+ </entry>
+ <entry>
+ <key>Niger</key>
+ <value>Niger</value>
+ </entry>
+ <entry>
+ <key>Rwanda</key>
+ <value>Ruanda</value>
+ </entry>
+ <entry>
+ <key>French Southern Territories</key>
+ <value>Südfranzösische Territorien</value>
+ </entry>
+ <entry>
+ <key>Bangladesh</key>
+ <value>Bangladesch</value>
+ </entry>
+ <entry>
+ <key>Barbados</key>
+ <value>Barbados</value>
+ </entry>
+ <entry>
+ <key>Botswana</key>
+ <value>Botswana</value>
+ </entry>
+ <entry>
+ <key>Saint Vincent and the Grenadines</key>
+ <value>St. Vincent und die Grenadinen</value>
+ </entry>
+ <entry>
+ <key>Denmark</key>
+ <value>Dänemark</value>
+ </entry>
+ <entry>
+ <key>Dominican Republic</key>
+ <value>Dominikanische Republik</value>
+ </entry>
+ <entry>
+ <key>MAL</key>
+ </entry>
+ <entry>
+ <key>SQO</key>
+ </entry>
+ <entry>
+ <key>NQC</key>
+ </entry>
+ <entry>
+ <key>MQL</key>
+ </entry>
+ <entry>
+ <key>SAL</key>
+ </entry>
+ <entry>
+ <key>Checkbox</key>
+ <value>Checkbox</value>
+ </entry>
+ <entry>
+ <key>Numeric value</key>
+ <value>Zahlenwert</value>
+ </entry>
+ <entry>
+ <key>decline</key>
+ <value>Ablehnen</value>
+ </entry>
+ <entry>
+ <key>Text</key>
+ </entry>
+ <entry>
+ <key>Group</key>
+ </entry>
+ <entry>
+ <key>Combobox</key>
+ <value>Combobox</value>
+ </entry>
+ <entry>
+ <key>tentative</key>
+ <value>Vorläufig</value>
+ </entry>
+ <entry>
+ <key>${NUMBER}</key>
+ <value>Zahl</value>
+ </entry>
+ <entry>
+ <key>Name \"%0\" already used for container \"%1\"</key>
+ </entry>
+ <entry>
+ <key>CHAR_VALUE</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute</key>
+ <value>Schlüsselwort-Attribut</value>
+ </entry>
+ <entry>
+ <key>in</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute Values</key>
+ <value>Schlüsselwort-Attribut-Werte</value>
+ </entry>
+ <entry>
+ <key>Boolean value</key>
+ </entry>
+ <entry>
+ <key>accept</key>
+ <value>akzeptieren</value>
+ </entry>
+ <entry>
+ <key>The ZIP code does not match the format of the country.</key>
+ <value>Die Postleitzahl hat nicht das Format des ausgewählten Landes.</value>
+ </entry>
+ <entry>
+ <key>String value</key>
+ <value>String-Wert</value>
+ </entry>
+ <entry>
+ <key>The code number is not a valid number.</key>
+ <value>The code number is not a valid number.</value>
+ </entry>
+ <entry>
+ <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
+ <value>Der DB-Typ wird in der Funktion %0 nicht unterstützt.</value>
+ </entry>
+ <entry>
+ <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
+ <value>Es wird der Funktion %0 keine Produktid übergeben.</value>
+ </entry>
+ <entry>
+ <key>Object type</key>
+ <value>Typ</value>
+ </entry>
+ <entry>
+ <key>Level</key>
+ </entry>
+ <entry>
+ <key>Print Offer</key>
+ <value>Angebot drucken</value>
+ </entry>
+ <entry>
+ <key>relations</key>
+ </entry>
+ <entry>
+ <key>Time</key>
+ <value>Zeit</value>
+ </entry>
+ <entry>
+ <key>New task</key>
+ <value>Neue Aufgabe</value>
+ </entry>
+ <entry>
+ <key>MyTasks</key>
+ <value>Meine Aufgaben</value>
+ </entry>
+ <entry>
+ <key>Show my tasks</key>
+ <value>Meine Aufgaben anzeigen</value>
+ </entry>
+ <entry>
+ <key>the specified key has to be unique for that container but does already exist</key>
+ </entry>
+ <entry>
+ <key>Tree Entity</key>
+ </entry>
+ <entry>
+ <key>Relationtype</key>
+ <value>Beziehungsart</value>
+ </entry>
+ <entry>
+ <key>Tree</key>
+ <value>Baum</value>
+ </entry>
+ <entry>
+ <key>100%</key>
+ </entry>
+ <entry>
+ <key>Mobil</key>
+ </entry>
+ <entry>
+ <key>25%</key>
+ </entry>
+ <entry>
+ <key>50%</key>
+ </entry>
+ <entry>
+ <key>75%</key>
+ </entry>
+ <entry>
+ <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
+ </entry>
+ <entry>
+ <key>competitor</key>
+ <value>Konkurrent</value>
+ </entry>
+ <entry>
+ <key>0%</key>
+ </entry>
+ <entry>
+ <key>acquainted with</key>
+ <value>Bekannt mit</value>
+ </entry>
+ <entry>
+ <key>collaboration with</key>
+ <value>Zusammenarbeit mit</value>
+ </entry>
+ <entry>
+ <key>parent company</key>
+ <value>Konzernmutter</value>
+ </entry>
+ <entry>
+ <key>society</key>
+ <value>Verband</value>
+ </entry>
+ <entry>
+ <key>ankle of</key>
+ <value>Enkel/in von</value>
+ </entry>
+ <entry>
+ <key>solicits</key>
+ <value>Bewirbt</value>
+ </entry>
+ <entry>
+ <key>supervisor of</key>
+ <value>Vorgesetzter von</value>
+ </entry>
+ <entry>
+ <key>reports to</key>
+ <value>Berichtet an</value>
+ </entry>
+ <entry>
+ <key>subsidiary</key>
+ <value>Tochtergesellschaft</value>
+ </entry>
+ <entry>
+ <key>supported by</key>
+ <value>Wird unterstützt von</value>
+ </entry>
+ <entry>
+ <key>member</key>
+ <value>Mitglied</value>
+ </entry>
+ <entry>
+ <key>promotion target of</key>
+ <value>Werbezielgruppe von</value>
+ </entry>
+ <entry>
+ <key>supports</key>
+ <value>Unterstützt</value>
+ </entry>
+ <entry>
+ <key>parent of</key>
+ <value>Elternteil von</value>
+ </entry>
+ <entry>
+ <key>grandparents of</key>
+ <value>Großeltern von</value>
+ </entry>
+ <entry>
+ <key>Memo</key>
+ <value>Memo</value>
+ </entry>
+ <entry>
+ <key>Function</key>
+ <value>Funktion</value>
+ </entry>
+ <entry>
+ <key>Relational</key>
+ </entry>
+ <entry>
+ <key>Only numbers are allowed.</key>
+ <value>Es sind nur Zahlen erlaubt.</value>
+ </entry>
+ <entry>
+ <key>MQC</key>
+ </entry>
+ <entry>
+ <key>Datei</key>
+ </entry>
+ <entry>
+ <key>Japan</key>
+ <value>Japan</value>
+ </entry>
+ <entry>
+ <key>7 days net</key>
+ <value>7 Tage netto</value>
+ </entry>
+ <entry>
+ <key>carriage free</key>
+ <value>frei Haus</value>
+ </entry>
+ <entry>
+ <key>Relation tree</key>
+ <value>Beziehungsbaum</value>
+ </entry>
+ <entry>
+ <key>8 days 2% discount, 30 days net</key>
+ <value>8 Tage 2% Skonto, 30 Tage netto</value>
+ </entry>
+ <entry>
+ <key>CIF</key>
+ </entry>
+ <entry>
+ <key>ex works</key>
+ <value>ab Werk</value>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Payment term</key>
+ <value>Zahlungsbedingung</value>
+ </entry>
+ <entry>
+ <key>30 days net</key>
+ <value>30 Tage netto</value>
+ </entry>
+ <entry>
+ <key>Contactrole</key>
+ <value>Funktion</value>
+ </entry>
+ <entry>
+ <key>Object tree</key>
+ </entry>
+ <entry>
+ <key>&Aufg / Term (%0/%1)</key>
+ </entry>
+ <entry>
+ <key>Verschieben auf Datum?</key>
+ </entry>
+ <entry>
+ <key>niedrig</key>
+ </entry>
+ <entry>
+ <key>Gebucht</key>
+ </entry>
+ <entry>
+ <key>Other Contactroles</key>
+ <value>Weitere Funktionen</value>
+ </entry>
+ <entry>
+ <key>Bitte Datumseingabe prüfen!</key>
+ </entry>
+ <entry>
+ <key>In Bearbeitung</key>
+ </entry>
+ <entry>
+ <key>OK</key>
+ </entry>
+ <entry>
+ <key>Nicht begonnen</key>
+ </entry>
+ <entry>
+ <key>Bitte Filterbedingungen setzen</key>
+ </entry>
+ <entry>
+ <key>Bestätigt</key>
+ </entry>
+ <entry>
+ <key>Vorläufig</key>
+ </entry>
+ <entry>
+ <key>keine</key>
+ </entry>
+ <entry>
+ <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
+ </entry>
+ <entry>
+ <key>Aufgaben von</key>
+ </entry>
+ <entry>
+ <key>&Aufgaben (%0)</key>
+ </entry>
+ <entry>
+ <key>erledigt / zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>hoch</key>
+ </entry>
+ <entry>
+ <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+ </entry>
+ <entry>
+ <key>Zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>Erledigt</key>
+ </entry>
+ <entry>
+ <key>Usages</key>
+ </entry>
+ <entry>
+ <key>Abgesagt</key>
+ </entry>
+ <entry>
+ <key>Außer Haus</key>
+ </entry>
+ <entry>
+ <key>Abbrechen</key>
+ </entry>
+ <entry>
+ <key>Benutzer auswählen</key>
+ </entry>
+ <entry>
+ <key>delegiert</key>
+ </entry>
+ <entry>
+ <key>frei</key>
+ </entry>
+ <entry>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+ </entry>
+ <entry>
+ <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+ </entry>
+ <entry>
+ <key>normal</key>
+ </entry>
+ <entry>
+ <key>Termine von</key>
+ </entry>
+ <entry>
+ <key>nur Verschiebung in die Zukunft erlaubt!</key>
+ </entry>
+ <entry>
+ <key>Kategorie</key>
+ </entry>
+ <entry>
+ <key>Product content</key>
+ <value>Produktinhalt</value>
+ </entry>
+ <entry>
+ <key>Know How</key>
+ <value>Know How</value>
+ </entry>
+ <entry>
+ <key>Personal appearance</key>
+ <value>Persönliches Auftreten</value>
+ </entry>
+ <entry>
+ <key>Market situation</key>
+ <value>Marktsituation</value>
+ </entry>
+ <entry>
+ <key>Liquidity</key>
+ <value>Liquidität</value>
+ </entry>
+ <entry>
+ <key>Price policy</key>
+ <value>Preispolitik</value>
+ </entry>
+ <entry>
+ <key>VAT in %</key>
+ <value>UmsSt. in %</value>
+ </entry>
+ </keyValueMap>
+ <font name="Dialog" style="0" size="11" />
+</language>
diff --git a/neonContext/AppointmentLink/AppointmentLink.aod b/neonContext/AppointmentLink/AppointmentLink.aod
index f9df643499..bfe84c66b3 100644
--- a/neonContext/AppointmentLink/AppointmentLink.aod
+++ b/neonContext/AppointmentLink/AppointmentLink.aod
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>AppointmentLink</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>AppointmentLinkFilter_view</mainview>
- <filterview>AppointmentLinkFilter_view</filterview>
- <editview>AppointmentLinkEdit_view</editview>
- <entity>AppointmentLink_entity</entity>
- <references>
- <neonViewReference>
- <name>015bf8e9-621a-423d-8fd3-17ef264cc919</name>
- <view>AppointmentLinkEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>f0f803a8-74a4-4a96-a989-d3923b994280</name>
- <view>AppointmentLinkFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>AppointmentLink</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>AppointmentLinkFilter_view</mainview>
+ <filterview>AppointmentLinkFilter_view</filterview>
+ <editview>AppointmentLinkEdit_view</editview>
+ <entity>AppointmentLink_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>015bf8e9-621a-423d-8fd3-17ef264cc919</name>
+ <view>AppointmentLinkEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f0f803a8-74a4-4a96-a989-d3923b994280</name>
+ <view>AppointmentLinkFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod b/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
index e71c43cbb3..283d81b544 100644
--- a/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
+++ b/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
@@ -1,26 +1,26 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>ActivityLinkPreviewList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <titledListViewTemplate>
- <name>ActivityLinks</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>7db98c3e-2203-4af1-a155-5f4d62bd0ef8</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>063acc6e-1a7f-48a2-8204-a2adaf6ffdb4</name>
- <entityField>OBJECT_ROWID</entityField>
- </neonTableColumn>
- </columns>
- </titledListViewTemplate>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>ActivityLinkPreviewList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>ActivityLinks</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>7db98c3e-2203-4af1-a155-5f4d62bd0ef8</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>063acc6e-1a7f-48a2-8204-a2adaf6ffdb4</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index 5fc6e7f8c4..e791617683 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -1,41 +1,41 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>AppointmentEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonView/AppointmentEdit_view/documentation.adoc</documentation>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <appointmentEditViewTemplate>
- <name>Edit</name>
- <summaryField>SUMMARY</summaryField>
- <descriptionField>DESCRIPTION</descriptionField>
- <beginField>BEGIN</beginField>
- <endField>END</endField>
- <attendeesField>ATTENDEES</attendeesField>
- <privateField>CLASSIFICATION</privateField>
- <statusField>STATUS</statusField>
- <locationField>LOCATION</locationField>
- <categoriesField>CATEGORIES</categoriesField>
- <alldayField>ALLDAY</alldayField>
- <transparencyField>TRANSPARENCY</transparencyField>
- <organizerField>ORGANIZER</organizerField>
- <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
- <rruleField>RRULE</rruleField>
- <recurrenceIdField>RECURRENCEID</recurrenceIdField>
- <saveScopeField>SAFESCOPEFIELD</saveScopeField>
- <masterBeginField>MASTERBEGIN</masterBeginField>
- <masterEndField>MASTEREND</masterEndField>
- <reminderField>REMINDER</reminderField>
- <entityField>#ENTITY</entityField>
- </appointmentEditViewTemplate>
- <neonViewReference>
- <name>39802b49-f67c-4796-ba05-105aa073d60c</name>
- <entityField>AppointmentLinks</entityField>
- <view>AppointmentLinkEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>AppointmentEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonView/AppointmentEdit_view/documentation.adoc</documentation>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <appointmentEditViewTemplate>
+ <name>Edit</name>
+ <summaryField>SUMMARY</summaryField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <beginField>BEGIN</beginField>
+ <endField>END</endField>
+ <attendeesField>ATTENDEES</attendeesField>
+ <privateField>CLASSIFICATION</privateField>
+ <statusField>STATUS</statusField>
+ <locationField>LOCATION</locationField>
+ <categoriesField>CATEGORIES</categoriesField>
+ <alldayField>ALLDAY</alldayField>
+ <transparencyField>TRANSPARENCY</transparencyField>
+ <organizerField>ORGANIZER</organizerField>
+ <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
+ <rruleField>RRULE</rruleField>
+ <recurrenceIdField>RECURRENCEID</recurrenceIdField>
+ <saveScopeField>SAFESCOPEFIELD</saveScopeField>
+ <masterBeginField>MASTERBEGIN</masterBeginField>
+ <masterEndField>MASTEREND</masterEndField>
+ <reminderField>REMINDER</reminderField>
+ <entityField>#ENTITY</entityField>
+ </appointmentEditViewTemplate>
+ <neonViewReference>
+ <name>39802b49-f67c-4796-ba05-105aa073d60c</name>
+ <entityField>AppointmentLinks</entityField>
+ <view>AppointmentLinkEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod b/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
index f3d1d53ddd..67f76f8509 100644
--- a/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
+++ b/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
@@ -1,28 +1,28 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>AppointmentLinkEdit_view</name>
- <title>relations</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>GenericMultiple</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>539c9844-8f4b-49e8-8974-30bdf127f47c</name>
- <entityField>OBJECTTYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>eba00f45-cd7e-43c0-9dea-559293ca7d49</name>
- <entityField>OBJECTID</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>AppointmentLinkEdit_view</name>
+ <title>relations</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>GenericMultiple</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>539c9844-8f4b-49e8-8974-30bdf127f47c</name>
+ <entityField>OBJECTTYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>eba00f45-cd7e-43c0-9dea-559293ca7d49</name>
+ <entityField>OBJECTID</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index dfe97b2a59..981927ec37 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -1,20 +1,20 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>AppointmentLinkFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <drawerLayout>
- <name>layout</name>
- <layoutCaption>Connections</layoutCaption>
- </drawerLayout>
- </layout>
- <children>
- <actionListViewTemplate>
- <name>ölk</name>
- <titleField>OBJECTID</titleField>
- <descriptionField>OBJECTTYPE</descriptionField>
- <entryAction>opencontext</entryAction>
- <entityField>#ENTITY</entityField>
- </actionListViewTemplate>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>AppointmentLinkFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Connections</layoutCaption>
+ </drawerLayout>
+ </layout>
+ <children>
+ <actionListViewTemplate>
+ <name>ölk</name>
+ <titleField>OBJECTID</titleField>
+ <descriptionField>OBJECTTYPE</descriptionField>
+ <entryAction>opencontext</entryAction>
+ <entityField>#ENTITY</entityField>
+ </actionListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 868058a242..f35b4d1937 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -1,36 +1,36 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>AppointmentPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <appointmentPreviewViewTemplate>
- <name>Appointments</name>
- <summaryField>SUMMARY</summaryField>
- <descriptionField>DESCRIPTION</descriptionField>
- <beginField>BEGIN</beginField>
- <endField>END</endField>
- <periodField>STARTEND</periodField>
- <attendeesField>ATTENDEES</attendeesField>
- <privateField>CLASSIFICATION</privateField>
- <transparencyField>TRANSPARENCY</transparencyField>
- <statusField>STATUS</statusField>
- <locationField>LOCATION</locationField>
- <linkField>LINKS</linkField>
- <organizerField>ORGANIZER</organizerField>
- <categoriesField>CATEGORIES</categoriesField>
- <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
- <entityField>#ENTITY</entityField>
- </appointmentPreviewViewTemplate>
- <neonViewReference>
- <name>be0befe0-4b29-4c23-924a-0167240d2b54</name>
- <entityField>AppointmentLinks</entityField>
- <view>AppointmentLinkFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>AppointmentPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <appointmentPreviewViewTemplate>
+ <name>Appointments</name>
+ <summaryField>SUMMARY</summaryField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <beginField>BEGIN</beginField>
+ <endField>END</endField>
+ <periodField>STARTEND</periodField>
+ <attendeesField>ATTENDEES</attendeesField>
+ <privateField>CLASSIFICATION</privateField>
+ <transparencyField>TRANSPARENCY</transparencyField>
+ <statusField>STATUS</statusField>
+ <locationField>LOCATION</locationField>
+ <linkField>LINKS</linkField>
+ <organizerField>ORGANIZER</organizerField>
+ <categoriesField>CATEGORIES</categoriesField>
+ <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
+ <entityField>#ENTITY</entityField>
+ </appointmentPreviewViewTemplate>
+ <neonViewReference>
+ <name>be0befe0-4b29-4c23-924a-0167240d2b54</name>
+ <entityField>AppointmentLinks</entityField>
+ <view>AppointmentLinkFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod b/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
index 20cf9eaeff..a009b2b1c3 100644
--- a/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
+++ b/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
@@ -1,26 +1,26 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>TaskLinkPreviewList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <titledListViewTemplate>
- <name>TaskLinks</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>280359fa-e38a-49b1-9dc7-84cb670e43c3</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>d5d86e34-16a0-4dd9-acfd-f1a2f031d750</name>
- <entityField>OBJECT_ROWID</entityField>
- </neonTableColumn>
- </columns>
- </titledListViewTemplate>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>TaskLinkPreviewList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>TaskLinks</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>280359fa-e38a-49b1-9dc7-84cb670e43c3</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d5d86e34-16a0-4dd9-acfd-f1a2f031d750</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/process/Calendar_lib/process.js b/process/Calendar_lib/process.js
index bc4c96b354..232cf4c3be 100644
--- a/process/Calendar_lib/process.js
+++ b/process/Calendar_lib/process.js
@@ -1,1903 +1,1903 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("system.translate");
-import("system.datetime");
-import("system.swing");
-import("system.eMath");
-import("system.calendars");
-import("system.logging");
-import("system.tools");
-import("system.text");
-import("system.question");
-import("system.SQLTYPES");
-import("system.result");
-import("Util_lib");
-import("system.util")
-
-
-/**
- * @class
- **/
-function CalendarUtil(){}
-
-
-/*
- * Erzeugt und öffnet ein neues Aufgabenobjekt (mit einem Link).
- *
- * @param {String} pSummary opt die Zusammenfassung
- * @param {String} pDescription opt die Beschreibung
- * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
- * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
- * pWithLink[1]: ID des angezeigten Datensatzes
- * pWithLink[2]: Verknüpfungstitel
- * @param {String} pUser opt der Benutzer ( Login )
- * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
- * @param {date} pStart opt Beginn der Aufgabe
- * @param {date} pDuration opt Dauer
- * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
- * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
- * @param {Array{[]} pComps4Refresh opt die zu aktualisierenden Komponenten
- *
- * @return {void}
- */
-CalendarUtil.newTodo = function(pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pComps4Refresh)
-{
- var todo = createEntry( calendars.VTODO, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus );
- var prompts = [];
- prompts["comp4refresh"] = [];
-
- if (pComps4Refresh == undefined)
- pComps4Refresh = ["$comp.Aufgabe", "$comp.tbl_Aufgabe"];
-
- for (var i = 0; i < pComps4Refresh.length; i++)
- {
- if ( vars.exists(pComps4Refresh[i])) prompts["comp4refresh"].push(pComps4Refresh[i]);
- }
- if(vars.getString("$sys.scope") == "vaadin")
- neon.openCalendarEntry([todo], null, neon.OPERATINGSTATE_NEW, null)
- else
- {
- if (vars.exists("$sys.currentwindow"))
- prompts["window"] = vars.getString("$sys.currentwindow");
- if (vars.exists("$sys.currentimage"))
- prompts["image"] = vars.getString("$sys.currentimage");
-
- swing.openCalendarEntry([todo], null, false, prompts);
- }
-}
-
-/*
- * Erzeugt eine neue Aufgabe (mit einem Link).
- *
- * @param {String} pSummary opt die Zusammenfassung
- * @param {String} pDescription opt die Beschreibung
- * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
- * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
- * pWithLink[1]: ID des angezeigten Datensatzes
- * pWithLink[2]: Verknüpfungstitel
- * @param {String} pUser opt der Benutzer ( Login )
- * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
- * @param {date} pStart opt Beginn der Aufagebe
- * @param {integer} pGroupType opt ( calendars.GROUP_SINGLE , calendars.GROUP_MULTI )
- * @param {date} pDuration opt Dauer
- * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
- * @param {String} pStatus opt Status der Aufgabe ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
- * @param {String} pPriority opt Priorität der Aufgabe
- * @param {String} pReminder opt Erinnerung der Aufgabe
- *
- * @return {void}
- */
-
-CalendarUtil.newSilentTodo = function(pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pGroupType, pCategory, pStatus, pPriority, pReminder)
-{
- if ( pGroupType == undefined ) pGroupType = calendars.GROUP_SINGLE;
- var todo = createEntry( calendars.VTODO, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pPriority, pReminder );
-
- return calendars.insert([todo],calendars.GROUP_SINGLE);
-}
-
-/*
- * Erzeugt und öffnet ein neues Terminnobjekt mit einem Link.
- *
- * @param {String} pSummary opt die Zusammenfassung
- * @param {String} pDescription opt die Beschreibung
- * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
- * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
- * pWithLink[1]: ID des angezeigten Datensatzes
- * pWithLink[2]: Verknüpfungstitel
- * @param {String} pUser opt der Benutzer ( Login )
- * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
- * @param {date} pStart opt Beginn der Aufagebe
- * @param {date} pDuration opt Dauer
- * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
- * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
- * @param {Array{[]} pComps4Refresh opt die zu aktualisierenden Komponenten
- *
- * @return {void}
- */
-CalendarUtil.newEvent = function( pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pComps4Refresh, pWorklistId)
-{
- var event = createEntry( calendars.VEVENT, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus );
-
- var prompts = [];
- prompts["comp4refresh"] = [];
- if (pComps4Refresh == undefined)
- pComps4Refresh = ["$comp.Aufgabe", "$comp.tbl_Termine"];
- for (i = 0; i < pComps4Refresh.length; i++)
- {
- if ( vars.exists(pComps4Refresh[i])) prompts["comp4refresh"].push(pComps4Refresh[i]);
- }
-
- if(vars.getString("$sys.scope") == "vaadin")
- neon.openCalendarEntry([event],"", neon.OPERATINGSTATE_NEW, null)
- else
- {
- prompts["window"] = vars.getString("$sys.currentwindow");
- prompts["image"] = vars.getString("$sys.currentimage");
- if (pWorklistId != undefined)
- prompts["worklistId"] = pWorklistId;
- swing.openCalendarEntry([event], null, false, prompts);
- }
-}
-
-
-/*
- * Erzeugt einen neuen Termineintrag (mit einem Link).
- *
- * @param {String} pSummary opt die Zusammenfassung
- * @param {String} pDescription opt die Beschreibung
- * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
- * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
- * pWithLink[1]: ID des angezeigten Datensatzes
- * pWithLink[2]: Verknüpfungstitel
- * @param {String} pUser opt der Benutzer ( Login )
- * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
- * @param {date} pStart opt Beginn des Termins
- * @param {date} pDuration opt Dauer
- * @param {integer} pGroupType opt ( calendars.GROUP_SINGLE , calendars.GROUP_MULTI )
- * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
- * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
- * @param {String} pReminder opt Erinnerung des Termins
- *
- * @return {void}
- */
-CalendarUtil.newSilentEvent = function( pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pGroupType, pCategory, pStatus, pReminder)
-{
- if ( pGroupType == undefined ) pGroupType = calendars.GROUP_SINGLE;
- var event = createEntry( calendars.VEVENT, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, undefined, pReminder );
- return calendars.insert( [event] , pGroupType );
-}
-
-/*
- * Erzeugt ein neues Aufgaben- / Termin-Objekt (mit einem Link).
- *
- * @param {date} pType req Augabe oder Termin ( calendars.VTODO, calendars.VEVENT )
- * @param {String} pSummary opt die Zusammenfassung
- * @param {String} pDescription opt die Beschreibung
- * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
- * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
- * pWithLink[1]: ID des angezeigten Datensatzes
- * pWithLink[2]: Verknüpfungstitel
- * @param {String} pUser opt der Benutzer ( Login )
- * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( [ Login ] )
- * @param {date} pStart opt Beginn
- * @param {date} pDuration opt Dauer
- * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
- * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
- * @param {String} pPriority opt Priorität
- * @param {String} pReminder opt Erinnerung
- *
-@return {Object} das EntryObjekt
- */
-CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, pAppLinkContext, pAppLinkId, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pPriority, pReminder )
-{
- var Entry = {};
- var framename;
- var framdata;
- var dbid;
- var linktitle;
- if ( pSummary == undefined || pSummary == null ) pSummary = "";
- if ( pDescription == undefined || pDescription == null )
- {
- if(vars.getString("$sys.scope") == "vaadin")
- pDescription = neon.getImageContent(vars.getString("$sys.currententityname"));
- else
- pDescription = swing.getImageContent();
- }
- if ( pUser == undefined || pUser == null ) pUser = vars.getString("$sys.user");
- //kein translate.key hier, weil es sich um einen rein technischen Wert handelt:
- if ( pStart == undefined ) pStart = datetime.toLong(datetime.toDate(parseInt(vars.getString("$sys.date")) + datetime.ONE_HOUR, "dd.MM.yyyy HH:00"), "dd.MM.yyyy HH:mm");
- if ( pCategory == undefined || pCategory == null ) pCategory = "";
-
- if (pAffectedUsers == null || pAffectedUsers == undefined )
- {
- Entry[calendars.AFFECTEDUSERS] = "";
- }
- else
- {
- Entry[calendars.AFFECTEDUSERS] = text.encodeMS(calendars.getCalendarUsers(pAffectedUsers));
- }
- Entry[calendars.TYPE] = pType;
- Entry[calendars.DTSTART] = pStart;
- if ( pType == calendars.VEVENT )
- {
- if ( pDuration == undefined )
- pDuration = datetime.ONE_HOUR;
-
- Entry[calendars.DTEND] = String ( eMath.addInt( pStart, pDuration) );
-
- if ( pStatus == undefined )
- pStatus = calendars.STATUS_CONFIRMED;
-
- pStatus = mapCalendarStatus(pStatus, calendars.getBackendType() );
- }
- else if ( pType == calendars.VTODO )
- {
- //kein translate.key hier, weil es sich um einen rein technischen Wert handelt:
- if ( pDuration != undefined )
- Entry[calendars.DUE] = String ( eMath.addInt( pStart, pDuration) );
- else
- Entry[calendars.DUE] = datetime.toLong(datetime.toDate(pStart, "dd.MM.yyyy 23:59")
- ,"dd.MM.yyyy HH:mm");
-
- if ( pStatus == undefined )
- pStatus = calendars.STATUS_NEEDSACTION;
-
- pStatus = mapCalendarStatus(pStatus, calendars.getBackendTypeTasks() );
-
- }
-
- Entry[calendars.USER] = calendars.getCalendarUser(pUser);
- Entry[calendars.DESCRIPTION] = pDescription;
- Entry[calendars.SUMMARY] = pSummary;
- Entry[calendars.STATUS] = pStatus;
- Entry[calendars.CLASSIFICATION] = calendars.CLASSIFICATION_PUBLIC;
- Entry[calendars.CATEGORIES] = pCategory;
-
-
- if( pPriority != undefined )
- {
- Entry[calendars.PRIORITY] = pPriority;
- }
-
- if( pReminder != undefined)
- {
- Entry[calendars.HASREMINDER] = "true";
- Entry[calendars.REMINDER_DURATION] = pReminder;
- }
- else
- Entry[calendars.HASREMINDER] = "false";
-
-
- if (pWithLink == false)
- {
- Entry[calendars.LINKS] = "0";
- }
- else
- {
- var fd = new FrameData();
- if ( typeof(pWithLink) == "object" )
- {
- for ( var li = 0; li < pWithLink.length; li++ )
- {
- framename = pWithLink[li][0];
- framdata = fd.getData("name", framename, ["table","idcolumn","title"])[0];
- dbid = pWithLink[li][1];
- linktitle = framdata[2] + " - " + pWithLink[li][2];
-
- Entry["LINK_ALIAS_" + ( li + 1 )] = vars.getString("$sys.dbalias");
- Entry["LINK_TABLE_" + ( li + 1 )] = framdata[0];
- Entry["LINK_IDCOLUMN_" + ( li + 1 )] = framdata[1];
- Entry["LINK_DBID_" + ( li + 1 )] = dbid;
- Entry["LINK_FRAME_" + ( li + 1 )] = "comp." + framename;
- Entry["LINK_TITLE_" + ( li + 1 )] = linktitle;
- }
- Entry[calendars.LINKS] = pWithLink.length.toString();
- }
- else
- {
- if ( pWithLink == true || pWithLink == undefined )
- {
- framename = vars.getString("$sys.currentimagename");
- framdata = fd.getData("name", framename, ["table","idcolumn","title"])[0];
- dbid = vars.getString("$comp.idcolumn");
- linktitle = framdata[2] + " - " + swing.getImageContent();
- }
- Entry[calendars.LINKS] = "1";
- Entry["LINK_ALIAS_1"] = vars.getString("$sys.dbalias");
- Entry["LINK_TABLE_1"] = framdata[0];
- Entry["LINK_IDCOLUMN_1"] = framdata[1];
- Entry["LINK_DBID_1"] = dbid;
- Entry["LINK_FRAME_1"] = "comp." + framename;
- Entry["LINK_TITLE_1"] = linktitle;
- }
- }
-
-
-if(pAppLinkContext && pAppLinkId)
-{
- Entry["AppLinkContext"] = pAppLinkContext;
- Entry["AppLinkId"] = pAppLinkId;
-}
- return Entry;
-}
-
-/*
- * Liefert den CalendarStatus übersetzt zurück.
- * @param {String} pStatus req Status
- * @param {String} pLanguage opt Sprache
- * @param {String} pKind opt ToDo oder Event
- *
- * @return {String} übersetzte Status
- */
-function getCalendarStatus( pStatus, pLanguage, pKind)
-{
- //kein mappen des Status, da wirklich verschiedene Dinge angezeigt werden sollen
- switch ( pStatus )
- {
- case calendars.STATUS_BUSY:
- return translate.text("Gebucht", pLanguage)
- case calendars.STATUS_CANCELLED:
- if(pKind == "ToDo" && pKind != undefined) return translate.text("Zurückgestellt", pLanguage)
- return translate.text("Abgesagt", pLanguage)
- case calendars.STATUS_COMPLETED:
- return translate.text("Erledigt", pLanguage)
- case calendars.STATUS_CONFIRMED:
- return translate.text("Bestätigt", pLanguage)
- case calendars.STATUS_FREE:
- return translate.text("frei", pLanguage)
- case calendars.STATUS_INPROCESS:
- return translate.text("In Bearbeitung", pLanguage)
- case calendars.STATUS_NEEDSACTION:
- return translate.text("Nicht begonnen", pLanguage)
- case calendars.STATUS_OOF:
- return translate.text("Außer Haus", pLanguage)
- case calendars.STATUS_TENTATIVE:
- return translate.text("Vorläufig", pLanguage)
- default:
- return "";
- }
-}
-
-/*
- * Zu einer übergebenen Priorität wird ihre Bedeutung übersetzt und zurückgegeben.
- *
- * @param {String} pPriority req Priorität
- * @param {String} pLanguage opt Sprache
- *
- * @return (String) übersetzte Bedeutung einer Priorität
- */
-function getCalendarPriority(pPriority, pLanguage)
-{
- switch(pPriority)
- {
- case "9":
- return translate.text("niedrig", pLanguage);
- break;
- case "5":
- return translate.text("normal", pLanguage);
- break;
- case "1":
- return translate.text("hoch", pLanguage);
- break;
- default:
- return translate.text("keine", pLanguage);
- break;
- }
-}
-
-/*
- * Liefert zum Objekt verknüpfte Aufgaben aus dem Kalender.
- *
- * @param {String} pFrame req Name des Frames
- * @param {String} pDBID req ID des verknüpften Datensatzes
- * @param {String} pAlias opt
- * @param {String} pLanguage opt Sprache
- *
- * @return {[]} mit Aufgaben aus Kalender
- */
-function getLinkedToDos (pFrame, pDBID, pAlias, pLanguage )
-{
- if (pAlias == undefined ) pAlias = vars.getString("$sys.dbalias");
- var tab = [];
- var status = " and STATUS in ('NEEDS-ACTION', 'IN-PROCESS')";
- var exists = [];
- var zustaendig = "";
- var today = getDate(vars.getString("$sys.date"));
- var filtervalues = ["", "false"];
- if ( vars.exists("$image.FilterValuesT") )
- {
- filtervalues = vars.get("$image.FilterValuesT");
- zustaendig = filtervalues[0]
- if (filtervalues[1] == "true") status = " and STATUS in ('COMPLETED', 'CANCELLED')";
- }
-
- var entryids = db.table("select ENTRYID, OWNER from ASYS_CALENDARLINK "
- + "join ASYS_CALENDARBACKEND on ELEMENTUID = ENTRYID where FRAME = 'comp." + pFrame + "' "
- + "and ENTRYID is not null "
- + "and ENTRYTYPE = " + calendars.VTODO + " "
- + "and DBID = '" + pDBID + "' "
- + status, pAlias);
-
- for (var i = 0; i < entryids.length; i++)
- {
- if ( exists.indexOf(entryids[i][0]) == -1)
- {
- try
- {
- var entry = calendars.getEntry(entryids[i][0], null, getTitleCalenderUser( entryids[i][1] ), calendars.VTODO);
- var entr = new Array;
- status = "";
- var user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
- if(user == null) user = entry[calendars.USER2]["cn"];
- else user = user[tools.TITLE]
- if ((user == zustaendig || zustaendig == ""))
- {
- entr[0] = text.encodeMS([entry[calendars.ID], user]);
- var due = getDate(entry[calendars.DUE]);
- if (due < today ) entr[1] = "-1769402";
- else if (due > today) entr[1] = "-16777216"; else entr[1] = "-16744020";
- entr[2] = "-1"; // Hintergrundfarbe
- entr[3] = text.decodeMS(entry[calendars.AFFECTEDUSERS]).length;
- entr[4] = entry[calendars.DUE]
- entr[5] = getCalendarStatus( entry[calendars.STATUS], pLanguage, "ToDo");
- entr[6] = entry[calendars.SUMMARY]
- entr[7] = getRealName([entry[calendars.ORGANIZER2]]);
- entr[8] = getRealName(entry[calendars.ATTENDEES]);
- entr[9] = entry[calendars.DESCRIPTION];
- entr[10] = entry[calendars.PRIORITY];
- tab.push(entr);
- exists.push(entryids[i][0]);
- }
- }
- catch (ex)
- {
- logging.log(ex);
- }
- }
- }
- array_mDimSort(tab, 4, false); //Sortierung nach Fälligkeitsdatum
- return tab;
-}
-
-/*
- * Anzeige des Aufgaben-Filter
- *
- * @param {Object} pFilter req
- *
- * @return string Anzeige
- */
-function show_filterLinkedToDos(pFilter)
-{
- var retstring = "";
- if (pFilter[0] != "")
- {
- var userp = tools.getUser( pFilter[0] )[tools.PARAMS];
- retstring = translate.text("Aufgaben von") + " " + userp[tools.FIRSTNAME] + " " + userp[tools.LASTNAME];
- }
- if (pFilter[1] == "true") retstring += ", " + translate.text("erledigt / zurückgestellt");
-
- return retstring
-}
-
-/*
- * Liefert zum Objekt verknüpfte Events aus dem Kalender.
- *
- * @param {String} pFrame req Name des Frames
- * @param {String} pDBID req ID des verknüpften Datensatzes
- * @param {Object} pFilter opt
- * @param {String} pAlias opt
- * @param {String} pUser opt Benutzer
- *
- * @return {[]} mit Events aus Kalender
- */
-function getLinkedEvents (pFrame, pDBID, pFilter, pAlias, pUser )
-{
- if ( pFilter == "" || pFilter == undefined)
- pFilter = reset_filterEvent();
-
- var tab = [];
- var exists = [];
- var conditions = [];
- var today = getDate(vars.getString("$sys.date"));
- var conditioncount = 0;
- var stati = [];
-
- if ( pFilter.tentative == "true" )
- stati.push(mapCalendarStatus(calendars.STATUS_TENTATIVE, calendars.getBackendType() ));
-
- if ( pFilter.cancelled == "true" )
- stati.push(mapCalendarStatus(calendars.STATUS_CANCELLED, calendars.getBackendType() ));
-
- if ( pFilter.confirmed == "true" )
- stati.push(mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() ));
-
- if (calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
- stati.push(calendars.STATUS_FREE);
-
- if (pAlias == undefined ) pAlias = vars.getString("$sys.dbalias");
-
- var entryids = db.table(["select ENTRYID, OWNER "
- + "from ASYS_CALENDARLINK "
- + "join ASYS_CALENDARBACKEND on ELEMENTUID = ENTRYID where FRAME = 'comp."
- + pFrame + "' and ENTRYID is not null and ENTRYTYPE = " + calendars.VEVENT
- + " and DBID = '" + pDBID + "' and DTSTART >= ?",
- [ [ String(pFilter.datefrom - datetime.ONE_WEEK), SQLTYPES.DATE ]]], pAlias );
-
- /*
- * Check for rights before constructing condition otherwise you'll get an error by opening linked Data
- */
- var userToRead = []
- if(pUser != undefined)
- {
- userToRead = getCalendarUsers( calendars.RIGHT_READ_APPOINTMENT, pUser );
- }
- else
- {
- userToRead = calendars.getDisplayCalendarUsers(calendars.RIGHT_READ_APPOINTMENT);
- }
- var userMap = {};
- for (let i = 0; i < userToRead.length; i++)
- {
- userMap[userToRead[i][1]] = true;
- }
-
- for ( var i = 0;i < entryids.length; i++)
- {
- var user = getTitleCalenderUser(entryids[i][1]);
- if(userMap[user])
- {
- for ( var z = 0; z < stati.length; z++ )
- _addEntryCondition(conditions, String(++conditioncount),
- {
- TYPE: calendars.VEVENT,
- START: pFilter.datefrom,
- END: pFilter.dateto,
- USER: user,
- STATUS: stati[z],
- UID: entryids[i][0]
- });
- } else continue
- }
- conditions["COUNT"] = String(conditioncount);
-
- var entries = calendars.getExpandedEntries(conditions, pFilter.datefrom, pFilter.dateto);
- for ( let i = 0; i < entries.length; i++)
- {
- for (var j = 0; j < entries[i].length; j++)
- {
- var entry = entries[i][j];
- if( exists.indexOf(entry[calendars.ID]) == -1 && ( pFilter.category == "" || text.decodeMS(entry[calendars.CATEGORIES]).indexOf(pFilter.category) > 0))
- {
- var entr = new Array;
- var start = getDate(entry[calendars.DTSTART]);
- var end = getDate(entry[calendars.DTEND]);
- user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
- if(user == null) user = entry[calendars.USER2]["cn"];
- else user = user[tools.TITLE]
- entr[0] = text.encodeMS([entry[calendars.ID], user , entry[calendars.RECURRENCEID]]);
- if (end < today) entr[1] = "-6710887" ;
- else if (start <= today && end >= today ) entr[1] = "-16744020" ;
- else entr[1] = "-16777216";
- entr[2] = "-1"
- entr[3] = text.decodeMS(entry[calendars.AFFECTEDUSERS]).length;
- entr[4] = entry[calendars.DTSTART]
- entr[5] = entry[calendars.DTEND]
- entr[6] = entry[calendars.SUMMARY]
- entr[7] = getRealName([entry[calendars.ORGANIZER2]]);
- entr[8] = getRealName(entry[calendars.ATTENDEES]);
- entr[9] = entry[calendars.DESCRIPTION]
- tab.push(entr);
- exists.push(entry[calendars.ID]);
- }
- }
- }
- array_mDimSort(tab, 4, false);
- return tab;
-}
-
-/*
- * Liefert Aufgaben aus dem Kalender.
- *
- * @param {Object} pFilter req
- * @param {String} pLanguage opt
- * @param {bool} pShortForm opt wenn true wird nur die kurzversion geladen
- *
- * @return {[]} mit allen aufgaben aus dem Kalender
- */
-function getTodos( pFilter, pLanguage, pShortForm )
-{
- if ( pFilter == "" ) pFilter = reset_filterToDo();
- var tab = [];
- var today = getDate (vars.getString("$sys.date"));
- var conditions = [];
- var conditioncount = 0;
- var user = pFilter.user;
- var stati = [];
- var status = [];
- var exists = [];
- var entries = [];
-
- if ( pFilter.needs_action == "true" )
- {
- stati.push(mapCalendarStatus(calendars.STATUS_NEEDSACTION, calendars.getBackendTypeTasks() ));
- status.push("NEEDS-ACTION");
- }
- if ( pFilter.in_process == "true" )
- {
- stati.push(mapCalendarStatus(calendars.STATUS_INPROCESS, calendars.getBackendTypeTasks() ));
- status.push("IN-PROCESS");
- }
- if ( pFilter.completed == "true" )
- {
- stati.push(mapCalendarStatus(calendars.STATUS_COMPLETED, calendars.getBackendTypeTasks() ));
- status.push("COMPLETED");
- }
- if ( pFilter.cancelled == "true" )
- {
- stati.push(mapCalendarStatus(calendars.STATUS_CANCELLED, calendars.getBackendTypeTasks() ));
- status.push("CANCELLED");
- }
- if (pFilter.delegated == "true" )
- {
- var from = [pFilter.datefrom, SQLTYPES.TIMESTAMP];
- var to = [pFilter.dateto, SQLTYPES.TIMESTAMP];
- setAllCalendarGrant();
- user = calendars.getCalendarUser(user);
- user = db.table(["select ELEMENTUID, OWNER from ASYS_CALENDARBACKEND where ENTRYTYPE = 2 and OWNER != '" + user + "' and ORGANIZER = '"
- + user + "' and STATUS in ('" + status.join("', '") + "') and (( STARTTIME >= ? and STARTTIME <= ?) or "
- + "( ENDTIME >= ? and ENDTIME <= ? ) or ( STARTTIME >= ? and ENDTIME <= ? ))", [from, to, from, to, from, to]] );
-
- for (let i = 0; i < user.length; i++ )
- {
- try
- {
- entries.push([calendars.getEntry(user[i][0], null, getTitleCalenderUser(user[i][1]), calendars.VTODO)]);
- }
- catch(err){
- logging.log(err);
- }
- }
- setCalendarGrant();
- }
- else
- {
- if ( typeof( pFilter.user ) != "object" ) user = [user.trim()];
- for (let i = 0; i < user.length; i++ )
- for ( var z = 0; z < stati.length; z++ )
- _addEntryCondition(conditions, ++conditioncount,
- {
- TYPE: calendars.VTODO,
- START: pFilter.datefrom,
- END: pFilter.dateto,
- USER: user[i],
- STATUS: stati[z]
- });
-
- conditions["COUNT"] = String(conditioncount);
- entries = calendars.getEntries(conditions);
- }
-
- for (i = 0; i < entries.length; i++)
- {
- var entry = entries[i][0];
- user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
- if (user == null) user = entry[calendars.USER2]["cn"];
- else user = user[tools.TITLE]
- if ( !(user != vars.getString("$sys.user") && entry[calendars.CLASSIFICATION] == calendars.CLASSIFICATION_PRIVATE) // no privat
- && !( pFilter.delegated == "true" && ( isAffectedUser( entry, pFilter.user) || exists.indexOf(entry[calendars.ID]) > -1 ) ) // no duplicate
- && ( pFilter.category == "" || text.decodeMS(entry[calendars.CATEGORIES]).indexOf( pFilter.category ) > -1 ) ) // Filter category
- {
- var entr = [];
- var links = entry[calendars.LINKS];
- var due = entry[calendars.DUE] != "" ? getDate(entry[calendars.DUE]) : "";
- entr[0] = text.encodeMS([entry[calendars.ID], user]);
- if (due == today ) entr[1] = "-16744020" ;
- else if(due == "") entr[1] = "-13395712";
- else if (due > today ) entr[1] = "-16777216";
- else entr[1] = "-1769402";
- if (entry[calendars.PRIORITY] == "1") entr[2] = "-100";
- entr[3] = entry[calendars.ATTENDEES].length;
- entr[4] = entry[calendars.DUE];
-
- if (pShortForm)
- {
- entr[5] = entry[calendars.SUMMARY];
- entr[6] = entry[calendars.DESCRIPTION];
- }
- else
- {
- entr[5] = getCalendarStatus( entry[calendars.STATUS], pLanguage, "ToDo");
- entr[6] = getCalendarPriority( entry[calendars.PRIORITY], pLanguage);
- entr[7] = entry[calendars.SUMMARY];
- entr[8] = getRealName( [ entry[calendars.ORGANIZER2] ] );
- entr[9] = getRealName( entry[calendars.ATTENDEES] );
- if (links == undefined) entr[10] = ""; else entr[10] = links;
- entr[11] = entry[calendars.DESCRIPTION];
- entr[12] = entry[calendars.CREATED];
- }
-
- tab.push(entr);
- if ( pFilter.delegated == "true" ) exists.push(entry[calendars.ID]);
- }
- }
-
- if (pShortForm)
- sortArray(tab, -1, 4, 1, 5);
- else
- sortArray(tab, -1, 4, 1, 12 );
-
- return tab;
-}
-
-/*
- * Fügt eine Condition hinzu
- *
- * @param {[]} pConditions req die Conditions
- * @param {Integer} pIndex req Index der Condition
- * @param {Object} pValues req
- *
- * @return {void}
- */
-function _addEntryCondition(pConditions, pIndex, pValues)
-{
- var params = ["TYPE", "START", "END", "USER", "STATUS", "UID"];
-
- for (var i = 0; i < params.length; i++)
- if (pValues[params[i]] != undefined) pConditions[params[i] + "_" + pIndex] = pValues[params[i]];
-}
-
-/*
- * Liefert Events zu bestimmten Usern/Daten in einem Array.
- *
- * @param {Object} pFilter req
- * @param {String} pLanguage opt
- * @param {bool} pShortForm opt wenn true wird nur die kurzversion geladen
- *
- * @return {[]}
- * [0] ID
- * [1] Vordergrundfarbe
- * [2] Hintergrundfarbe
- * [3] Start
- * [4] Ende
- * [5] Betreff
- * [6] Inhalt
- * [7] User
- * [8] Anzahl Verknüpfungen
- * [9] Klassifikation (privat/öffentlich)
- */
-function getEvents( pFilter, pLanguage, pShortForm )
-{
- if ( pFilter == "" ) pFilter = reset_filterEvent();
- var tab = [];
- var conditions = [];
- var today = getDate(vars.getString("$sys.date"));
- var conditioncount = 0;
- var stati = [];
- var user = undefined;
- if ( pFilter.tentative == "true" ) stati.push(calendars.STATUS_TENTATIVE);
- if ( pFilter.cancelled == "true" ) stati.push(calendars.STATUS_CANCELLED);
- if ( pFilter.confirmed == "true" )
- stati.push(mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() ));
-
- if (getCalendarSystemType(calendars.VEVENT) == calendars.BACKEND_EXCHANGEWS && pFilter.free == "true")
- stati.push(calendars.STATUS_FREE);
-
- if ( pFilter.user != "" ) user = (pFilter.user).trim();
-
- for ( var z = 0; z < stati.length; z++ )
- _addEntryCondition(conditions, String(++conditioncount),
- {
- TYPE: calendars.VEVENT,
- START: pFilter.datefrom,
- END: pFilter.dateto,
- USER: user,
- STATUS: stati[z]
- });
-
- conditions["COUNT"] = String(conditioncount);
-
- var entries = calendars.getExpandedEntries(conditions, pFilter.datefrom, pFilter.dateto);
- for ( var i = 0;i < entries.length; i++)
- {
- for (var j = 0; j < entries[i].length; j++)
- {
- var entry = entries[i][j];
- if( pFilter.category == "" || text.decodeMS(entry[calendars.CATEGORIES]).indexOf(pFilter.category) > -1 )
- {
- var entr = new Array;
- var start = getDate(entry[calendars.DTSTART]);
- var end = getDate(entry[calendars.DTEND]);
-
- user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
- if(user == null) user = entry[calendars.USER2]["cn"];
- else user = user[tools.TITLE]
- entr[0] = text.encodeMS([ entry[calendars.ID], user, entry[calendars.RECURRENCEID]]);
- if (end < today ) entr[1] ="-6710887" ;
- else if (start > today) entr[1] = "-16777216";
- else entr[1] = "-16744020" ;
- entr[2] = "-1"
- entr[3] = entry[calendars.ATTENDEES].length;
- entr[4] = entry[calendars.DTSTART];
- entr[5] = entry[calendars.DTEND];
- entr[6] = entry[calendars.SUMMARY];
-
- if (!pShortForm)
- {
- entr[7] = getRealName([entry[calendars.ORGANIZER2]]);
- entr[8] = getRealName(entry[calendars.ATTENDEES]);
- entr[9] = getCalendarStatus( entry[calendars.STATUS], pLanguage );
- if (entry[calendars.LINKS] == undefined) entr[10] = "";
- else entr[10] = entry[calendars.LINKS];
- entr[11] = entry[calendars.DESCRIPTION];
- }
- tab.push( entr );
- }
- }
- }
- sortArray(tab, -1, 4, 1, 6 );
- return tab;
-}
-
-/*
- * Liefert den echten Namen anhand des Logins zurück
- *
- * @param {Array}[]} pUserMap req pUserMap
- *
- * @return String
- */
-function getRealName(pUserMap)
-{
- var resultName = [];
- var RealNames = getRealNameObject(pUserMap);
-
- for ( var realname in RealNames ) resultName.push(RealNames[realname]);
- return resultName.join(", \n");
-}
-
-/*
- * Liefert den echten Namen anhand des Logins zurück
- *
- * @param {Array}[]} pUserMap req pUserMap
- *
- * @return Object
- */
-function getRealNameObject(pUserMap)
-{
- var resultObject = {};
- var realname = "";
-
- for ( let i = 0; i < pUserMap.length; i++ )
- {
- let user = tools.getUserByAttribute(tools.CALENDARID, [pUserMap[i]["paramvalue"].substr("mailto:".length)])
- if ( user != null )
- {
- if(vars.exists("$global.firstLastName") && vars.get("$global.firstLastName"))
- realname = user[tools.PARAMS][tools.LASTNAME] + " " + user[tools.PARAMS][tools.FIRSTNAME];
- else realname = user[tools.PARAMS][tools.FIRSTNAME] + " " + user[tools.PARAMS][tools.LASTNAME];
- }
- else //Der User existiert nicht im System
- {
- realname = pUserMap[i]["cn"] + " " + pUserMap[i]["paramvalue"];
- }
- resultObject[pUserMap[i]["cn"]] = realname;
- }
- return resultObject;
-}
-
-
-/*
- * Gibt an ob der User im Calendarobject vorhanden ist
- *
- * @param {Object} pEntry req Calendarobject
- * @param {String} pUser req Title
- *
- * @return Object
- */
-function isAffectedUser( pEntry, pUser)
-{
- var usermap = pEntry[calendars.ATTENDEES];
-
- for ( var i = 0; i < usermap.length; i++ )
- if( usermap[i]["cn"] == pUser )
- return true;
- return false;
-}
-
-/*
- * Liefert das Datum ohne Urzeit zurück
- *
- * @param {String} datetimeIn req DatumZeit
- *
- * @return {date}
- */
-function getDate( datetimeIn )
-{
- if ( datetimeIn != "")
- return datetime.clearTime(datetimeIn);
- else return "";
-}
-
-/*
- * Setzt den Aufgaben-Filter
- *
- * @param {Object} pFilter req
- *
- * @return {image}
- */
-function filterToDo( pFilter )
-{
- var error = true;
- var von = pFilter.datefrom;
- var bis = pFilter.dateto;
- if ( pFilter == "" ) pFilter = reset_filterToDo();
- do
- {
- vars.set("$local.relation_id", pFilter.user);
- vars.set("$local.edt_von", pFilter.datefrom);
- vars.set("$local.edt_bis", pFilter.dateto);
- vars.set("$local.category", pFilter.category);
- vars.set("$local.delegated", pFilter.delegated);
- vars.set("$local.needs_action", pFilter.needs_action);
- vars.set("$local.in_process", pFilter.in_process);
- vars.set("$local.completed", pFilter.completed);
- vars.set("$local.cancelled", pFilter.cancelled);
- var res = swing.askUserQuestion(translate.text("Bitte Filterbedingungen setzen"), "DLG_TASK_FILTER");
- if( res != null )
- {
- pFilter.user = res["DLG_TASK_FILTER.relation_id"];
- pFilter.datefrom = res["DLG_TASK_FILTER.edt_von"];
- pFilter.dateto = res["DLG_TASK_FILTER.edt_bis"];
- pFilter.category = res["DLG_TASK_FILTER.category"];
- pFilter.delegated = res["DLG_TASK_FILTER.delegated"];
- pFilter.needs_action = res["DLG_TASK_FILTER.needs_action"];
- pFilter.in_process = res["DLG_TASK_FILTER.in_process"];
- pFilter.completed = res["DLG_TASK_FILTER.completed"];
- pFilter.cancelled = res["DLG_TASK_FILTER.cancelled"];
- if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
- else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
- }
- else
- {
- pFilter.datefrom = von;
- pFilter.dateto = bis;
- error = false;
- }
- }
- while ( error )
- return pFilter;
-}
-
-/*
- * Setzt den Aufgaben-Filter
- *
- * @param {Object} pFilter req
- *
- * @return {image}
- */
-function filterToDo_Neon( pFilter )
-{
- var error = true;
- var von = pFilter.datefrom;
- var bis = pFilter.dateto;
- if ( pFilter == "" ) pFilter = reset_filterToDo();
- do
- {
- var prompts = {
- FILTER_TEXT: translate.text("Bitte Filterbedingungen setzen"),
- RESPONSIBLE: pFilter.user,
- DATE_FROM: pFilter.datefrom,
- DATE_TO: pFilter.dateto,
- CATEGORY_TODO: pFilter.category,
- DELEGATED: pFilter.delegated,
- NEEDS_ACTION: pFilter.needs_action,
- IN_PROCESS: pFilter.in_process,
- COMPLETED: pFilter.completed,
- CANCELLED: pFilter.cancelled
- }
-
- var buttons = {
- "ok" : translate.text("OK"),
- "": translate.text("Abbrechen")
- };
- var defaultButton = "ok";
-
- var res = question.openDialog("DLG_FILTER_TODO_Neon", prompts, buttons, defaultButton);
-
- if( res.button != null )
- {
- pFilter.user = res.RESPONSIBLE;
- pFilter.datefrom = res.DATE_FROM;
- pFilter.dateto = res.DATE_TO;
- pFilter.category = res.CATEGORY_TODO;
- pFilter.delegated = res.DELEGATED;
- pFilter.needs_action = res.NEEDS_ACTION;
- pFilter.in_process = res.IN_PROCESS;
- pFilter.completed = res.COMPLETED;
- pFilter.cancelled = res.CANCELLED;
- if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
- else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
- }
- else
- {
- pFilter.datefrom = von;
- pFilter.dateto = bis;
- error = false;
- }
- }
- while ( error )
- return pFilter;
-}
-
-
-/*
- * Anzeige des Aufgaben-Filter
- *
- * @param {Object} pFilter req
- *
- * @return string Anzeige
- */
-function show_filterToDo(pFilter)
-{
- var retstring = "";
- var userp = tools.getUser( pFilter.user )[tools.PARAMS];
- if (pFilter.user != "") retstring = (translate.text("Aufgaben von") + " " + userp[tools.FIRSTNAME] + " " + userp[tools.LASTNAME]);
- if (pFilter.datefrom != "") retstring += ", " + datetime.toDate(pFilter.datefrom, translate.text("dd.MM.yyyy"));
- if (pFilter.dateto != "") retstring += " - " + datetime.toDate(pFilter.dateto, translate.text("dd.MM.yyyy"));
- if (pFilter.category != "") retstring += ", " + translate.text("Kategorie") + " " + pFilter.category;
- if (pFilter.delegated == "true") retstring += ", " + translate.text("delegiert");
- if (pFilter.needs_action == "true") retstring += ", " + translate.text("Nicht begonnen");
- if (pFilter.in_process == "true") retstring += ", " + translate.text("In Bearbeitung");
- if (pFilter.completed == "true") retstring += ", " + translate.text("Erledigt");
- if (pFilter.cancelled == "true") retstring += ", " + translate.text("Zurückgestellt");
-
- return retstring
-}
-
-/*
- * Setzt den Aufgaben-Filter zurück
- *
- * @return {filter}
- */
-function reset_filterToDo()
-{
- var today = getDate (vars.getString("$sys.date"));
-
- return pFilter = {
- user: vars.getString("$sys.user"),
- datefrom: String(eMath.subInt(today, 720 * datetime.ONE_DAY)),
- dateto: String(eMath.addInt(eMath.addInt(today, 3 * datetime.ONE_DAY)
- ,datetime.ONE_DAY - datetime.ONE_MINUTE)),
- category: "",
- delegated: "",
- needs_action: "true",
- in_process: "true",
- completed: "",
- cancelled: ""
- };
-}
-
-/*
- * Setzt den Event-Filter
- *
- * @param {Object} pFilter req
- *
- * @return {image}
- */
-function filterEvent( pFilter )
-{
- var error = true;
- var von = pFilter.datefrom;
- var bis = pFilter.dateto;
- if ( pFilter == "" ) pFilter = reset_filterEvent();
- do
- {
- vars.set("$local.relation_id", pFilter.user);
- vars.set("$local.edt_von", pFilter.datefrom);
- vars.set("$local.edt_bis", pFilter.dateto);
- vars.set("$local.category", pFilter.category);
- vars.set("$local.tentative", pFilter.tentative);
- vars.set("$local.confirmed", pFilter.confirmed);
- vars.set("$local.cancelled", pFilter.cancelled);
- vars.set("$local.free", pFilter.free);
- var res = swing.askUserQuestion(translate.text("Bitte Filterbedingungen setzen"), "DLG_EVENT_FILTER");
- if( res != null )
- {
- pFilter.user = res["DLG_EVENT_FILTER.relation_id"];
- pFilter.datefrom = res["DLG_EVENT_FILTER.edt_von"];
- pFilter.dateto = res["DLG_EVENT_FILTER.edt_bis"];
- pFilter.category = res["DLG_EVENT_FILTER.category"];
- pFilter.tentative = res["DLG_EVENT_FILTER.tentative"];
- pFilter.confirmed = res["DLG_EVENT_FILTER.confirmed"];
- pFilter.cancelled = res["DLG_EVENT_FILTER.cancelled"];
- pFilter.free = res["DLG_EVENT_FILTER.free"];
- if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
- else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
- }
- else
- {
- pFilter.datefrom = von;
- pFilter.dateto = bis;
- error = false;
- }
- }
- while ( error )
- return pFilter;
-}
-
-/*
- * Setzt den Event-Filter
- *
- * @param {Object} pFilter req
- *
- * @return {image}
- */
-function filterEvent_Neon( pFilter )
-{
- var error = true;
- var von = pFilter.datefrom;
- var bis = pFilter.dateto;
- if ( pFilter == "" ) pFilter = reset_filterEvent();
- do
- {
- var buttons = {
- "ok" : translate.text("OK"),
- "": translate.text("Abbrechen")
- };
- var defaultButton = "ok";
-
- var prompts = {
- FILTER_TEXT: translate.text("Bitte Filterbedingungen setzen"),
- RESPONSIBLE_APPOINTMENT: pFilter.user,
- DATE_FROM: pFilter.datefrom,
- DATE_TO: pFilter.dateto,
- CATEGORY_APPOINTMENT: pFilter.category,
- TENTATIVE: pFilter.tentative,
- CONFIRMED: pFilter.confirmed,
- CANCELLED: pFilter.cancelled
- }
- var res = question.openDialog("DLG_FILTER_APPOINTMENT_Neon", prompts, buttons, defaultButton);
- if( res.button != null )
- {
- pFilter.user = res.RESPONSIBLE_APPOINTMENT;
- pFilter.datefrom = res.DATE_FROM;
- pFilter.dateto = res.DATE_TO;
- pFilter.category = res.CATEGORY_APPOINTMENT;
- pFilter.tentative = res.TENTATIVE;
- pFilter.confirmed = res.CONFIRMED;
- pFilter.cancelled = res.CANCELLED;
- if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
- else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
- }
- else
- {
- pFilter.datefrom = von;
- pFilter.dateto = bis;
- error = false;
- }
- }
- while ( error )
- return pFilter;
-}
-
-/*
- * Anzeige des Event-Filter
- *
- * @param {Object} pFilter req
- *
- * @return string Anzeige
- */
-function show_filterEvent(pFilter)
-{
- var retstring = "";
-
- var userp = tools.getUser( pFilter.user )[tools.PARAMS];
- if (pFilter.user != "") retstring = translate.text("Termine von") + " " + userp[tools.FIRSTNAME] + " " + userp[tools.LASTNAME];
- if (pFilter.datefrom != "") retstring += ", " + datetime.toDate(pFilter.datefrom, translate.text("dd.MM.yyyy"));
- if (pFilter.dateto != "") retstring += " - " + datetime.toDate(pFilter.dateto, translate.text("dd.MM.yyyy"));
- if (pFilter.category == "true") retstring += ", " + translate.text("Kategorie") + " " + pFilter.category;
- if (pFilter.tentative == "true") retstring += ", " + translate.text("Vorläufig");
- if (pFilter.confirmed == "true") retstring += ", " + translate.text("Bestätigt");
- if (pFilter.cancelled == "true") retstring += ", " + translate.text("Abgesagt");
-
- return retstring
-}
-
-/*
- * Setzt den Event-Filter zurück
- *
- * @return {filter}
- */
-function reset_filterEvent()
-{
- var today = getDate (vars.getString("$sys.date"));
-
- return pFilter = {
- user: vars.getString("$sys.user"),
- datefrom: String(today), //nur die Termine ab heute anzeigen,
- //die von vor einer Woche sind uninteressant
- dateto: String(eMath.addInt(eMath.addInt(today, datetime.ONE_WEEK)
- ,datetime.ONE_DAY - datetime.ONE_MINUTE)),
- category: "",
- tentative: "true",
- confirmed: "true",
- cancelled: "",
- free: "true"
- };
-}
-
-/*
- * Setzt den Aufgaben-Filter in Tab Aufgaben
- *
- * @return {image}
- */
-function filterLinkedToDo()
-{
- var filtervalues = ["", "false"];
- vars.set("$local.CalenderUser", getCalenderUser( calendars.RIGHT_READ_TASK ));
-
- //Vorbelegen der Werte, wenn bereits gewählt wurde:
- if(vars.exists("$image.FilterValuesT"))
- {
- filtervalues = vars.get("$image.FilterValuesT");
- vars.set("$local.relation_id", filtervalues[0]);
- vars.set("$local.done", filtervalues[1]);
- }
-
- var res = swing.askUserQuestion(translate.text("Bitte Filterbedingungen setzen"), "DLG_TASK_DATE_LINKED_FILTER");
-
- if( res != null && res != undefined && res != "")
- {
- filtervalues[0] = res["DLG_TASK_DATE_LINKED_FILTER.relation_id"];
- filtervalues[1] = res["DLG_TASK_DATE_LINKED_FILTER.done"]
- }
- vars.set("$image.FilterValuesT", filtervalues );
-
- return(filtervalues);
-}
-
-/*
- * Setzt den Aufgabe-Filter zurück
- *
- * @return {image}
- */
-function resetfilterLinkedToDo()
-{
- var filtervalues = ["", "false"];
-
- vars.set("$image.FilterValuesT", filtervalues );
-
-}
-
-/*
- * setzt die Kalenderrechte
- *
- * @return {void}
- */
-function setCalendarGrant()
-{
- calendars.resetCalendarUser();
- var user_read_todo = [];
- var user_write_todo = []; // ["Admin"]
- var user_read_event = [];
- var user_write_event = [];
- var tree = {};
- var data = db.table("select THEMEID, THEME.THEME_ID, LOGIN, STATUS from THEME "
- + " left join EMPLOYEE on EMPLOYEE.THEME_ID = THEMEID left join RELATION on RELATION_ID = RELATIONID and STATUS = 1"
- +" where KIND = 2");
- for ( let i = 0; i < data.length; i++)
- {
- if ( tree[data[i][0]] == undefined ) tree[data[i][0]] = {
- pid: data[i][1],
- isuser: false
- };
- if ( data[i][2] != "" && data[i][3] != "" ) tree[data[i][2]] = {
- pid: data[i][0],
- isuser: true
- };
- }
-
- var user = vars.getString("$sys.user");
- // Lese- und Schreibrechte auf Kalender aus Datentabelle holen
- data = db.table("select HASRIGHTFOR, TODO_RIGHTS, EVENT_RIGHTS from AOSYS_CALENDAR_RIGHTS where LOGIN = '" + user + "'");
- for ( var i = 0; i < data.length; i++ )
- if(tree[data[i][0]] != undefined)
- tree[data[i][0]].grants = data[i].slice(1);
-
- for ( login in tree )
- {
- if( tree[login].isuser )
- {
- var grantstodo = __getGrants( login, 0 );
- var grantsevent = __getGrants( login, 1 );
- if ( grantstodo.length + grantsevent.length > 0 )
- {
- if ( grantstodo == "1" || grantstodo == "3") user_read_todo.push(login);
- if ( grantstodo == "2" || grantstodo == "3") user_write_todo.push(login);
- if ( grantsevent == "1" || grantsevent == "3") user_read_event.push(login);
- if ( grantsevent == "2" || grantsevent == "3") user_write_event.push(login);
- }
- }
- }
- calendars.setCalendarUser(user_read_todo, calendars.RIGHT_READ_TASK, true, calendars.SORTSTRATEGY_NATURAL );
- calendars.setCalendarUser(user_write_todo, calendars.RIGHT_WRITE_TASK, true, calendars.SORTSTRATEGY_NATURAL );
- calendars.setCalendarUser(user_read_event, calendars.RIGHT_READ_APPOINTMENT, true, calendars.SORTSTRATEGY_NATURAL );
- calendars.setCalendarUser(user_write_event, calendars.RIGHT_WRITE_APPOINTMENT, true, calendars.SORTSTRATEGY_NATURAL );
-
- //********** Ressourcen in Kalender einfügen ************
- var ressource = tools.getUsersWithRole("PROJECT_Ressource");
- calendars.setCalendarUser( ressource, calendars.RIGHT_READ_APPOINTMENT | calendars.RIGHT_WRITE_APPOINTMENT );
-
- //add all users from support-role since support-action-tasks (sp_supportAktionen) generates tasks for all support-role members
- //and if you're a member you are allowed to edit these
- if (tools.hasRole(user, "PROJECT_Support"))
- {
- var support = tools.getUsersWithRole("PROJECT_Support");
- calendars.setCalendarUser( support, calendars.RIGHT_WRITE_TASK | calendars.RIGHT_READ_TASK );
- }
-
- function __getGrants( pKey, pIndex )
- {
- var grants = [];
- if ( tree[pKey].grants != undefined && tree[pKey].grants[pIndex]) grants = tree[pKey].grants[pIndex];
- else if ( tree[pKey].pid != "" ) grants = __getGrants( tree[pKey].pid, pIndex );
- return grants;
- }
-}
-
-/*
- * setzt Recht für alle Kalender
- *
- * @return {void}
- */
-function setAllCalendarGrant()
-{
- calendars.resetCalendarUser();
- var users = tools.getStoredUsers();
- var calendar_user = [];
- for ( var i = 0; i < users.length; i++ ) calendar_user.push( users[i][1] );
- calendars.setCalendarUser(calendar_user, calendars.RIGHT_READ_TASK | calendars.RIGHT_WRITE_TASK, false, calendars.SORTSTRATEGY_NATURAL );
-}
-
-/*
- * gibt die Logins der user, die den übergebenen User als Attribute eingetragen haben, zurück
- *
- * @param {[]} pUsers req Logins
- * @param {String []} pAttrName req AttributeName für Employee
- * @param {String []} pFields opt
- *
- * @return {String []} Logins
- */
-function getUsersbyAttr( pUsers, pAttrName, pFields )
-{
- if (typeof(pAttrName) == "string") pAttrName = [pAttrName]
-
- if ( pFields == undefined )
- {
- pFields = ["LOGIN"];
- }
-
- var sqlstr = "select " + pFields.join(", ") + " from ATTRLINK join ATTR on ATTRLINK.ATTR_ID = ATTRID and OBJECT_ID = 12 "
- + "and ATTRNAME in ('" + pAttrName.join("','") + "') "
- + " join EMPLOYEE on EMPLOYEEID = ATTRLINK.ROW_ID join RELATION on RELATION_ID = RELATIONID join PERS on PERS_ID = PERSID"
- + " where VALUE_ID in (select EMPLOYEEID from EMPLOYEE where LOGIN in ('" + pUsers.join("','") + "'))"
- + "";
-
- if(pFields.length == 1)
- return db.array(db.COLUMN, sqlstr);
- else
- return db.table(sqlstr);
-}
-
-/*
- * Gibt die Anzahl der verknüpften Aufgaben und Termine zurück.
- *
- * @param {String} pID req
- * @param {String} pFrame req
- *
- * @return {String} text
- */
-function countLinkedTodoEvent(pID, pFrame)
-{
- var today = getDate (vars.getString("$sys.date"));
- var datefrom = String(today);
- var dateto = String(eMath.addInt(today, datetime.ONE_WEEK));
-
- var str = "select count(distinct ELEMENTUID) from ASYS_CALENDARLINK join ASYS_CALENDARBACKEND on ELEMENTUID = ASYS_CALENDARLINK.ENTRYID "
- + " where FRAME = 'comp." + pFrame + "' and ELEMENTUID is not null and DBID = '" + pID + "'";
- var rettask = db.cell(str + "and ENTRYTYPE = " + calendars.VTODO + " and STATUS in ('"
- + mapCalendarStatus(calendars.STATUS_NEEDSACTION, calendars.getBackendTypeTasks() ) + "', '"
- + mapCalendarStatus(calendars.STATUS_INPROCESS, calendars.getBackendTypeTasks() ) + "')");
-
- var eventStatusList = [
- mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() )
- ,mapCalendarStatus(calendars.STATUS_TENTATIVE, calendars.getBackendType() )
- ];
-
- if (calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
- eventStatusList.push(calendars.STATUS_FREE);
-
- var retevent = db.cell([str + " and ENTRYTYPE = " + calendars.VEVENT + " and STATUS in ('" + eventStatusList.join("', '") + "')"
- + " and DTSTART >= ? and DTEND <= ?",
- [ [ String(datefrom), SQLTYPES.DATE ], [String(dateto), SQLTYPES.DATE ] ]]);
-
- result.string(translate.withArguments("&Aufg / Term (%0/%1)", [rettask, retevent]));
-}
-
-/*
- * Gibt die Anzahl der verknüpften Aufgaben zurück.
- *
- * @param {String} pID req
- * @param {String} pFrame req
- *
- * @return {String} text
- */
-function countLinkedTodo(pID, pFrame)
-{
- var str = "select count(distinct ELEMENTUID) "
- + "from ASYS_CALENDARLINK "
- + "join ASYS_CALENDARBACKEND on ELEMENTUID = ASYS_CALENDARLINK.ENTRYID "
- + " where FRAME = 'comp." + pFrame + "' "
- + "and ELEMENTUID is not null and DBID = '" + pID + "'";
-
- var rettask = db.cell(str + "and ENTRYTYPE = " + calendars.VTODO
- + " and STATUS in ('"
- + mapCalendarStatus(calendars.STATUS_NEEDSACTION, calendars.getBackendTypeTasks() ) + "', '"
- + mapCalendarStatus(calendars.STATUS_INPROCESS, calendars.getBackendTypeTasks() ) + "')"
- + "");
-
- result.string(translate.withArguments("&Aufgaben (%0)", [rettask]));
-}
-
-/*
- * Gibt die Überschneidungen von Termine zurück.
- *
- * @param {Date} pStart req
- * @param {Date} pEnd req
- * @param {Array} pUsers req
- *
- * @return {String Array} Termine
- */
-function getOverlappingEvents(pStart, pEnd, pUsers )
-{
- var resultEvents = new Array();
- var users = pUsers;
- if (calendars.getBackendType() == calendars.BACKEND_DB && pStart != "" && pEnd != "" && users.length > 0)
- {
- calendars.clearCache();
- for (var u = 0; u < users.length; u++)
- {
- var localuid = vars.get("$image.entry")[calendars.ID]
- var condition = new Array();
- condition["COUNT"] = "1";
- condition["TYPE_1"] = calendars.VFREEBUSY;
- condition["USER_1"] = users[u][0];
- condition["START_1"] = pStart;
- condition["END_1"] = pEnd;
-
- var fbsall = calendars.getEntries(condition);
- for (var j = 0; j < fbsall.length; j++)
- {
- var fbs = fbsall[j];
- for (var i = 0; i < fbs.length; i++)
- {
- var next = fbs[i];
- var uid = next[calendars.ID];
- var sum = next[calendars.SUMMARY];
- if (uid != localuid)
- {
- var freebusy = next[calendars.FREEBUSY];
- var freebusyDec = text.decodeMS(freebusy);
- var match = false;
- for (var k = 0; k < freebusyDec.length; k++)
- {
- var freebusyInstance = text.decodeMS(freebusyDec[k]);
- if (!freebusyInstance[0].equals("FREE"))
- {
- match = true;
- }
- }
- if (match) resultEvents.push([users[u][2], sum != null && sum.length > 0 ? sum : "?", uid]);
- }
- }
- }
- }
- }
- return resultEvents;
-}
-
-/*
- * Überprüft den Eintrag, wenn eine neue Aufgaben angelegt wird darauf, ob private Aufgaben für andere erstellt werden
- *
- * @param {String[]} pUser die Liste der User, denen die Aufgabe zugewiesen werden soll
- * @param {String} pClassification die Klassifizierung der Aufgabe - "PRIVATE"
- *
- * @return {Boolean} ob der Eintrag in der Konstellation möglich ist, wenn nicht wird eine Meldung ausgegeben
- */
-function checkEntry(pUser, pClassification )
-{
- if( pClassification == "PRIVATE" &&
- ( pUser.length > 1 || text.decodeMS(pUser[0][0])[1] != "CN:" + vars.getString("$sys.user")))
- {
- question.showMessage(translate.text("Eine private Aufgabe kann nicht jemand anderem zugewiesen werden."));
- return false;
- }
- else
- {
- return true;
- }
-}
-
-/*
- * Verschiebt ein Calendareintrag
- *
- * @param {String[]} pIDs req die zu verschiebenden Ids mit den Calenderinformationen (Multistring)
- * @param {String} pTblCompName opt die Komponente die aktualisiert werden soll
- *
- * @return {void}
- */
-function shiftEntry(pIDs, pTblCompName)
-{
- var datenew = swing.askUserQuestion(translate.text("Verschieben auf Datum?"), "DLG_DATE");
- if (datenew != null )
- {
- var grantedUsers = calendars.getDisplayCalendarUsers(calendars.RIGHT_WRITE_TASK);
- var usermap = {};
- var granted = true;
- for (let i = 0; i < grantedUsers.length; i++)
- {
- usermap[grantedUsers[i][1]] = true;
- }
-
- datenew = datetime.clearTime(datenew["DLG_DATE.Edit_date"]);
- if (datenew <= vars.getString("$sys.today"))
- question.showMessage(translate.text("nur Verschiebung in die Zukunft erlaubt!"));
- else
- {
- for (var i = 0, j = pIDs.length; i < j; i++)
- {
- var id = text.decodeMS(pIDs[i]);
- var entry = calendars.getEntry(id[0], null, id [1], calendars.VTODO);
- var affectedUsers = entry[calendars.ATTENDEES];
-
- granted = hasGrantForEntryByObject(affectedUsers, usermap);
- if(granted)
- {
- //Zeitdifferenz von Aufgabenstart und -ende
- var dateDiff = eMath.subInt(entry[calendars.DUE], entry[calendars.DTSTART]);
-
- //Startzeit der Aufgabe
- var startTime = eMath.subInt(entry[calendars.DTSTART]
- , datetime.clearTime(entry[calendars.DTSTART]));
-
- entry[calendars.DTSTART] = eMath.addInt(datenew, startTime);
- entry[calendars.DUE] = eMath.addInt(entry[calendars.DTSTART], dateDiff);
- calendars.update( [ entry ] );
- }
- else
- question.showMessage(translate.text("Keine Berechtigung zum Verschieben der Aufgabe"));
- }
- }
- }
-}
-
-/*
- * Gibt eine Aufgabe weiter
- *
- * @param {String} pIDs die ID der Aufgabe, welche weitergegeben werden soll
- * @param {String} pTblCompName die Komponente der Aufgaben, die aktualisiert werden soll
- *
- * @return {void}
- */
-function handOverToDo(pIDs, pTblCompName)
-{
- var calendar_user = "";
- var users = getCalenderUser( calendars.RIGHT_WRITE_TASK );
- var publicCount = 0;
- var privateCount = 0;
- var notGrantedCount = 0;
-
- var grantedUsers = calendars.getDisplayCalendarUsers(calendars.RIGHT_WRITE_TASK);
- var userMap = {};
- var granted = true;
- for (let i = 0; i < grantedUsers.length; i++)
- {
- userMap[grantedUsers[i][1]] = true;
- }
-
- if (pIDs.length == 1) // only one todo and private
- {
- var id = text.decodeMS( pIDs[0] );
- var entry = calendars.getEntry( id[0], null, id[1] );
- if(entry[calendars.CLASSIFICATION] == calendars.CLASSIFICATION_PRIVATE)
- {
- question.showMessage(translate.text("Kein Weitergeben von privaten Aufgaben möglich!"));
- return;
- }
- }
-
- for ( let i = 0; i < users.length; i++) if (pIDs.length > 0 || users[i][0] != id[1]) calendar_user += "|" + users[i][1];
- var selection = swing.askQuestion(translate.text("Benutzer auswählen"), swing.QUESTION_COMBOBOX, calendar_user);
- if (selection != null)
- {
- for ( let i = 0; i < users.length; i++)
- {
- if ( selection == users[i][1] )
- {
- selection = users[i];
- break;
- }
- }
- for( let i = 0; i < pIDs.length; i++)
- {
- let id = text.decodeMS( pIDs[i] );
- let entry = calendars.getEntry( id[0], null, id[1] );
- if(entry[calendars.CLASSIFICATION] == calendars.CLASSIFICATION_PRIVATE) privateCount++;
- else //Nur öffentliche Aufgabe kann weiter gegeben werden.
- {
- // User austauschen
- var usermap = entry[calendars.ATTENDEES];
- var affectedusers = [];
-
- granted = hasGrantForEntryByObject(usermap, userMap);
-
- for (var ui = 0; ui < usermap.length; ui++)
- {
- var login_cn = usermap[ui]["cn"];
- var user = tools.getUserByAttribute(tools.CALENDARID, usermap[ui]["paramvalue"].substr("mailto:".length))
- if (user == null) user = login_cn;
- else user = user[tools.TITLE]
-
- if ( user == id[1] ) affectedusers.push(selection[0]);
- else if ( user != selection[0] ) affectedusers.push(user);
- }
- if(granted)
- {
- entry[calendars.AFFECTEDUSERS] = text.encodeMS(calendars.getCalendarUsers(affectedusers));
- calendars.update([entry]);
- publicCount++;
- }
- else notGrantedCount++
- }
- }
- question.showMessage(translate.withArguments("%0 Aufgabe(n) erfolgreich weitergegeben an: %1"
- + (privateCount == 0 ? "" : "\n%2 private Aufgabe(n) können nicht weitergegeben werden.")
- +(notGrantedCount == 0 ? "" : "\n%3 Aufgabe(n) können aufgrund fehlender Berechtigung nicht weitergegeben werden."),
- [publicCount, selection[1], privateCount, notGrantedCount]));
-
- }
-}
-
-// ToDo prüfen !!
-/*
- * Verschiebt die Kalendereinträge bei Login-Änderung
- *
- * @param {String} pNewlogin req
- * @param {String} pOldlogin req
- * @param {String} pNewCalendarID req
- * @param {String} pOldCalendarID req
- *
- * @return {void}
- */
-function moveCalendarData ( pNewlogin, pOldlogin, pNewCalendarID, pOldCalendarID )
-{
- var newcaluser = text.encodeMS(["mailto:" + pNewCalendarID, "CN:" + pNewlogin]);
- var oldcaluser = text.encodeMS(["mailto:" + pOldCalendarID, "CN:" + pOldlogin]);
- db.runStatement("update ASYS_CALENDARBACKEND set OWNER = '" + newcaluser + "' where OWNER = '" + oldcaluser + "'");
- db.runStatement("update ASYS_CALENDARBACKEND set ORGANIZER = '" + newcaluser + "' where ORGANIZER = '" + oldcaluser + "'");
-
- if(pNewCalendarID != pOldCalendarID) //Nur wenn sich die E-Mailadresse geändert hat
- {
- //Messenger-Historien
- db.runStatement("update ASYS_XMPP_HISTORY set JID_FROM = '" + pNewCalendarID +"' where JID_FROM = '" + pOldCalendarID +"'", "_____SYSTEMALIAS");
- db.runStatement("update ASYS_XMPP_HISTORY set JID_TO = '" + pNewCalendarID +"' where JID_TO = '" + pOldCalendarID +"'", "_____SYSTEMALIAS");
- }
-}
-
-/*
- * Löst den CalenderUser in lesbarer From auf
- *
- * @param {String} pValue req
- *
- * @return {String} übersetzten Wert
- */
-function getCalUser( pValue )
-{
- var realname = pValue;
- var user = tools.getUser( text.decodeMS(pValue)[1].split(":")[1] );
- if ( user != null )
- {
- realname = user[tools.PARAMS][tools.FIRSTNAME] + " " + user[tools.PARAMS][tools.LASTNAME];
- }
- return realname;
-}
-
-/*
- * Gibt den Login eines CalenderUser zurück
- *
- * @param {String} pCalendarUser req
- *
- * @return {String} Title
- */
-function getTitleCalenderUser( pCalendarUser )
-{
- var data = text.decodeMS(pCalendarUser)
- for ( var i = 0; i < data.length; i++ )
- {
- //if login changes we have to check calendarid
- if ( data[i].substr(0, "mailto:".length).toUpperCase() == "MAILTO:" )
- {
- var user = tools.getUserByAttribute(tools.CALENDARID, [data[i].substr("mailto:".length)]);
- if (user != null )
- return user[tools.TITLE];
- }
-
- if ( data[i].substr(0, 3).toUpperCase() == "CN:" )
- return data[i].substr(3);
- }
- return "";
-}
-
-
-/*
- * Gibt den richtigen Status zum Prüfen je nach Backend zurück
- *
- *
- * @param {String} pStatus req die konstante für den zu prüfenden status,
- * z.B. calendars.STATUS_INPROCESS
- *
- * @param {String} pCalendarType req die konstante für den typen des Termin- oder Aufgabenbackends,
- * z.B. calendars.BACKEND_DB
- *
- * @return {String} Konstanten für den Kalender (Backend-Typen), gibt es den status im backend nicht
- * wird null geliefert
- */
-function mapCalendarStatus(pStatus, pCalendarType)
-{
- switch (pCalendarType)
- {
- //case calendars.BACKEND_EXCHANGE:
- case calendars.BACKEND_EXCHANGEWS:
- if (pStatus == calendars.STATUS_CONFIRMED)
- return calendars.STATUS_BUSY;
- else
- return pStatus;
- default:
- if (pStatus == calendars.STATUS_OOF)//nur bei exchange
- return null;
- else
- return pStatus;
- }
-}
-
-/*
- * Sets the imagevariable with affectedusers
- *
- * @param {Object} pEntry req the Entry of Tasks or Appointments
- *
- * @return {void}
- *
- */
-function setAffectedUsersImage(pEntry)
-{
- var affectedUsers = [];
- var usermap = pEntry[calendars.ATTENDEES];
- var realnames = getRealNameObject(usermap);
-
- for ( var i = 0; i < usermap.length; i++ )
- {
- affectedUsers.push([ text.encodeMS( [usermap[i]["paramvalue"], "CN:" + usermap[i]["cn"]] ), realnames[usermap[i]["cn"]] ]);
- }
-
- vars.set("$image.affectedusers", affectedUsers);
- return affectedUsers;
-}
-
-/*
- * Opens calendar links
- *
- * @param {String} pEntryID req the ID of the link
- *
- * @return {void}
- *
- */
-function openCalendarLinks(pEntryID)
-{
- var openFramesObj = {};
- if (typeof(pEntryID) == "object")
- openFramesObj = pEntryID;
- else
- {
- var links = db.table("SELECT FRAME, DBIDCOLUMN, DBID FROM ASYS_CALENDARLINK WHERE ENTRYID = '" + pEntryID + "'");
- for (var i = 0; i < links.length; i++)
- {
- var frame = links[i][0].substr( 5 );//remove comp. so the frame can be opened with openFrame
- if ( openFramesObj[frame] == undefined ) openFramesObj[frame] = {
- IDField: links[i][1],
- IDs: []
- };
- openFramesObj[frame].IDs.push(links[i][2]);
- }
- }
-
- for ( frame in openFramesObj)
- {
- var condition = openFramesObj[frame].IDField + " in ('" + openFramesObj[frame].IDs.join("', '") + "')";
- var framemode = openFramesObj[frame].IDs.length > 1 ? swing.FRAMEMODE_TABLE_SELECTION : swing.FRAMEMODE_SHOW;
-
- if ( vars.getString("$global.upwardLink") == "link")
- {
- swing.openLinkedFrame(frame, condition, swing.WINDOW_CURRENT, framemode, "", null, false, {
- autoclose: true
- } );
- }
- else
- {
- swing.openFrame(frame, condition, swing.WINDOW_CURRENT, framemode, null, false);
- }
- }
-}
-
-/**
- * Returns the "real" calendar system/backend type (BackendType & SyncBackendType)
- *
- * @param {Number} pScope - The needed scope (e.g. "calendars.VEVENT", "calendars.VTODO")
- * @return {Number} - The backend type (calendars.BACKEND_*)
- */
-function getCalendarSystemType (pScope)
-{
- // Check sync backend type
- if (calendars.getSyncBackendType() != calendars.BACKEND_NONE && calendars.getSyncBackendType() != 3)
- {
- var scope = calendars.getSyncBackendTypeScope();
- if (scope.length == 1 && scope[0] == pScope) // Scope.length = 1 -> VEVENT *OR* VTODO
- return calendars.getSyncBackendType();
- else if (scope.length == 2) // Scope.length = 2 -> Both
- return calendars.getSyncBackendType();
- // Scope.length = 0 -> Nothing selected -> Skip this block
- }
-
- // Fallback to backend type (event)
- if (calendars.getBackendType() != calendars.BACKEND_NONE && pScope === calendars.VEVENT)
- return calendars.getBackendType();
-
- // Second fallback to backend type (todo)
- if (calendars.getBackendTypeTasks() != calendars.BACKEND_NONE && pScope === calendars.VTODO)
- return calendars.getBackendTypeTasks();
-
- // Everything is none
- return calendars.BACKEND_NONE;
-}
-
-function hasGrantForEntryByMS(pAffectedUsers, pUserMap)
-{
- for (let i = 0; i < pAffectedUsers.length; i++)
- {
- var calUser = getTitleCalenderUser( pAffectedUsers[i][0]);
- if(pUserMap[calUser] == undefined)
- {
- return false;
- break;
- }
- else
- return true;
- }
-}
-
-function hasGrantForEntryByObject(pAffectedUsers, pUserMap)
-{
- for (let i = 0; i < pAffectedUsers.length; i++)
- {
- calUser = tools.getUserByAttribute(tools.CALENDARID, pAffectedUsers[i]["paramvalue"].substr("mailto:".length))
- if (calUser == null) calUser = pAffectedUsers[i]["cn"];
- else calUser = calUser[tools.TITLE]
- if(pUserMap[calUser] == undefined)
- {
- return false;
- break;
- }
- else
- return true;
- }
-}
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.translate");
+import("system.datetime");
+import("system.swing");
+import("system.eMath");
+import("system.calendars");
+import("system.logging");
+import("system.tools");
+import("system.text");
+import("system.question");
+import("system.SQLTYPES");
+import("system.result");
+import("Util_lib");
+import("system.util")
+
+
+/**
+ * @class
+ **/
+function CalendarUtil(){}
+
+
+/*
+ * Erzeugt und öffnet ein neues Aufgabenobjekt (mit einem Link).
+ *
+ * @param {String} pSummary opt die Zusammenfassung
+ * @param {String} pDescription opt die Beschreibung
+ * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
+ * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
+ * pWithLink[1]: ID des angezeigten Datensatzes
+ * pWithLink[2]: Verknüpfungstitel
+ * @param {String} pUser opt der Benutzer ( Login )
+ * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
+ * @param {date} pStart opt Beginn der Aufgabe
+ * @param {date} pDuration opt Dauer
+ * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
+ * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
+ * @param {Array{[]} pComps4Refresh opt die zu aktualisierenden Komponenten
+ *
+ * @return {void}
+ */
+CalendarUtil.newTodo = function(pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pComps4Refresh)
+{
+ var todo = createEntry( calendars.VTODO, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus );
+ var prompts = [];
+ prompts["comp4refresh"] = [];
+
+ if (pComps4Refresh == undefined)
+ pComps4Refresh = ["$comp.Aufgabe", "$comp.tbl_Aufgabe"];
+
+ for (var i = 0; i < pComps4Refresh.length; i++)
+ {
+ if ( vars.exists(pComps4Refresh[i])) prompts["comp4refresh"].push(pComps4Refresh[i]);
+ }
+ if(vars.getString("$sys.scope") == "vaadin")
+ neon.openCalendarEntry([todo], null, neon.OPERATINGSTATE_NEW, null)
+ else
+ {
+ if (vars.exists("$sys.currentwindow"))
+ prompts["window"] = vars.getString("$sys.currentwindow");
+ if (vars.exists("$sys.currentimage"))
+ prompts["image"] = vars.getString("$sys.currentimage");
+
+ swing.openCalendarEntry([todo], null, false, prompts);
+ }
+}
+
+/*
+ * Erzeugt eine neue Aufgabe (mit einem Link).
+ *
+ * @param {String} pSummary opt die Zusammenfassung
+ * @param {String} pDescription opt die Beschreibung
+ * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
+ * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
+ * pWithLink[1]: ID des angezeigten Datensatzes
+ * pWithLink[2]: Verknüpfungstitel
+ * @param {String} pUser opt der Benutzer ( Login )
+ * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
+ * @param {date} pStart opt Beginn der Aufagebe
+ * @param {integer} pGroupType opt ( calendars.GROUP_SINGLE , calendars.GROUP_MULTI )
+ * @param {date} pDuration opt Dauer
+ * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
+ * @param {String} pStatus opt Status der Aufgabe ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
+ * @param {String} pPriority opt Priorität der Aufgabe
+ * @param {String} pReminder opt Erinnerung der Aufgabe
+ *
+ * @return {void}
+ */
+
+CalendarUtil.newSilentTodo = function(pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pGroupType, pCategory, pStatus, pPriority, pReminder)
+{
+ if ( pGroupType == undefined ) pGroupType = calendars.GROUP_SINGLE;
+ var todo = createEntry( calendars.VTODO, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pPriority, pReminder );
+
+ return calendars.insert([todo],calendars.GROUP_SINGLE);
+}
+
+/*
+ * Erzeugt und öffnet ein neues Terminnobjekt mit einem Link.
+ *
+ * @param {String} pSummary opt die Zusammenfassung
+ * @param {String} pDescription opt die Beschreibung
+ * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
+ * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
+ * pWithLink[1]: ID des angezeigten Datensatzes
+ * pWithLink[2]: Verknüpfungstitel
+ * @param {String} pUser opt der Benutzer ( Login )
+ * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
+ * @param {date} pStart opt Beginn der Aufagebe
+ * @param {date} pDuration opt Dauer
+ * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
+ * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
+ * @param {Array{[]} pComps4Refresh opt die zu aktualisierenden Komponenten
+ *
+ * @return {void}
+ */
+CalendarUtil.newEvent = function( pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pComps4Refresh, pWorklistId)
+{
+ var event = createEntry( calendars.VEVENT, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus );
+
+ var prompts = [];
+ prompts["comp4refresh"] = [];
+ if (pComps4Refresh == undefined)
+ pComps4Refresh = ["$comp.Aufgabe", "$comp.tbl_Termine"];
+ for (i = 0; i < pComps4Refresh.length; i++)
+ {
+ if ( vars.exists(pComps4Refresh[i])) prompts["comp4refresh"].push(pComps4Refresh[i]);
+ }
+
+ if(vars.getString("$sys.scope") == "vaadin")
+ neon.openCalendarEntry([event],"", neon.OPERATINGSTATE_NEW, null)
+ else
+ {
+ prompts["window"] = vars.getString("$sys.currentwindow");
+ prompts["image"] = vars.getString("$sys.currentimage");
+ if (pWorklistId != undefined)
+ prompts["worklistId"] = pWorklistId;
+ swing.openCalendarEntry([event], null, false, prompts);
+ }
+}
+
+
+/*
+ * Erzeugt einen neuen Termineintrag (mit einem Link).
+ *
+ * @param {String} pSummary opt die Zusammenfassung
+ * @param {String} pDescription opt die Beschreibung
+ * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
+ * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
+ * pWithLink[1]: ID des angezeigten Datensatzes
+ * pWithLink[2]: Verknüpfungstitel
+ * @param {String} pUser opt der Benutzer ( Login )
+ * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( Login )
+ * @param {date} pStart opt Beginn des Termins
+ * @param {date} pDuration opt Dauer
+ * @param {integer} pGroupType opt ( calendars.GROUP_SINGLE , calendars.GROUP_MULTI )
+ * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
+ * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
+ * @param {String} pReminder opt Erinnerung des Termins
+ *
+ * @return {void}
+ */
+CalendarUtil.newSilentEvent = function( pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pGroupType, pCategory, pStatus, pReminder)
+{
+ if ( pGroupType == undefined ) pGroupType = calendars.GROUP_SINGLE;
+ var event = createEntry( calendars.VEVENT, pSummary, pDescription, pWithLink, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, undefined, pReminder );
+ return calendars.insert( [event] , pGroupType );
+}
+
+/*
+ * Erzeugt ein neues Aufgaben- / Termin-Objekt (mit einem Link).
+ *
+ * @param {date} pType req Augabe oder Termin ( calendars.VTODO, calendars.VEVENT )
+ * @param {String} pSummary opt die Zusammenfassung
+ * @param {String} pDescription opt die Beschreibung
+ * @param {Boolean} pWithLink opt TRUE legt eine Verknüpfung zu $image.frametable
+ * @param {String[][]} pWithLink opt pWithLink[0]: Name des Frames
+ * pWithLink[1]: ID des angezeigten Datensatzes
+ * pWithLink[2]: Verknüpfungstitel
+ * @param {String} pUser opt der Benutzer ( Login )
+ * @param {[]} pAffectedUsers opt die betroffenen Benutzer ( [ Login ] )
+ * @param {date} pStart opt Beginn
+ * @param {date} pDuration opt Dauer
+ * @param {integer} pCategory opt ( calendars.CATEGORIES , encoded(String) z.B.: text.encodeMS(["Service"]) )
+ * @param {String} pStatus opt Status des Termins ( calendars.STATUS_TENTATIVE, calendars.STATUS_CONFIRMED, calendars.STATUS_CANCELLED )
+ * @param {String} pPriority opt Priorität
+ * @param {String} pReminder opt Erinnerung
+ *
+@return {Object} das EntryObjekt
+ */
+CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, pAppLinkContext, pAppLinkId, pUser, pAffectedUsers, pStart, pDuration, pCategory, pStatus, pPriority, pReminder )
+{
+ var Entry = {};
+ var framename;
+ var framdata;
+ var dbid;
+ var linktitle;
+ if ( pSummary == undefined || pSummary == null ) pSummary = "";
+ if ( pDescription == undefined || pDescription == null )
+ {
+ if(vars.getString("$sys.scope") == "vaadin")
+ pDescription = neon.getImageContent(vars.getString("$sys.currententityname"));
+ else
+ pDescription = swing.getImageContent();
+ }
+ if ( pUser == undefined || pUser == null ) pUser = vars.getString("$sys.user");
+ //kein translate.key hier, weil es sich um einen rein technischen Wert handelt:
+ if ( pStart == undefined ) pStart = datetime.toLong(datetime.toDate(parseInt(vars.getString("$sys.date")) + datetime.ONE_HOUR, "dd.MM.yyyy HH:00"), "dd.MM.yyyy HH:mm");
+ if ( pCategory == undefined || pCategory == null ) pCategory = "";
+
+ if (pAffectedUsers == null || pAffectedUsers == undefined )
+ {
+ Entry[calendars.AFFECTEDUSERS] = "";
+ }
+ else
+ {
+ Entry[calendars.AFFECTEDUSERS] = text.encodeMS(calendars.getCalendarUsers(pAffectedUsers));
+ }
+ Entry[calendars.TYPE] = pType;
+ Entry[calendars.DTSTART] = pStart;
+ if ( pType == calendars.VEVENT )
+ {
+ if ( pDuration == undefined )
+ pDuration = datetime.ONE_HOUR;
+
+ Entry[calendars.DTEND] = String ( eMath.addInt( pStart, pDuration) );
+
+ if ( pStatus == undefined )
+ pStatus = calendars.STATUS_CONFIRMED;
+
+ pStatus = mapCalendarStatus(pStatus, calendars.getBackendType() );
+ }
+ else if ( pType == calendars.VTODO )
+ {
+ //kein translate.key hier, weil es sich um einen rein technischen Wert handelt:
+ if ( pDuration != undefined )
+ Entry[calendars.DUE] = String ( eMath.addInt( pStart, pDuration) );
+ else
+ Entry[calendars.DUE] = datetime.toLong(datetime.toDate(pStart, "dd.MM.yyyy 23:59")
+ ,"dd.MM.yyyy HH:mm");
+
+ if ( pStatus == undefined )
+ pStatus = calendars.STATUS_NEEDSACTION;
+
+ pStatus = mapCalendarStatus(pStatus, calendars.getBackendTypeTasks() );
+
+ }
+
+ Entry[calendars.USER] = calendars.getCalendarUser(pUser);
+ Entry[calendars.DESCRIPTION] = pDescription;
+ Entry[calendars.SUMMARY] = pSummary;
+ Entry[calendars.STATUS] = pStatus;
+ Entry[calendars.CLASSIFICATION] = calendars.CLASSIFICATION_PUBLIC;
+ Entry[calendars.CATEGORIES] = pCategory;
+
+
+ if( pPriority != undefined )
+ {
+ Entry[calendars.PRIORITY] = pPriority;
+ }
+
+ if( pReminder != undefined)
+ {
+ Entry[calendars.HASREMINDER] = "true";
+ Entry[calendars.REMINDER_DURATION] = pReminder;
+ }
+ else
+ Entry[calendars.HASREMINDER] = "false";
+
+
+ if (pWithLink == false)
+ {
+ Entry[calendars.LINKS] = "0";
+ }
+ else
+ {
+ var fd = new FrameData();
+ if ( typeof(pWithLink) == "object" )
+ {
+ for ( var li = 0; li < pWithLink.length; li++ )
+ {
+ framename = pWithLink[li][0];
+ framdata = fd.getData("name", framename, ["table","idcolumn","title"])[0];
+ dbid = pWithLink[li][1];
+ linktitle = framdata[2] + " - " + pWithLink[li][2];
+
+ Entry["LINK_ALIAS_" + ( li + 1 )] = vars.getString("$sys.dbalias");
+ Entry["LINK_TABLE_" + ( li + 1 )] = framdata[0];
+ Entry["LINK_IDCOLUMN_" + ( li + 1 )] = framdata[1];
+ Entry["LINK_DBID_" + ( li + 1 )] = dbid;
+ Entry["LINK_FRAME_" + ( li + 1 )] = "comp." + framename;
+ Entry["LINK_TITLE_" + ( li + 1 )] = linktitle;
+ }
+ Entry[calendars.LINKS] = pWithLink.length.toString();
+ }
+ else
+ {
+ if ( pWithLink == true || pWithLink == undefined )
+ {
+ framename = vars.getString("$sys.currentimagename");
+ framdata = fd.getData("name", framename, ["table","idcolumn","title"])[0];
+ dbid = vars.getString("$comp.idcolumn");
+ linktitle = framdata[2] + " - " + swing.getImageContent();
+ }
+ Entry[calendars.LINKS] = "1";
+ Entry["LINK_ALIAS_1"] = vars.getString("$sys.dbalias");
+ Entry["LINK_TABLE_1"] = framdata[0];
+ Entry["LINK_IDCOLUMN_1"] = framdata[1];
+ Entry["LINK_DBID_1"] = dbid;
+ Entry["LINK_FRAME_1"] = "comp." + framename;
+ Entry["LINK_TITLE_1"] = linktitle;
+ }
+ }
+
+
+if(pAppLinkContext && pAppLinkId)
+{
+ Entry["AppLinkContext"] = pAppLinkContext;
+ Entry["AppLinkId"] = pAppLinkId;
+}
+ return Entry;
+}
+
+/*
+ * Liefert den CalendarStatus übersetzt zurück.
+ * @param {String} pStatus req Status
+ * @param {String} pLanguage opt Sprache
+ * @param {String} pKind opt ToDo oder Event
+ *
+ * @return {String} übersetzte Status
+ */
+function getCalendarStatus( pStatus, pLanguage, pKind)
+{
+ //kein mappen des Status, da wirklich verschiedene Dinge angezeigt werden sollen
+ switch ( pStatus )
+ {
+ case calendars.STATUS_BUSY:
+ return translate.text("Gebucht", pLanguage)
+ case calendars.STATUS_CANCELLED:
+ if(pKind == "ToDo" && pKind != undefined) return translate.text("Zurückgestellt", pLanguage)
+ return translate.text("Abgesagt", pLanguage)
+ case calendars.STATUS_COMPLETED:
+ return translate.text("Erledigt", pLanguage)
+ case calendars.STATUS_CONFIRMED:
+ return translate.text("Bestätigt", pLanguage)
+ case calendars.STATUS_FREE:
+ return translate.text("frei", pLanguage)
+ case calendars.STATUS_INPROCESS:
+ return translate.text("In Bearbeitung", pLanguage)
+ case calendars.STATUS_NEEDSACTION:
+ return translate.text("Nicht begonnen", pLanguage)
+ case calendars.STATUS_OOF:
+ return translate.text("Außer Haus", pLanguage)
+ case calendars.STATUS_TENTATIVE:
+ return translate.text("Vorläufig", pLanguage)
+ default:
+ return "";
+ }
+}
+
+/*
+ * Zu einer übergebenen Priorität wird ihre Bedeutung übersetzt und zurückgegeben.
+ *
+ * @param {String} pPriority req Priorität
+ * @param {String} pLanguage opt Sprache
+ *
+ * @return (String) übersetzte Bedeutung einer Priorität
+ */
+function getCalendarPriority(pPriority, pLanguage)
+{
+ switch(pPriority)
+ {
+ case "9":
+ return translate.text("niedrig", pLanguage);
+ break;
+ case "5":
+ return translate.text("normal", pLanguage);
+ break;
+ case "1":
+ return translate.text("hoch", pLanguage);
+ break;
+ default:
+ return translate.text("keine", pLanguage);
+ break;
+ }
+}
+
+/*
+ * Liefert zum Objekt verknüpfte Aufgaben aus dem Kalender.
+ *
+ * @param {String} pFrame req Name des Frames
+ * @param {String} pDBID req ID des verknüpften Datensatzes
+ * @param {String} pAlias opt
+ * @param {String} pLanguage opt Sprache
+ *
+ * @return {[]} mit Aufgaben aus Kalender
+ */
+function getLinkedToDos (pFrame, pDBID, pAlias, pLanguage )
+{
+ if (pAlias == undefined ) pAlias = vars.getString("$sys.dbalias");
+ var tab = [];
+ var status = " and STATUS in ('NEEDS-ACTION', 'IN-PROCESS')";
+ var exists = [];
+ var zustaendig = "";
+ var today = getDate(vars.getString("$sys.date"));
+ var filtervalues = ["", "false"];
+ if ( vars.exists("$image.FilterValuesT") )
+ {
+ filtervalues = vars.get("$image.FilterValuesT");
+ zustaendig = filtervalues[0]
+ if (filtervalues[1] == "true") status = " and STATUS in ('COMPLETED', 'CANCELLED')";
+ }
+
+ var entryids = db.table("select ENTRYID, OWNER from ASYS_CALENDARLINK "
+ + "join ASYS_CALENDARBACKEND on ELEMENTUID = ENTRYID where FRAME = 'comp." + pFrame + "' "
+ + "and ENTRYID is not null "
+ + "and ENTRYTYPE = " + calendars.VTODO + " "
+ + "and DBID = '" + pDBID + "' "
+ + status, pAlias);
+
+ for (var i = 0; i < entryids.length; i++)
+ {
+ if ( exists.indexOf(entryids[i][0]) == -1)
+ {
+ try
+ {
+ var entry = calendars.getEntry(entryids[i][0], null, getTitleCalenderUser( entryids[i][1] ), calendars.VTODO);
+ var entr = new Array;
+ status = "";
+ var user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
+ if(user == null) user = entry[calendars.USER2]["cn"];
+ else user = user[tools.TITLE]
+ if ((user == zustaendig || zustaendig == ""))
+ {
+ entr[0] = text.encodeMS([entry[calendars.ID], user]);
+ var due = getDate(entry[calendars.DUE]);
+ if (due < today ) entr[1] = "-1769402";
+ else if (due > today) entr[1] = "-16777216"; else entr[1] = "-16744020";
+ entr[2] = "-1"; // Hintergrundfarbe
+ entr[3] = text.decodeMS(entry[calendars.AFFECTEDUSERS]).length;
+ entr[4] = entry[calendars.DUE]
+ entr[5] = getCalendarStatus( entry[calendars.STATUS], pLanguage, "ToDo");
+ entr[6] = entry[calendars.SUMMARY]
+ entr[7] = getRealName([entry[calendars.ORGANIZER2]]);
+ entr[8] = getRealName(entry[calendars.ATTENDEES]);
+ entr[9] = entry[calendars.DESCRIPTION];
+ entr[10] = entry[calendars.PRIORITY];
+ tab.push(entr);
+ exists.push(entryids[i][0]);
+ }
+ }
+ catch (ex)
+ {
+ logging.log(ex);
+ }
+ }
+ }
+ array_mDimSort(tab, 4, false); //Sortierung nach Fälligkeitsdatum
+ return tab;
+}
+
+/*
+ * Anzeige des Aufgaben-Filter
+ *
+ * @param {Object} pFilter req
+ *
+ * @return string Anzeige
+ */
+function show_filterLinkedToDos(pFilter)
+{
+ var retstring = "";
+ if (pFilter[0] != "")
+ {
+ var userp = tools.getUser( pFilter[0] )[tools.PARAMS];
+ retstring = translate.text("Aufgaben von") + " " + userp[tools.FIRSTNAME] + " " + userp[tools.LASTNAME];
+ }
+ if (pFilter[1] == "true") retstring += ", " + translate.text("erledigt / zurückgestellt");
+
+ return retstring
+}
+
+/*
+ * Liefert zum Objekt verknüpfte Events aus dem Kalender.
+ *
+ * @param {String} pFrame req Name des Frames
+ * @param {String} pDBID req ID des verknüpften Datensatzes
+ * @param {Object} pFilter opt
+ * @param {String} pAlias opt
+ * @param {String} pUser opt Benutzer
+ *
+ * @return {[]} mit Events aus Kalender
+ */
+function getLinkedEvents (pFrame, pDBID, pFilter, pAlias, pUser )
+{
+ if ( pFilter == "" || pFilter == undefined)
+ pFilter = reset_filterEvent();
+
+ var tab = [];
+ var exists = [];
+ var conditions = [];
+ var today = getDate(vars.getString("$sys.date"));
+ var conditioncount = 0;
+ var stati = [];
+
+ if ( pFilter.tentative == "true" )
+ stati.push(mapCalendarStatus(calendars.STATUS_TENTATIVE, calendars.getBackendType() ));
+
+ if ( pFilter.cancelled == "true" )
+ stati.push(mapCalendarStatus(calendars.STATUS_CANCELLED, calendars.getBackendType() ));
+
+ if ( pFilter.confirmed == "true" )
+ stati.push(mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() ));
+
+ if (calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
+ stati.push(calendars.STATUS_FREE);
+
+ if (pAlias == undefined ) pAlias = vars.getString("$sys.dbalias");
+
+ var entryids = db.table(["select ENTRYID, OWNER "
+ + "from ASYS_CALENDARLINK "
+ + "join ASYS_CALENDARBACKEND on ELEMENTUID = ENTRYID where FRAME = 'comp."
+ + pFrame + "' and ENTRYID is not null and ENTRYTYPE = " + calendars.VEVENT
+ + " and DBID = '" + pDBID + "' and DTSTART >= ?",
+ [ [ String(pFilter.datefrom - datetime.ONE_WEEK), SQLTYPES.DATE ]]], pAlias );
+
+ /*
+ * Check for rights before constructing condition otherwise you'll get an error by opening linked Data
+ */
+ var userToRead = []
+ if(pUser != undefined)
+ {
+ userToRead = getCalendarUsers( calendars.RIGHT_READ_APPOINTMENT, pUser );
+ }
+ else
+ {
+ userToRead = calendars.getDisplayCalendarUsers(calendars.RIGHT_READ_APPOINTMENT);
+ }
+ var userMap = {};
+ for (let i = 0; i < userToRead.length; i++)
+ {
+ userMap[userToRead[i][1]] = true;
+ }
+
+ for ( var i = 0;i < entryids.length; i++)
+ {
+ var user = getTitleCalenderUser(entryids[i][1]);
+ if(userMap[user])
+ {
+ for ( var z = 0; z < stati.length; z++ )
+ _addEntryCondition(conditions, String(++conditioncount),
+ {
+ TYPE: calendars.VEVENT,
+ START: pFilter.datefrom,
+ END: pFilter.dateto,
+ USER: user,
+ STATUS: stati[z],
+ UID: entryids[i][0]
+ });
+ } else continue
+ }
+ conditions["COUNT"] = String(conditioncount);
+
+ var entries = calendars.getExpandedEntries(conditions, pFilter.datefrom, pFilter.dateto);
+ for ( let i = 0; i < entries.length; i++)
+ {
+ for (var j = 0; j < entries[i].length; j++)
+ {
+ var entry = entries[i][j];
+ if( exists.indexOf(entry[calendars.ID]) == -1 && ( pFilter.category == "" || text.decodeMS(entry[calendars.CATEGORIES]).indexOf(pFilter.category) > 0))
+ {
+ var entr = new Array;
+ var start = getDate(entry[calendars.DTSTART]);
+ var end = getDate(entry[calendars.DTEND]);
+ user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
+ if(user == null) user = entry[calendars.USER2]["cn"];
+ else user = user[tools.TITLE]
+ entr[0] = text.encodeMS([entry[calendars.ID], user , entry[calendars.RECURRENCEID]]);
+ if (end < today) entr[1] = "-6710887" ;
+ else if (start <= today && end >= today ) entr[1] = "-16744020" ;
+ else entr[1] = "-16777216";
+ entr[2] = "-1"
+ entr[3] = text.decodeMS(entry[calendars.AFFECTEDUSERS]).length;
+ entr[4] = entry[calendars.DTSTART]
+ entr[5] = entry[calendars.DTEND]
+ entr[6] = entry[calendars.SUMMARY]
+ entr[7] = getRealName([entry[calendars.ORGANIZER2]]);
+ entr[8] = getRealName(entry[calendars.ATTENDEES]);
+ entr[9] = entry[calendars.DESCRIPTION]
+ tab.push(entr);
+ exists.push(entry[calendars.ID]);
+ }
+ }
+ }
+ array_mDimSort(tab, 4, false);
+ return tab;
+}
+
+/*
+ * Liefert Aufgaben aus dem Kalender.
+ *
+ * @param {Object} pFilter req
+ * @param {String} pLanguage opt
+ * @param {bool} pShortForm opt wenn true wird nur die kurzversion geladen
+ *
+ * @return {[]} mit allen aufgaben aus dem Kalender
+ */
+function getTodos( pFilter, pLanguage, pShortForm )
+{
+ if ( pFilter == "" ) pFilter = reset_filterToDo();
+ var tab = [];
+ var today = getDate (vars.getString("$sys.date"));
+ var conditions = [];
+ var conditioncount = 0;
+ var user = pFilter.user;
+ var stati = [];
+ var status = [];
+ var exists = [];
+ var entries = [];
+
+ if ( pFilter.needs_action == "true" )
+ {
+ stati.push(mapCalendarStatus(calendars.STATUS_NEEDSACTION, calendars.getBackendTypeTasks() ));
+ status.push("NEEDS-ACTION");
+ }
+ if ( pFilter.in_process == "true" )
+ {
+ stati.push(mapCalendarStatus(calendars.STATUS_INPROCESS, calendars.getBackendTypeTasks() ));
+ status.push("IN-PROCESS");
+ }
+ if ( pFilter.completed == "true" )
+ {
+ stati.push(mapCalendarStatus(calendars.STATUS_COMPLETED, calendars.getBackendTypeTasks() ));
+ status.push("COMPLETED");
+ }
+ if ( pFilter.cancelled == "true" )
+ {
+ stati.push(mapCalendarStatus(calendars.STATUS_CANCELLED, calendars.getBackendTypeTasks() ));
+ status.push("CANCELLED");
+ }
+ if (pFilter.delegated == "true" )
+ {
+ var from = [pFilter.datefrom, SQLTYPES.TIMESTAMP];
+ var to = [pFilter.dateto, SQLTYPES.TIMESTAMP];
+ setAllCalendarGrant();
+ user = calendars.getCalendarUser(user);
+ user = db.table(["select ELEMENTUID, OWNER from ASYS_CALENDARBACKEND where ENTRYTYPE = 2 and OWNER != '" + user + "' and ORGANIZER = '"
+ + user + "' and STATUS in ('" + status.join("', '") + "') and (( STARTTIME >= ? and STARTTIME <= ?) or "
+ + "( ENDTIME >= ? and ENDTIME <= ? ) or ( STARTTIME >= ? and ENDTIME <= ? ))", [from, to, from, to, from, to]] );
+
+ for (let i = 0; i < user.length; i++ )
+ {
+ try
+ {
+ entries.push([calendars.getEntry(user[i][0], null, getTitleCalenderUser(user[i][1]), calendars.VTODO)]);
+ }
+ catch(err){
+ logging.log(err);
+ }
+ }
+ setCalendarGrant();
+ }
+ else
+ {
+ if ( typeof( pFilter.user ) != "object" ) user = [user.trim()];
+ for (let i = 0; i < user.length; i++ )
+ for ( var z = 0; z < stati.length; z++ )
+ _addEntryCondition(conditions, ++conditioncount,
+ {
+ TYPE: calendars.VTODO,
+ START: pFilter.datefrom,
+ END: pFilter.dateto,
+ USER: user[i],
+ STATUS: stati[z]
+ });
+
+ conditions["COUNT"] = String(conditioncount);
+ entries = calendars.getEntries(conditions);
+ }
+
+ for (i = 0; i < entries.length; i++)
+ {
+ var entry = entries[i][0];
+ user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
+ if (user == null) user = entry[calendars.USER2]["cn"];
+ else user = user[tools.TITLE]
+ if ( !(user != vars.getString("$sys.user") && entry[calendars.CLASSIFICATION] == calendars.CLASSIFICATION_PRIVATE) // no privat
+ && !( pFilter.delegated == "true" && ( isAffectedUser( entry, pFilter.user) || exists.indexOf(entry[calendars.ID]) > -1 ) ) // no duplicate
+ && ( pFilter.category == "" || text.decodeMS(entry[calendars.CATEGORIES]).indexOf( pFilter.category ) > -1 ) ) // Filter category
+ {
+ var entr = [];
+ var links = entry[calendars.LINKS];
+ var due = entry[calendars.DUE] != "" ? getDate(entry[calendars.DUE]) : "";
+ entr[0] = text.encodeMS([entry[calendars.ID], user]);
+ if (due == today ) entr[1] = "-16744020" ;
+ else if(due == "") entr[1] = "-13395712";
+ else if (due > today ) entr[1] = "-16777216";
+ else entr[1] = "-1769402";
+ if (entry[calendars.PRIORITY] == "1") entr[2] = "-100";
+ entr[3] = entry[calendars.ATTENDEES].length;
+ entr[4] = entry[calendars.DUE];
+
+ if (pShortForm)
+ {
+ entr[5] = entry[calendars.SUMMARY];
+ entr[6] = entry[calendars.DESCRIPTION];
+ }
+ else
+ {
+ entr[5] = getCalendarStatus( entry[calendars.STATUS], pLanguage, "ToDo");
+ entr[6] = getCalendarPriority( entry[calendars.PRIORITY], pLanguage);
+ entr[7] = entry[calendars.SUMMARY];
+ entr[8] = getRealName( [ entry[calendars.ORGANIZER2] ] );
+ entr[9] = getRealName( entry[calendars.ATTENDEES] );
+ if (links == undefined) entr[10] = ""; else entr[10] = links;
+ entr[11] = entry[calendars.DESCRIPTION];
+ entr[12] = entry[calendars.CREATED];
+ }
+
+ tab.push(entr);
+ if ( pFilter.delegated == "true" ) exists.push(entry[calendars.ID]);
+ }
+ }
+
+ if (pShortForm)
+ sortArray(tab, -1, 4, 1, 5);
+ else
+ sortArray(tab, -1, 4, 1, 12 );
+
+ return tab;
+}
+
+/*
+ * Fügt eine Condition hinzu
+ *
+ * @param {[]} pConditions req die Conditions
+ * @param {Integer} pIndex req Index der Condition
+ * @param {Object} pValues req
+ *
+ * @return {void}
+ */
+function _addEntryCondition(pConditions, pIndex, pValues)
+{
+ var params = ["TYPE", "START", "END", "USER", "STATUS", "UID"];
+
+ for (var i = 0; i < params.length; i++)
+ if (pValues[params[i]] != undefined) pConditions[params[i] + "_" + pIndex] = pValues[params[i]];
+}
+
+/*
+ * Liefert Events zu bestimmten Usern/Daten in einem Array.
+ *
+ * @param {Object} pFilter req
+ * @param {String} pLanguage opt
+ * @param {bool} pShortForm opt wenn true wird nur die kurzversion geladen
+ *
+ * @return {[]}
+ * [0] ID
+ * [1] Vordergrundfarbe
+ * [2] Hintergrundfarbe
+ * [3] Start
+ * [4] Ende
+ * [5] Betreff
+ * [6] Inhalt
+ * [7] User
+ * [8] Anzahl Verknüpfungen
+ * [9] Klassifikation (privat/öffentlich)
+ */
+function getEvents( pFilter, pLanguage, pShortForm )
+{
+ if ( pFilter == "" ) pFilter = reset_filterEvent();
+ var tab = [];
+ var conditions = [];
+ var today = getDate(vars.getString("$sys.date"));
+ var conditioncount = 0;
+ var stati = [];
+ var user = undefined;
+ if ( pFilter.tentative == "true" ) stati.push(calendars.STATUS_TENTATIVE);
+ if ( pFilter.cancelled == "true" ) stati.push(calendars.STATUS_CANCELLED);
+ if ( pFilter.confirmed == "true" )
+ stati.push(mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() ));
+
+ if (getCalendarSystemType(calendars.VEVENT) == calendars.BACKEND_EXCHANGEWS && pFilter.free == "true")
+ stati.push(calendars.STATUS_FREE);
+
+ if ( pFilter.user != "" ) user = (pFilter.user).trim();
+
+ for ( var z = 0; z < stati.length; z++ )
+ _addEntryCondition(conditions, String(++conditioncount),
+ {
+ TYPE: calendars.VEVENT,
+ START: pFilter.datefrom,
+ END: pFilter.dateto,
+ USER: user,
+ STATUS: stati[z]
+ });
+
+ conditions["COUNT"] = String(conditioncount);
+
+ var entries = calendars.getExpandedEntries(conditions, pFilter.datefrom, pFilter.dateto);
+ for ( var i = 0;i < entries.length; i++)
+ {
+ for (var j = 0; j < entries[i].length; j++)
+ {
+ var entry = entries[i][j];
+ if( pFilter.category == "" || text.decodeMS(entry[calendars.CATEGORIES]).indexOf(pFilter.category) > -1 )
+ {
+ var entr = new Array;
+ var start = getDate(entry[calendars.DTSTART]);
+ var end = getDate(entry[calendars.DTEND]);
+
+ user = tools.getUserByAttribute(tools.CALENDARID, entry[calendars.USER2]["paramvalue"].substr("mailto:".length))
+ if(user == null) user = entry[calendars.USER2]["cn"];
+ else user = user[tools.TITLE]
+ entr[0] = text.encodeMS([ entry[calendars.ID], user, entry[calendars.RECURRENCEID]]);
+ if (end < today ) entr[1] ="-6710887" ;
+ else if (start > today) entr[1] = "-16777216";
+ else entr[1] = "-16744020" ;
+ entr[2] = "-1"
+ entr[3] = entry[calendars.ATTENDEES].length;
+ entr[4] = entry[calendars.DTSTART];
+ entr[5] = entry[calendars.DTEND];
+ entr[6] = entry[calendars.SUMMARY];
+
+ if (!pShortForm)
+ {
+ entr[7] = getRealName([entry[calendars.ORGANIZER2]]);
+ entr[8] = getRealName(entry[calendars.ATTENDEES]);
+ entr[9] = getCalendarStatus( entry[calendars.STATUS], pLanguage );
+ if (entry[calendars.LINKS] == undefined) entr[10] = "";
+ else entr[10] = entry[calendars.LINKS];
+ entr[11] = entry[calendars.DESCRIPTION];
+ }
+ tab.push( entr );
+ }
+ }
+ }
+ sortArray(tab, -1, 4, 1, 6 );
+ return tab;
+}
+
+/*
+ * Liefert den echten Namen anhand des Logins zurück
+ *
+ * @param {Array}[]} pUserMap req pUserMap
+ *
+ * @return String
+ */
+function getRealName(pUserMap)
+{
+ var resultName = [];
+ var RealNames = getRealNameObject(pUserMap);
+
+ for ( var realname in RealNames ) resultName.push(RealNames[realname]);
+ return resultName.join(", \n");
+}
+
+/*
+ * Liefert den echten Namen anhand des Logins zurück
+ *
+ * @param {Array}[]} pUserMap req pUserMap
+ *
+ * @return Object
+ */
+function getRealNameObject(pUserMap)
+{
+ var resultObject = {};
+ var realname = "";
+
+ for ( let i = 0; i < pUserMap.length; i++ )
+ {
+ let user = tools.getUserByAttribute(tools.CALENDARID, [pUserMap[i]["paramvalue"].substr("mailto:".length)])
+ if ( user != null )
+ {
+ if(vars.exists("$global.firstLastName") && vars.get("$global.firstLastName"))
+ realname = user[tools.PARAMS][tools.LASTNAME] + " " + user[tools.PARAMS][tools.FIRSTNAME];
+ else realname = user[tools.PARAMS][tools.FIRSTNAME] + " " + user[tools.PARAMS][tools.LASTNAME];
+ }
+ else //Der User existiert nicht im System
+ {
+ realname = pUserMap[i]["cn"] + " " + pUserMap[i]["paramvalue"];
+ }
+ resultObject[pUserMap[i]["cn"]] = realname;
+ }
+ return resultObject;
+}
+
+
+/*
+ * Gibt an ob der User im Calendarobject vorhanden ist
+ *
+ * @param {Object} pEntry req Calendarobject
+ * @param {String} pUser req Title
+ *
+ * @return Object
+ */
+function isAffectedUser( pEntry, pUser)
+{
+ var usermap = pEntry[calendars.ATTENDEES];
+
+ for ( var i = 0; i < usermap.length; i++ )
+ if( usermap[i]["cn"] == pUser )
+ return true;
+ return false;
+}
+
+/*
+ * Liefert das Datum ohne Urzeit zurück
+ *
+ * @param {String} datetimeIn req DatumZeit
+ *
+ * @return {date}
+ */
+function getDate( datetimeIn )
+{
+ if ( datetimeIn != "")
+ return datetime.clearTime(datetimeIn);
+ else return "";
+}
+
+/*
+ * Setzt den Aufgaben-Filter
+ *
+ * @param {Object} pFilter req
+ *
+ * @return {image}
+ */
+function filterToDo( pFilter )
+{
+ var error = true;
+ var von = pFilter.datefrom;
+ var bis = pFilter.dateto;
+ if ( pFilter == "" ) pFilter = reset_filterToDo();
+ do
+ {
+ vars.set("$local.relation_id", pFilter.user);
+ vars.set("$local.edt_von", pFilter.datefrom);
+ vars.set("$local.edt_bis", pFilter.dateto);
+ vars.set("$local.category", pFilter.category);
+ vars.set("$local.delegated", pFilter.delegated);
+ vars.set("$local.needs_action", pFilter.needs_action);
+ vars.set("$local.in_process", pFilter.in_process);
+ vars.set("$local.completed", pFilter.completed);
+ vars.set("$local.cancelled", pFilter.cancelled);
+ var res = swing.askUserQuestion(translate.text("Bitte Filterbedingungen setzen"), "DLG_TASK_FILTER");
+ if( res != null )
+ {
+ pFilter.user = res["DLG_TASK_FILTER.relation_id"];
+ pFilter.datefrom = res["DLG_TASK_FILTER.edt_von"];
+ pFilter.dateto = res["DLG_TASK_FILTER.edt_bis"];
+ pFilter.category = res["DLG_TASK_FILTER.category"];
+ pFilter.delegated = res["DLG_TASK_FILTER.delegated"];
+ pFilter.needs_action = res["DLG_TASK_FILTER.needs_action"];
+ pFilter.in_process = res["DLG_TASK_FILTER.in_process"];
+ pFilter.completed = res["DLG_TASK_FILTER.completed"];
+ pFilter.cancelled = res["DLG_TASK_FILTER.cancelled"];
+ if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
+ else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
+ }
+ else
+ {
+ pFilter.datefrom = von;
+ pFilter.dateto = bis;
+ error = false;
+ }
+ }
+ while ( error )
+ return pFilter;
+}
+
+/*
+ * Setzt den Aufgaben-Filter
+ *
+ * @param {Object} pFilter req
+ *
+ * @return {image}
+ */
+function filterToDo_Neon( pFilter )
+{
+ var error = true;
+ var von = pFilter.datefrom;
+ var bis = pFilter.dateto;
+ if ( pFilter == "" ) pFilter = reset_filterToDo();
+ do
+ {
+ var prompts = {
+ FILTER_TEXT: translate.text("Bitte Filterbedingungen setzen"),
+ RESPONSIBLE: pFilter.user,
+ DATE_FROM: pFilter.datefrom,
+ DATE_TO: pFilter.dateto,
+ CATEGORY_TODO: pFilter.category,
+ DELEGATED: pFilter.delegated,
+ NEEDS_ACTION: pFilter.needs_action,
+ IN_PROCESS: pFilter.in_process,
+ COMPLETED: pFilter.completed,
+ CANCELLED: pFilter.cancelled
+ }
+
+ var buttons = {
+ "ok" : translate.text("OK"),
+ "": translate.text("Abbrechen")
+ };
+ var defaultButton = "ok";
+
+ var res = question.openDialog("DLG_FILTER_TODO_Neon", prompts, buttons, defaultButton);
+
+ if( res.button != null )
+ {
+ pFilter.user = res.RESPONSIBLE;
+ pFilter.datefrom = res.DATE_FROM;
+ pFilter.dateto = res.DATE_TO;
+ pFilter.category = res.CATEGORY_TODO;
+ pFilter.delegated = res.DELEGATED;
+ pFilter.needs_action = res.NEEDS_ACTION;
+ pFilter.in_process = res.IN_PROCESS;
+ pFilter.completed = res.COMPLETED;
+ pFilter.cancelled = res.CANCELLED;
+ if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
+ else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
+ }
+ else
+ {
+ pFilter.datefrom = von;
+ pFilter.dateto = bis;
+ error = false;
+ }
+ }
+ while ( error )
+ return pFilter;
+}
+
+
+/*
+ * Anzeige des Aufgaben-Filter
+ *
+ * @param {Object} pFilter req
+ *
+ * @return string Anzeige
+ */
+function show_filterToDo(pFilter)
+{
+ var retstring = "";
+ var userp = tools.getUser( pFilter.user )[tools.PARAMS];
+ if (pFilter.user != "") retstring = (translate.text("Aufgaben von") + " " + userp[tools.FIRSTNAME] + " " + userp[tools.LASTNAME]);
+ if (pFilter.datefrom != "") retstring += ", " + datetime.toDate(pFilter.datefrom, translate.text("dd.MM.yyyy"));
+ if (pFilter.dateto != "") retstring += " - " + datetime.toDate(pFilter.dateto, translate.text("dd.MM.yyyy"));
+ if (pFilter.category != "") retstring += ", " + translate.text("Kategorie") + " " + pFilter.category;
+ if (pFilter.delegated == "true") retstring += ", " + translate.text("delegiert");
+ if (pFilter.needs_action == "true") retstring += ", " + translate.text("Nicht begonnen");
+ if (pFilter.in_process == "true") retstring += ", " + translate.text("In Bearbeitung");
+ if (pFilter.completed == "true") retstring += ", " + translate.text("Erledigt");
+ if (pFilter.cancelled == "true") retstring += ", " + translate.text("Zurückgestellt");
+
+ return retstring
+}
+
+/*
+ * Setzt den Aufgaben-Filter zurück
+ *
+ * @return {filter}
+ */
+function reset_filterToDo()
+{
+ var today = getDate (vars.getString("$sys.date"));
+
+ return pFilter = {
+ user: vars.getString("$sys.user"),
+ datefrom: String(eMath.subInt(today, 720 * datetime.ONE_DAY)),
+ dateto: String(eMath.addInt(eMath.addInt(today, 3 * datetime.ONE_DAY)
+ ,datetime.ONE_DAY - datetime.ONE_MINUTE)),
+ category: "",
+ delegated: "",
+ needs_action: "true",
+ in_process: "true",
+ completed: "",
+ cancelled: ""
+ };
+}
+
+/*
+ * Setzt den Event-Filter
+ *
+ * @param {Object} pFilter req
+ *
+ * @return {image}
+ */
+function filterEvent( pFilter )
+{
+ var error = true;
+ var von = pFilter.datefrom;
+ var bis = pFilter.dateto;
+ if ( pFilter == "" ) pFilter = reset_filterEvent();
+ do
+ {
+ vars.set("$local.relation_id", pFilter.user);
+ vars.set("$local.edt_von", pFilter.datefrom);
+ vars.set("$local.edt_bis", pFilter.dateto);
+ vars.set("$local.category", pFilter.category);
+ vars.set("$local.tentative", pFilter.tentative);
+ vars.set("$local.confirmed", pFilter.confirmed);
+ vars.set("$local.cancelled", pFilter.cancelled);
+ vars.set("$local.free", pFilter.free);
+ var res = swing.askUserQuestion(translate.text("Bitte Filterbedingungen setzen"), "DLG_EVENT_FILTER");
+ if( res != null )
+ {
+ pFilter.user = res["DLG_EVENT_FILTER.relation_id"];
+ pFilter.datefrom = res["DLG_EVENT_FILTER.edt_von"];
+ pFilter.dateto = res["DLG_EVENT_FILTER.edt_bis"];
+ pFilter.category = res["DLG_EVENT_FILTER.category"];
+ pFilter.tentative = res["DLG_EVENT_FILTER.tentative"];
+ pFilter.confirmed = res["DLG_EVENT_FILTER.confirmed"];
+ pFilter.cancelled = res["DLG_EVENT_FILTER.cancelled"];
+ pFilter.free = res["DLG_EVENT_FILTER.free"];
+ if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
+ else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
+ }
+ else
+ {
+ pFilter.datefrom = von;
+ pFilter.dateto = bis;
+ error = false;
+ }
+ }
+ while ( error )
+ return pFilter;
+}
+
+/*
+ * Setzt den Event-Filter
+ *
+ * @param {Object} pFilter req
+ *
+ * @return {image}
+ */
+function filterEvent_Neon( pFilter )
+{
+ var error = true;
+ var von = pFilter.datefrom;
+ var bis = pFilter.dateto;
+ if ( pFilter == "" ) pFilter = reset_filterEvent();
+ do
+ {
+ var buttons = {
+ "ok" : translate.text("OK"),
+ "": translate.text("Abbrechen")
+ };
+ var defaultButton = "ok";
+
+ var prompts = {
+ FILTER_TEXT: translate.text("Bitte Filterbedingungen setzen"),
+ RESPONSIBLE_APPOINTMENT: pFilter.user,
+ DATE_FROM: pFilter.datefrom,
+ DATE_TO: pFilter.dateto,
+ CATEGORY_APPOINTMENT: pFilter.category,
+ TENTATIVE: pFilter.tentative,
+ CONFIRMED: pFilter.confirmed,
+ CANCELLED: pFilter.cancelled
+ }
+ var res = question.openDialog("DLG_FILTER_APPOINTMENT_Neon", prompts, buttons, defaultButton);
+ if( res.button != null )
+ {
+ pFilter.user = res.RESPONSIBLE_APPOINTMENT;
+ pFilter.datefrom = res.DATE_FROM;
+ pFilter.dateto = res.DATE_TO;
+ pFilter.category = res.CATEGORY_APPOINTMENT;
+ pFilter.tentative = res.TENTATIVE;
+ pFilter.confirmed = res.CONFIRMED;
+ pFilter.cancelled = res.CANCELLED;
+ if (pFilter.datefrom != "" && pFilter.dateto != "" && pFilter.dateto >= pFilter.datefrom ) error = false;
+ else question.showMessage(translate.text("Bitte Datumseingabe prüfen!"))
+ }
+ else
+ {
+ pFilter.datefrom = von;
+ pFilter.dateto = bis;
+ error = false;
+ }
+ }
+ while ( error )
+ return pFilter;
+}
+
+/*
+ * Anzeige des Event-Filter
+ *
+ * @param {Object} pFilter req
+ *
+ * @return string Anzeige
+ */
+function show_filterEvent(pFilter)
+{
+ var retstring = "";
+
+ var userp = tools.getUser( pFilter.user )[tools.PARAMS];
+ if (pFilter.user != "") retstring = translate.text("Termine von") + " " + userp[tools.FIRSTNAME] + " " + userp[tools.LASTNAME];
+ if (pFilter.datefrom != "") retstring += ", " + datetime.toDate(pFilter.datefrom, translate.text("dd.MM.yyyy"));
+ if (pFilter.dateto != "") retstring += " - " + datetime.toDate(pFilter.dateto, translate.text("dd.MM.yyyy"));
+ if (pFilter.category == "true") retstring += ", " + translate.text("Kategorie") + " " + pFilter.category;
+ if (pFilter.tentative == "true") retstring += ", " + translate.text("Vorläufig");
+ if (pFilter.confirmed == "true") retstring += ", " + translate.text("Bestätigt");
+ if (pFilter.cancelled == "true") retstring += ", " + translate.text("Abgesagt");
+
+ return retstring
+}
+
+/*
+ * Setzt den Event-Filter zurück
+ *
+ * @return {filter}
+ */
+function reset_filterEvent()
+{
+ var today = getDate (vars.getString("$sys.date"));
+
+ return pFilter = {
+ user: vars.getString("$sys.user"),
+ datefrom: String(today), //nur die Termine ab heute anzeigen,
+ //die von vor einer Woche sind uninteressant
+ dateto: String(eMath.addInt(eMath.addInt(today, datetime.ONE_WEEK)
+ ,datetime.ONE_DAY - datetime.ONE_MINUTE)),
+ category: "",
+ tentative: "true",
+ confirmed: "true",
+ cancelled: "",
+ free: "true"
+ };
+}
+
+/*
+ * Setzt den Aufgaben-Filter in Tab Aufgaben
+ *
+ * @return {image}
+ */
+function filterLinkedToDo()
+{
+ var filtervalues = ["", "false"];
+ vars.set("$local.CalenderUser", getCalenderUser( calendars.RIGHT_READ_TASK ));
+
+ //Vorbelegen der Werte, wenn bereits gewählt wurde:
+ if(vars.exists("$image.FilterValuesT"))
+ {
+ filtervalues = vars.get("$image.FilterValuesT");
+ vars.set("$local.relation_id", filtervalues[0]);
+ vars.set("$local.done", filtervalues[1]);
+ }
+
+ var res = swing.askUserQuestion(translate.text("Bitte Filterbedingungen setzen"), "DLG_TASK_DATE_LINKED_FILTER");
+
+ if( res != null && res != undefined && res != "")
+ {
+ filtervalues[0] = res["DLG_TASK_DATE_LINKED_FILTER.relation_id"];
+ filtervalues[1] = res["DLG_TASK_DATE_LINKED_FILTER.done"]
+ }
+ vars.set("$image.FilterValuesT", filtervalues );
+
+ return(filtervalues);
+}
+
+/*
+ * Setzt den Aufgabe-Filter zurück
+ *
+ * @return {image}
+ */
+function resetfilterLinkedToDo()
+{
+ var filtervalues = ["", "false"];
+
+ vars.set("$image.FilterValuesT", filtervalues );
+
+}
+
+/*
+ * setzt die Kalenderrechte
+ *
+ * @return {void}
+ */
+function setCalendarGrant()
+{
+ calendars.resetCalendarUser();
+ var user_read_todo = [];
+ var user_write_todo = []; // ["Admin"]
+ var user_read_event = [];
+ var user_write_event = [];
+ var tree = {};
+ var data = db.table("select THEMEID, THEME.THEME_ID, LOGIN, STATUS from THEME "
+ + " left join EMPLOYEE on EMPLOYEE.THEME_ID = THEMEID left join RELATION on RELATION_ID = RELATIONID and STATUS = 1"
+ +" where KIND = 2");
+ for ( let i = 0; i < data.length; i++)
+ {
+ if ( tree[data[i][0]] == undefined ) tree[data[i][0]] = {
+ pid: data[i][1],
+ isuser: false
+ };
+ if ( data[i][2] != "" && data[i][3] != "" ) tree[data[i][2]] = {
+ pid: data[i][0],
+ isuser: true
+ };
+ }
+
+ var user = vars.getString("$sys.user");
+ // Lese- und Schreibrechte auf Kalender aus Datentabelle holen
+ data = db.table("select HASRIGHTFOR, TODO_RIGHTS, EVENT_RIGHTS from AOSYS_CALENDAR_RIGHTS where LOGIN = '" + user + "'");
+ for ( var i = 0; i < data.length; i++ )
+ if(tree[data[i][0]] != undefined)
+ tree[data[i][0]].grants = data[i].slice(1);
+
+ for ( login in tree )
+ {
+ if( tree[login].isuser )
+ {
+ var grantstodo = __getGrants( login, 0 );
+ var grantsevent = __getGrants( login, 1 );
+ if ( grantstodo.length + grantsevent.length > 0 )
+ {
+ if ( grantstodo == "1" || grantstodo == "3") user_read_todo.push(login);
+ if ( grantstodo == "2" || grantstodo == "3") user_write_todo.push(login);
+ if ( grantsevent == "1" || grantsevent == "3") user_read_event.push(login);
+ if ( grantsevent == "2" || grantsevent == "3") user_write_event.push(login);
+ }
+ }
+ }
+ calendars.setCalendarUser(user_read_todo, calendars.RIGHT_READ_TASK, true, calendars.SORTSTRATEGY_NATURAL );
+ calendars.setCalendarUser(user_write_todo, calendars.RIGHT_WRITE_TASK, true, calendars.SORTSTRATEGY_NATURAL );
+ calendars.setCalendarUser(user_read_event, calendars.RIGHT_READ_APPOINTMENT, true, calendars.SORTSTRATEGY_NATURAL );
+ calendars.setCalendarUser(user_write_event, calendars.RIGHT_WRITE_APPOINTMENT, true, calendars.SORTSTRATEGY_NATURAL );
+
+ //********** Ressourcen in Kalender einfügen ************
+ var ressource = tools.getUsersWithRole("PROJECT_Ressource");
+ calendars.setCalendarUser( ressource, calendars.RIGHT_READ_APPOINTMENT | calendars.RIGHT_WRITE_APPOINTMENT );
+
+ //add all users from support-role since support-action-tasks (sp_supportAktionen) generates tasks for all support-role members
+ //and if you're a member you are allowed to edit these
+ if (tools.hasRole(user, "PROJECT_Support"))
+ {
+ var support = tools.getUsersWithRole("PROJECT_Support");
+ calendars.setCalendarUser( support, calendars.RIGHT_WRITE_TASK | calendars.RIGHT_READ_TASK );
+ }
+
+ function __getGrants( pKey, pIndex )
+ {
+ var grants = [];
+ if ( tree[pKey].grants != undefined && tree[pKey].grants[pIndex]) grants = tree[pKey].grants[pIndex];
+ else if ( tree[pKey].pid != "" ) grants = __getGrants( tree[pKey].pid, pIndex );
+ return grants;
+ }
+}
+
+/*
+ * setzt Recht für alle Kalender
+ *
+ * @return {void}
+ */
+function setAllCalendarGrant()
+{
+ calendars.resetCalendarUser();
+ var users = tools.getStoredUsers();
+ var calendar_user = [];
+ for ( var i = 0; i < users.length; i++ ) calendar_user.push( users[i][1] );
+ calendars.setCalendarUser(calendar_user, calendars.RIGHT_READ_TASK | calendars.RIGHT_WRITE_TASK, false, calendars.SORTSTRATEGY_NATURAL );
+}
+
+/*
+ * gibt die Logins der user, die den übergebenen User als Attribute eingetragen haben, zurück
+ *
+ * @param {[]} pUsers req Logins
+ * @param {String []} pAttrName req AttributeName für Employee
+ * @param {String []} pFields opt
+ *
+ * @return {String []} Logins
+ */
+function getUsersbyAttr( pUsers, pAttrName, pFields )
+{
+ if (typeof(pAttrName) == "string") pAttrName = [pAttrName]
+
+ if ( pFields == undefined )
+ {
+ pFields = ["LOGIN"];
+ }
+
+ var sqlstr = "select " + pFields.join(", ") + " from ATTRLINK join ATTR on ATTRLINK.ATTR_ID = ATTRID and OBJECT_ID = 12 "
+ + "and ATTRNAME in ('" + pAttrName.join("','") + "') "
+ + " join EMPLOYEE on EMPLOYEEID = ATTRLINK.ROW_ID join RELATION on RELATION_ID = RELATIONID join PERS on PERS_ID = PERSID"
+ + " where VALUE_ID in (select EMPLOYEEID from EMPLOYEE where LOGIN in ('" + pUsers.join("','") + "'))"
+ + "";
+
+ if(pFields.length == 1)
+ return db.array(db.COLUMN, sqlstr);
+ else
+ return db.table(sqlstr);
+}
+
+/*
+ * Gibt die Anzahl der verknüpften Aufgaben und Termine zurück.
+ *
+ * @param {String} pID req
+ * @param {String} pFrame req
+ *
+ * @return {String} text
+ */
+function countLinkedTodoEvent(pID, pFrame)
+{
+ var today = getDate (vars.getString("$sys.date"));
+ var datefrom = String(today);
+ var dateto = String(eMath.addInt(today, datetime.ONE_WEEK));
+
+ var str = "select count(distinct ELEMENTUID) from ASYS_CALENDARLINK join ASYS_CALENDARBACKEND on ELEMENTUID = ASYS_CALENDARLINK.ENTRYID "
+ + " where FRAME = 'comp." + pFrame + "' and ELEMENTUID is not null and DBID = '" + pID + "'";
+ var rettask = db.cell(str + "and ENTRYTYPE = " + calendars.VTODO + " and STATUS in ('"
+ + mapCalendarStatus(calendars.STATUS_NEEDSACTION, calendars.getBackendTypeTasks() ) + "', '"
+ + mapCalendarStatus(calendars.STATUS_INPROCESS, calendars.getBackendTypeTasks() ) + "')");
+
+ var eventStatusList = [
+ mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() )
+ ,mapCalendarStatus(calendars.STATUS_TENTATIVE, calendars.getBackendType() )
+ ];
+
+ if (calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
+ eventStatusList.push(calendars.STATUS_FREE);
+
+ var retevent = db.cell([str + " and ENTRYTYPE = " + calendars.VEVENT + " and STATUS in ('" + eventStatusList.join("', '") + "')"
+ + " and DTSTART >= ? and DTEND <= ?",
+ [ [ String(datefrom), SQLTYPES.DATE ], [String(dateto), SQLTYPES.DATE ] ]]);
+
+ result.string(translate.withArguments("&Aufg / Term (%0/%1)", [rettask, retevent]));
+}
+
+/*
+ * Gibt die Anzahl der verknüpften Aufgaben zurück.
+ *
+ * @param {String} pID req
+ * @param {String} pFrame req
+ *
+ * @return {String} text
+ */
+function countLinkedTodo(pID, pFrame)
+{
+ var str = "select count(distinct ELEMENTUID) "
+ + "from ASYS_CALENDARLINK "
+ + "join ASYS_CALENDARBACKEND on ELEMENTUID = ASYS_CALENDARLINK.ENTRYID "
+ + " where FRAME = 'comp." + pFrame + "' "
+ + "and ELEMENTUID is not null and DBID = '" + pID + "'";
+
+ var rettask = db.cell(str + "and ENTRYTYPE = " + calendars.VTODO
+ + " and STATUS in ('"
+ + mapCalendarStatus(calendars.STATUS_NEEDSACTION, calendars.getBackendTypeTasks() ) + "', '"
+ + mapCalendarStatus(calendars.STATUS_INPROCESS, calendars.getBackendTypeTasks() ) + "')"
+ + "");
+
+ result.string(translate.withArguments("&Aufgaben (%0)", [rettask]));
+}
+
+/*
+ * Gibt die Überschneidungen von Termine zurück.
+ *
+ * @param {Date} pStart req
+ * @param {Date} pEnd req
+ * @param {Array} pUsers req
+ *
+ * @return {String Array} Termine
+ */
+function getOverlappingEvents(pStart, pEnd, pUsers )
+{
+ var resultEvents = new Array();
+ var users = pUsers;
+ if (calendars.getBackendType() == calendars.BACKEND_DB && pStart != "" && pEnd != "" && users.length > 0)
+ {
+ calendars.clearCache();
+ for (var u = 0; u < users.length; u++)
+ {
+ var localuid = vars.get("$image.entry")[calendars.ID]
+ var condition = new Array();
+ condition["COUNT"] = "1";
+ condition["TYPE_1"] = calendars.VFREEBUSY;
+ condition["USER_1"] = users[u][0];
+ condition["START_1"] = pStart;
+ condition["END_1"] = pEnd;
+
+ var fbsall = calendars.getEntries(condition);
+ for (var j = 0; j < fbsall.length; j++)
+ {
+ var fbs = fbsall[j];
+ for (var i = 0; i < fbs.length; i++)
+ {
+ var next = fbs[i];
+ var uid = next[calendars.ID];
+ var sum = next[calendars.SUMMARY];
+ if (uid != localuid)
+ {
+ var freebusy = next[calendars.FREEBUSY];
+ var freebusyDec = text.decodeMS(freebusy);
+ var match = false;
+ for (var k = 0; k < freebusyDec.length; k++)
+ {
+ var freebusyInstance = text.decodeMS(freebusyDec[k]);
+ if (!freebusyInstance[0].equals("FREE"))
+ {
+ match = true;
+ }
+ }
+ if (match) resultEvents.push([users[u][2], sum != null && sum.length > 0 ? sum : "?", uid]);
+ }
+ }
+ }
+ }
+ }
+ return resultEvents;
+}
+
+/*
+ * Überprüft den Eintrag, wenn eine neue Aufgaben angelegt wird darauf, ob private Aufgaben für andere erstellt werden
+ *
+ * @param {String[]} pUser die Liste der User, denen die Aufgabe zugewiesen werden soll
+ * @param {String} pClassification die Klassifizierung der Aufgabe - "PRIVATE"
+ *
+ * @return {Boolean} ob der Eintrag in der Konstellation möglich ist, wenn nicht wird eine Meldung ausgegeben
+ */
+function checkEntry(pUser, pClassification )
+{
+ if( pClassification == "PRIVATE" &&
+ ( pUser.length > 1 || text.decodeMS(pUser[0][0])[1] != "CN:" + vars.getString("$sys.user")))
+ {
+ question.showMessage(translate.text("Eine private Aufgabe kann nicht jemand anderem zugewiesen werden."));
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+}
+
+/*
+ * Verschiebt ein Calendareintrag
+ *
+ * @param {String[]} pIDs req die zu verschiebenden Ids mit den Calenderinformationen (Multistring)
+ * @param {String} pTblCompName opt die Komponente die aktualisiert werden soll
+ *
+ * @return {void}
+ */
+function shiftEntry(pIDs, pTblCompName)
+{
+ var datenew = swing.askUserQuestion(translate.text("Verschieben auf Datum?"), "DLG_DATE");
+ if (datenew != null )
+ {
+ var grantedUsers = calendars.getDisplayCalendarUsers(calendars.RIGHT_WRITE_TASK);
+ var usermap = {};
+ var granted = true;
+ for (let i = 0; i < grantedUsers.length; i++)
+ {
+ usermap[grantedUsers[i][1]] = true;
+ }
+
+ datenew = datetime.clearTime(datenew["DLG_DATE.Edit_date"]);
+ if (datenew <= vars.getString("$sys.today"))
+ question.showMessage(translate.text("nur Verschiebung in die Zukunft erlaubt!"));
+ else
+ {
+ for (var i = 0, j = pIDs.length; i < j; i++)
+ {
+ var id = text.decodeMS(pIDs[i]);
+ var entry = calendars.getEntry(id[0], null, id [1], calendars.VTODO);
+ var affectedUsers = entry[calendars.ATTENDEES];
+
+ granted = hasGrantForEntryByObject(affectedUsers, usermap);
+ if(granted)
+ {
+ //Zeitdifferenz von Aufgabenstart und -ende
+ var dateDiff = eMath.subInt(entry[calendars.DUE], entry[calendars.DTSTART]);
+
+ //Startzeit der Aufgabe
+ var startTime = eMath.subInt(entry[calendars.DTSTART]
+ , datetime.clearTime(entry[calendars.DTSTART]));
+
+ entry[calendars.DTSTART] = eMath.addInt(datenew, startTime);
+ entry[calendars.DUE] = eMath.addInt(entry[calendars.DTSTART], dateDiff);
+ calendars.update( [ entry ] );
+ }
+ else
+ question.showMessage(translate.text("Keine Berechtigung zum Verschieben der Aufgabe"));
+ }
+ }
+ }
+}
+
+/*
+ * Gibt eine Aufgabe weiter
+ *
+ * @param {String} pIDs die ID der Aufgabe, welche weitergegeben werden soll
+ * @param {String} pTblCompName die Komponente der Aufgaben, die aktualisiert werden soll
+ *
+ * @return {void}
+ */
+function handOverToDo(pIDs, pTblCompName)
+{
+ var calendar_user = "";
+ var users = getCalenderUser( calendars.RIGHT_WRITE_TASK );
+ var publicCount = 0;
+ var privateCount = 0;
+ var notGrantedCount = 0;
+
+ var grantedUsers = calendars.getDisplayCalendarUsers(calendars.RIGHT_WRITE_TASK);
+ var userMap = {};
+ var granted = true;
+ for (let i = 0; i < grantedUsers.length; i++)
+ {
+ userMap[grantedUsers[i][1]] = true;
+ }
+
+ if (pIDs.length == 1) // only one todo and private
+ {
+ var id = text.decodeMS( pIDs[0] );
+ var entry = calendars.getEntry( id[0], null, id[1] );
+ if(entry[calendars.CLASSIFICATION] == calendars.CLASSIFICATION_PRIVATE)
+ {
+ question.showMessage(translate.text("Kein Weitergeben von privaten Aufgaben möglich!"));
+ return;
+ }
+ }
+
+ for ( let i = 0; i < users.length; i++) if (pIDs.length > 0 || users[i][0] != id[1]) calendar_user += "|" + users[i][1];
+ var selection = swing.askQuestion(translate.text("Benutzer auswählen"), swing.QUESTION_COMBOBOX, calendar_user);
+ if (selection != null)
+ {
+ for ( let i = 0; i < users.length; i++)
+ {
+ if ( selection == users[i][1] )
+ {
+ selection = users[i];
+ break;
+ }
+ }
+ for( let i = 0; i < pIDs.length; i++)
+ {
+ let id = text.decodeMS( pIDs[i] );
+ let entry = calendars.getEntry( id[0], null, id[1] );
+ if(entry[calendars.CLASSIFICATION] == calendars.CLASSIFICATION_PRIVATE) privateCount++;
+ else //Nur öffentliche Aufgabe kann weiter gegeben werden.
+ {
+ // User austauschen
+ var usermap = entry[calendars.ATTENDEES];
+ var affectedusers = [];
+
+ granted = hasGrantForEntryByObject(usermap, userMap);
+
+ for (var ui = 0; ui < usermap.length; ui++)
+ {
+ var login_cn = usermap[ui]["cn"];
+ var user = tools.getUserByAttribute(tools.CALENDARID, usermap[ui]["paramvalue"].substr("mailto:".length))
+ if (user == null) user = login_cn;
+ else user = user[tools.TITLE]
+
+ if ( user == id[1] ) affectedusers.push(selection[0]);
+ else if ( user != selection[0] ) affectedusers.push(user);
+ }
+ if(granted)
+ {
+ entry[calendars.AFFECTEDUSERS] = text.encodeMS(calendars.getCalendarUsers(affectedusers));
+ calendars.update([entry]);
+ publicCount++;
+ }
+ else notGrantedCount++
+ }
+ }
+ question.showMessage(translate.withArguments("%0 Aufgabe(n) erfolgreich weitergegeben an: %1"
+ + (privateCount == 0 ? "" : "\n%2 private Aufgabe(n) können nicht weitergegeben werden.")
+ +(notGrantedCount == 0 ? "" : "\n%3 Aufgabe(n) können aufgrund fehlender Berechtigung nicht weitergegeben werden."),
+ [publicCount, selection[1], privateCount, notGrantedCount]));
+
+ }
+}
+
+// ToDo prüfen !!
+/*
+ * Verschiebt die Kalendereinträge bei Login-Änderung
+ *
+ * @param {String} pNewlogin req
+ * @param {String} pOldlogin req
+ * @param {String} pNewCalendarID req
+ * @param {String} pOldCalendarID req
+ *
+ * @return {void}
+ */
+function moveCalendarData ( pNewlogin, pOldlogin, pNewCalendarID, pOldCalendarID )
+{
+ var newcaluser = text.encodeMS(["mailto:" + pNewCalendarID, "CN:" + pNewlogin]);
+ var oldcaluser = text.encodeMS(["mailto:" + pOldCalendarID, "CN:" + pOldlogin]);
+ db.runStatement("update ASYS_CALENDARBACKEND set OWNER = '" + newcaluser + "' where OWNER = '" + oldcaluser + "'");
+ db.runStatement("update ASYS_CALENDARBACKEND set ORGANIZER = '" + newcaluser + "' where ORGANIZER = '" + oldcaluser + "'");
+
+ if(pNewCalendarID != pOldCalendarID) //Nur wenn sich die E-Mailadresse geändert hat
+ {
+ //Messenger-Historien
+ db.runStatement("update ASYS_XMPP_HISTORY set JID_FROM = '" + pNewCalendarID +"' where JID_FROM = '" + pOldCalendarID +"'", "_____SYSTEMALIAS");
+ db.runStatement("update ASYS_XMPP_HISTORY set JID_TO = '" + pNewCalendarID +"' where JID_TO = '" + pOldCalendarID +"'", "_____SYSTEMALIAS");
+ }
+}
+
+/*
+ * Löst den CalenderUser in lesbarer From auf
+ *
+ * @param {String} pValue req
+ *
+ * @return {String} übersetzten Wert
+ */
+function getCalUser( pValue )
+{
+ var realname = pValue;
+ var user = tools.getUser( text.decodeMS(pValue)[1].split(":")[1] );
+ if ( user != null )
+ {
+ realname = user[tools.PARAMS][tools.FIRSTNAME] + " " + user[tools.PARAMS][tools.LASTNAME];
+ }
+ return realname;
+}
+
+/*
+ * Gibt den Login eines CalenderUser zurück
+ *
+ * @param {String} pCalendarUser req
+ *
+ * @return {String} Title
+ */
+function getTitleCalenderUser( pCalendarUser )
+{
+ var data = text.decodeMS(pCalendarUser)
+ for ( var i = 0; i < data.length; i++ )
+ {
+ //if login changes we have to check calendarid
+ if ( data[i].substr(0, "mailto:".length).toUpperCase() == "MAILTO:" )
+ {
+ var user = tools.getUserByAttribute(tools.CALENDARID, [data[i].substr("mailto:".length)]);
+ if (user != null )
+ return user[tools.TITLE];
+ }
+
+ if ( data[i].substr(0, 3).toUpperCase() == "CN:" )
+ return data[i].substr(3);
+ }
+ return "";
+}
+
+
+/*
+ * Gibt den richtigen Status zum Prüfen je nach Backend zurück
+ *
+ *
+ * @param {String} pStatus req die konstante für den zu prüfenden status,
+ * z.B. calendars.STATUS_INPROCESS
+ *
+ * @param {String} pCalendarType req die konstante für den typen des Termin- oder Aufgabenbackends,
+ * z.B. calendars.BACKEND_DB
+ *
+ * @return {String} Konstanten für den Kalender (Backend-Typen), gibt es den status im backend nicht
+ * wird null geliefert
+ */
+function mapCalendarStatus(pStatus, pCalendarType)
+{
+ switch (pCalendarType)
+ {
+ //case calendars.BACKEND_EXCHANGE:
+ case calendars.BACKEND_EXCHANGEWS:
+ if (pStatus == calendars.STATUS_CONFIRMED)
+ return calendars.STATUS_BUSY;
+ else
+ return pStatus;
+ default:
+ if (pStatus == calendars.STATUS_OOF)//nur bei exchange
+ return null;
+ else
+ return pStatus;
+ }
+}
+
+/*
+ * Sets the imagevariable with affectedusers
+ *
+ * @param {Object} pEntry req the Entry of Tasks or Appointments
+ *
+ * @return {void}
+ *
+ */
+function setAffectedUsersImage(pEntry)
+{
+ var affectedUsers = [];
+ var usermap = pEntry[calendars.ATTENDEES];
+ var realnames = getRealNameObject(usermap);
+
+ for ( var i = 0; i < usermap.length; i++ )
+ {
+ affectedUsers.push([ text.encodeMS( [usermap[i]["paramvalue"], "CN:" + usermap[i]["cn"]] ), realnames[usermap[i]["cn"]] ]);
+ }
+
+ vars.set("$image.affectedusers", affectedUsers);
+ return affectedUsers;
+}
+
+/*
+ * Opens calendar links
+ *
+ * @param {String} pEntryID req the ID of the link
+ *
+ * @return {void}
+ *
+ */
+function openCalendarLinks(pEntryID)
+{
+ var openFramesObj = {};
+ if (typeof(pEntryID) == "object")
+ openFramesObj = pEntryID;
+ else
+ {
+ var links = db.table("SELECT FRAME, DBIDCOLUMN, DBID FROM ASYS_CALENDARLINK WHERE ENTRYID = '" + pEntryID + "'");
+ for (var i = 0; i < links.length; i++)
+ {
+ var frame = links[i][0].substr( 5 );//remove comp. so the frame can be opened with openFrame
+ if ( openFramesObj[frame] == undefined ) openFramesObj[frame] = {
+ IDField: links[i][1],
+ IDs: []
+ };
+ openFramesObj[frame].IDs.push(links[i][2]);
+ }
+ }
+
+ for ( frame in openFramesObj)
+ {
+ var condition = openFramesObj[frame].IDField + " in ('" + openFramesObj[frame].IDs.join("', '") + "')";
+ var framemode = openFramesObj[frame].IDs.length > 1 ? swing.FRAMEMODE_TABLE_SELECTION : swing.FRAMEMODE_SHOW;
+
+ if ( vars.getString("$global.upwardLink") == "link")
+ {
+ swing.openLinkedFrame(frame, condition, swing.WINDOW_CURRENT, framemode, "", null, false, {
+ autoclose: true
+ } );
+ }
+ else
+ {
+ swing.openFrame(frame, condition, swing.WINDOW_CURRENT, framemode, null, false);
+ }
+ }
+}
+
+/**
+ * Returns the "real" calendar system/backend type (BackendType & SyncBackendType)
+ *
+ * @param {Number} pScope - The needed scope (e.g. "calendars.VEVENT", "calendars.VTODO")
+ * @return {Number} - The backend type (calendars.BACKEND_*)
+ */
+function getCalendarSystemType (pScope)
+{
+ // Check sync backend type
+ if (calendars.getSyncBackendType() != calendars.BACKEND_NONE && calendars.getSyncBackendType() != 3)
+ {
+ var scope = calendars.getSyncBackendTypeScope();
+ if (scope.length == 1 && scope[0] == pScope) // Scope.length = 1 -> VEVENT *OR* VTODO
+ return calendars.getSyncBackendType();
+ else if (scope.length == 2) // Scope.length = 2 -> Both
+ return calendars.getSyncBackendType();
+ // Scope.length = 0 -> Nothing selected -> Skip this block
+ }
+
+ // Fallback to backend type (event)
+ if (calendars.getBackendType() != calendars.BACKEND_NONE && pScope === calendars.VEVENT)
+ return calendars.getBackendType();
+
+ // Second fallback to backend type (todo)
+ if (calendars.getBackendTypeTasks() != calendars.BACKEND_NONE && pScope === calendars.VTODO)
+ return calendars.getBackendTypeTasks();
+
+ // Everything is none
+ return calendars.BACKEND_NONE;
+}
+
+function hasGrantForEntryByMS(pAffectedUsers, pUserMap)
+{
+ for (let i = 0; i < pAffectedUsers.length; i++)
+ {
+ var calUser = getTitleCalenderUser( pAffectedUsers[i][0]);
+ if(pUserMap[calUser] == undefined)
+ {
+ return false;
+ break;
+ }
+ else
+ return true;
+ }
+}
+
+function hasGrantForEntryByObject(pAffectedUsers, pUserMap)
+{
+ for (let i = 0; i < pAffectedUsers.length; i++)
+ {
+ calUser = tools.getUserByAttribute(tools.CALENDARID, pAffectedUsers[i]["paramvalue"].substr("mailto:".length))
+ if (calUser == null) calUser = pAffectedUsers[i]["cn"];
+ else calUser = calUser[tools.TITLE]
+ if(pUserMap[calUser] == undefined)
+ {
+ return false;
+ break;
+ }
+ else
+ return true;
+ }
+}
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 7f1383f16f..2b863fc27e 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,607 +1,607 @@
-import("system.logging");
-import("system.util");
-import("system.SQLTYPES");
-import("system.datetime");
-import("system.db");
-import("system.vars");
-import("system.translate");
-import("KeywordRegistry_basic");
-import("Util_lib");
-import("Binary_lib");
-import("Sql_lib");
-import("Keyword_lib");
-import("Data_lib");
-
-/**
- * utility functions for products
- * Do not create an instance of this!
- *
- * @class
- */
-function ProductUtils() {}
-
-/**
- * Delivers the currently valid product price
- *
- * @param {String} pid ProductID
- * @param {String} buySell possible values: PP, SP
- *
- * @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
- *
- * @return {Array[]} currently valid product price with currency: [price, "CURRENCY"] or [] if no price found
- */
-ProductUtils.getCurrentProductPrice = function(pid, buySell) {
- if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
- {
- var today = datetime.clearTime(vars.get("sys.date"), "utc");
- var actualPriceCondition = SqlCondition.begin()
- .andPrepare("PRODUCTPRICE.BUYSELL", buySell)
- .andPrepare("PRODUCTPRICE.PRODUCT_ID", pid)
- .andPrepare("PRODUCTPRICE.VALID_FROM", today, "# <= ?")
- .andSqlCondition(SqlCondition.begin()
- .orPrepare("PRODUCTPRICE.VALID_TO", today, "# >= ?")
- .or("PRODUCTPRICE.VALID_TO is null"), "1 = 2");
-
- var productPriceData = db.array(db.ROW, actualPriceCondition.buildSql("select PRICE, CURRENCY from PRODUCTPRICE", "1 = 2", "order by VALID_FROM desc"));
-
- if (productPriceData[0] && productPriceData[1])
- return [productPriceData[0], KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1])];
- else
- return [];
- } else {
- return [];
- }
-}
-
-/**
- * Delivers the stock
- *
- * @param {String} pid ProductID
- *
- * @example productUtils.getStockCount(vars.get("$field.PRODUCTID"))
- *
- * @return {String} stock count
- */
-ProductUtils.getStockCount = function(pid) {
- if (pid != undefined && pid != "")
- {
- var sum = db.cell(SqlCondition.begin()
- .andPrepare("STOCK.PRODUCT_ID", pid)
- .buildSql("select sum(QUANTITY * case IN_OUT when 0 then -1 else 1)"
- + " from STOCK"));
-
- if (sum == "")
- sum = "0";
-
- return sum;
- }
- else
- {
- throw new Error(translate.withArguments("${PRODUCT_LIB_NO_PRODUCT_ID} function: %0", ["ProductUtils.getStockCount"]));
- }
-}
-
-/**
- * Delivers metadata and price lists of the passed product.
- * If parameter "priceListFilter" is passed valid price lists and the
- * current price list to use for offer/order are delivered.
- *
- * @param {String} pid req ProductID
- * @param {Object} priceListFilter opt { currency: "currencyValue", quantity: "quantityValue", relationId: "relationIdValue (for custom price lists)" }
- * @param {String[]} additionalProductInfoFields additional fields from Product
- * They are added to the result with the Fieldname as key. e.g. if the array is ["INFO"] the result will contain the key "INFO"
- *
- * @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
- * var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
- * var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- * var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
- * var pUtils = new ProductUtils();
- * var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
- * var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
- *
- * @return {Object} { <br>
- * productId: "productid" <br>
- * , productName: "product name" <br>
- * , groupCode: "keyvalue of keyword 'GROUPCODE'" <br>
- * , unit: "keyvalue of keyword 'UNIT'" <br>
- * , PriceLists: {$pricelistid$ { <br>
- * priceListId: "pricelistid" <br>
- * , relationId: "contactid" when filled -> custom price list <br>
- * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , price: "price" <br>
- * , vat: "vat" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * } } <br>
- * , CurrentValidPriceLists: {$pricelistid$ { <br>
- * priceListId: "pricelistid" <br>
- * , relationId: "contactid" when filled -> custom price list <br>
- * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , price: "price" <br>
- * , vat: "vat" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * } } <br>
- * , PriceListToUse: {$pricelistid$ { <br>
- * priceListId: "pricelistid" <br>
- * , relationId: "contactid" when filled -> custom price list <br>
- * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , price: "price" <br>
- * , vat: "vat" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * } }, <br>
- * INFO: "the productinfo"
- * }
- */
-ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoFields)
-{
- if (additionalProductInfoFields == undefined) {additionalProductInfoFields = []}
- var ProductDetails = {};
-
- var cols = [];
- var colsProduct = ["PRODUCT.PRODUCTID", "PRODUCT.PRODUCTNAME", "PRODUCT.GROUPCODEID", "PRODUCT.UNIT"];
- var defaultProductFieldCount = colsProduct.length;
- colsProduct = colsProduct.concat(additionalProductInfoFields.map(function(item) {return "PRODUCT." + item}));
-
- cols = cols.concat(colsProduct);
-
- var joins = [];
- var orderby = ["PRODUCTID"];
-
- //PriceList (all)
- var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
- , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
-
- cols = cols.concat(colsPricelistAll);
- joins.push(" left join PRODUCTPRICE allPP on allPP.PRODUCT_ID = PRODUCTID ");
-
- //PriceList (currently valid)
- var validPriceLists = false;
- if (priceListFilter != undefined
- && priceListFilter.currency != undefined && priceListFilter.currency != ""
- && priceListFilter.quantity != undefined && priceListFilter.quantity != "")
- {
- validPriceLists = true;
- var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
- , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
- orderby = orderby.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
-
- cols = cols.concat(colsPricelistValid);
- joins.push("left join PRODUCTPRICE validPP on "
- + db.translateCondition(SqlCondition.begin()
- .and("validPP.PRODUCT_ID = PRODUCTID")
- .andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
- .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
- .andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
- .andSqlCondition(SqlCondition.begin()
- .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
- .orSqlCondition(SqlCondition.begin()
- .and("validPP.CONTACT_ID is null")
- .andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'),
- "1 = 2"),
- "1 = 2")
- .build("1 = 2")))
- }
-
- var ProductDataSql = SqlCondition.begin()
- .andPrepare("PRODUCT.PRODUCTID", pid)
- .buildSql("select " + cols.join(", ") + " from PRODUCT " + joins.join(" "),
- "1 = 2",
- "order by " + orderby.join(", "))
-logging.log(ProductDataSql.toSource())
- var ProductData = db.table(ProductDataSql);
-
- for (var i = 0; i < ProductData.length; i++)
- {
- //Product
- if (ProductDetails.productId == undefined)
- {
- ProductDetails = {
- productId: ProductData[i][0]
- , productName: ProductData[i][1]
- , groupCode: ProductData[i][2]
- , unit: ProductData[i][3]
- , PriceLists: {}
- , CurrentValidPriceLists: {}
- , PriceListToUse: null
- };
-
- // add additional fields to the details
- var countPos = defaultProductFieldCount;
- additionalProductInfoFields.forEach(function(productField)
- {
- this[productField] = ProductData[i][countPos];
- countPos++;
- }, ProductDetails);
- }
- //Pricelist (all)
- var colIdx = colsProduct.length;
- if (ProductData[i][colIdx] != "" && ProductDetails.PriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
- {
- ProductDetails.PriceLists[ProductData[i][colIdx]] = _getPriceListObject();
- }
-
- //Pricelist (currently valid)
- colIdx = colsProduct.length + colsPricelistAll.length;
- if (validPriceLists)
- {
- if (ProductData[i][colIdx] != "" && ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
- {
- ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] = _getPriceListObject();
- }
- }
- }
-
- if (validPriceLists)
- ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
-
- return ProductDetails;
-
- function _getPriceListObject() {
- return {
- priceListId: ProductData[i][colIdx++]
- , relationId: ProductData[i][colIdx++]
- , priceList: ProductData[i][colIdx++]
- , price: ProductData[i][colIdx++]
- , vat: ProductData[i][colIdx++]
- , validFrom: ProductData[i][colIdx++]
- , validTo: ProductData[i][colIdx++]
- , buySell: ProductData[i][colIdx++]
- , fromQuantity: ProductData[i][colIdx++]
- , currency: ProductData[i][colIdx++]
- };
- }
-
- //price list to use for offer/order
- function _getPriceListToUse(priceLists, priceListFilter) {
- for (var list in priceLists) {
- //custom price (defined in Org -> Conditions)
- if (priceListFilter.relationId != "" && priceListFilter.relationId == priceLists[list].relationId) {
- return priceLists[list];
- }
- //customer deposited price list (defined by Attribute)
- if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
- return priceLists[list];
- }
- //default price list
- if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
- return priceLists[list];
- }
- }
-
- //no valid price list found
- return null;
- }
-}
-
-/**
- * Checks if there is already an existing price list identical to the passed price list
- *
- * @param {String} pid ProductID
- * @param {Object} priceList { <br>
- * priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * }
- *
- * @example //Productprice_entity, Field: PRICELIST, Process: onValidation
- * var pUtils = new ProductUtils();
- * var priceList = {
- * priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
- * , fromQuantity: vars.get("$field.FROMQUANTITY")
- * , buySell: vars.get("$field.BUYSELL")
- * , currency: vars.get("$field.CURRENCY")
- * , validFrom: vars.get("$field.VALID_FROM")
- * , validTo: vars.get("$field.VALID_TO")
- * };
- *
- * var identicalPriceList = pUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
- * if (identicalPriceList != null)
- * {
- * result.string(translate.text("Identical price list found!"));
- * }
- *
- * @return {Object | null} null if no identical price list was found, otherwise the found price list
- */
-ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
- var PriceLists = this.getProductDetails(pid).PriceLists;
-
- for (var pricelist in PriceLists) {
- //different pricelist id
- //equal price list
- //equal fromquantity
- //equal currency
- //equal pp/sp
- if (priceList.priceListId != PriceLists[pricelist].priceListId
- && priceList.priceList == PriceLists[pricelist].priceList
- && parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity)
- && priceList.buySell == PriceLists[pricelist].buySell
- && priceList.currency == PriceLists[pricelist].currency) {
-
- //identical validFrom & validTo
- // OR NOT [ validFrom_new <= validFrom & validTo_new <= validTo
- // OR validFrom_new >= validFrom & validTo_new >= validTo
- // OR validFrom_new < validFrom & validTo_new > validTo
- // ]
- if (priceList.validFrom == PriceLists[pricelist].validFrom && priceList.validTo == PriceLists[pricelist].validTo
- || ! (priceList.validFrom <= PriceLists[pricelist].validFrom && priceList.validTo <= PriceLists[pricelist].validTo
- || priceList.validFrom >= PriceLists[pricelist].validFrom && priceList.validTo >= PriceLists[pricelist].validTo
- || priceList.validFrom < PriceLists[pricelist].validFrom && priceList.validTo > PriceLists[pricelist].validTo)) {
- //identical price list found
- return PriceLists[pricelist];
- }
- }
- }
-
- //no identical price list found
- return null;
-}
-
-/**
- * returns the image for a product
- *
- * @param {String} pProductId the id of the product.
- * @param {String} pDefaultText the text, to use for default image generation.
- * @return {String} base64 coded String of the image. If none existed, the given String is used to create an image.
- */
-ProductUtils.getImage = function(pProductId, pDefaultText)
-{
- return ImageUtils.get("PRODUCT", "IMAGE", pProductId, pDefaultText);
-}
-
-/**
- * sets the image of a product
- *
- * @param {String} pProductId the id of the product.
- * @param {String} pImageDateBase64 base64 coded String of the image.
- * @return {Boolean} if image could be set
- */
-ProductUtils.setImage = function(pProductId, pImageDateBase64)
-{
- return ImageUtils.set("PRODUCT", "IMAGE", pProductId, pImageDateBase64, "ProductImage", "Image of the product");
-}
-
-/**
- * deletes the image of a product
- *
- * @param {String} pProductId the id of the product.
- * @return {Boolean} if image could be removed
- */
-ProductUtils.removeImage = function(pProductId)
-{
- return ImageUtils.remove("PRODUCT", "IMAGE", pProductId);
-}
-
-/**
- * Class containing utility functions for Prod2Prod (Parts list)
- *
- * @param {String} productId req ProductID
- *
- * @class
- *
- */
-function Prod2ProdUtils(productId)
-{
- this.productId = productId;
- this.data = undefined;
-}
-
-/**
- * Delivers an Object containing parts list structure for passed product "pProductId" (Constructor parameter)
- *
- * @return {Object} { $prod2prodid$ { <br>
- * ids: [ Array containing child Prod2ProdIds for passed product "pProductId" (Constructor parameter) ] <br>
- * , rowdata: [ "PROD2PRODID", "DEST_ID", "SOURCE_ID", "QUANTITY", "OPTIONAL", "TAKEPRICE" ] from DB-Table PROD2PROD <br>
- * , destid: "Parent ProductID" <br>
- * , sourceid: "Child ProductID" <br>
- * , quantity: "Quantity" <br>
- * , optional: "0" = not optional, "1" = optional <br>
- * , takeprice: "0" = no price, "1" = price <br>
- * , productcode: "Productcode" <br>
- * , productid: "Productid" <br>
- * } }
- */
-Prod2ProdUtils.prototype.getPartsListObject = function()
-{
- return this._relateChilds();
-}
-
-/**
- * Delivers a 2D-Array for RecordContainer of Entity "Prod2prod_entity"
- * containing parts list for passed product "productId" (Constructor parameter).
- *
- * It is necessary to generate a specifically UID for the RecordContainer because
- * the same data record can be listed several times. Therefore the primary key "PROD2PRODID"
- * can not be used for UID because this must be unique.
- *
- * @return {String[][]} [ ["UID"
- * , "PARENTID" (equals "DEST_ID")
- * , "PROD2PRODID"
- * , "DEST_ID"
- * , "SOURCE_ID"
- * , "QUANTITY"
- * , "OPTIONAL"
- * , "TAKEPRICE"
- * , "PRODUCTCODE"
- * , "PRODUCTID"] ]
- */
-Prod2ProdUtils.prototype.getPartsListForRecordContainer = function()
-{
- var ret = [];
- var childs = this._relateChilds();
-
- __push(childs.root);
-
- function __push(pObj)
- {
- for(var i = 0; i < pObj.ids.length; i++)
- {
- var rowdata = childs[pObj.ids[i]].rowdata;
- var UID = util.getNewUUID();
- var PARENTID = childs[pObj.ids[i]].destid;
-
- rowdata = [UID, PARENTID].concat(rowdata);
- ret.push(rowdata);
- __push( childs[pObj.ids[i]] );
- }
- }
- return ret;
-}
-
-/**
-* Delivers an Array containing productids of the parts list
-* for passed product "productId" (Constructor parameter).
-*
-*
-* @return {String[]} [ "SOURCE_ID" ]
-*/
-Prod2ProdUtils.prototype.getPartsListProdIds = function()
-{
- var ret = [];
- var childs = this._relateChilds();
-
- __push(childs.root);
-
- return ret;
-
- function __push(pObj)
- {
- for(var i = 0; i < pObj.ids.length; i++)
- {
- ret.push(childs[pObj.ids[i]].sourceid);
- __push( childs[pObj.ids[i]] );
- }
- }
-}
-
-/**
-* Delivers an Array containing productids of the parent list
-* for passed product "productId" (Constructor parameter).
-*
-*
-* @return {String[]} [ "DEST_ID" ]
-*/
-Prod2ProdUtils.prototype.getParentProdIds = function()
-{
- var ret = [];
- var parents = this._relateParents();
-
- __push(parents.root);
-
- return ret;
-
- function __push(pObj)
- {
- for(var i = 0; i < pObj.ids.length; i++)
- {
- ret.push(parents[pObj.ids[i]].destid);
- __push( parents[pObj.ids[i]] );
- }
- }
-}
-
-/**
-* Function to initalize class variable "data" containing complete Prod2Prod-Data.<br>
-* It guarantees a unique load of data per instance.
-*
-* @ignore
-*/
-Prod2ProdUtils.prototype._initProd2ProdData = function()
-{
- if (this.data == undefined) {
- this.data = db.table("select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID "
- + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
- + "order by PRODUCTCODE ");
- }
-}
-
-/**
- * object tree to relate products by DEST_ID / SOURCE_ID.
- **/
-Prod2ProdUtils.prototype._buildTree = function(pSupervised)
-{
- this._initProd2ProdData();
-
- var tree = { root: {ids: [], sourceid: this.productId } };
-
- if(pSupervised)
- tree = { root: {ids: [], destid: this.productId } };
-
- for (var i = 0; i < this.data.length; i++)
- {
- var prod2prodid = this.data[i][0];
- if ( tree[prod2prodid] == undefined )
- {
- tree[prod2prodid] = {
- ids: []
- , rowdata: this.data[i].slice(0)//copy to get NativeArray for concatenation
- , destid: this.data[i][1]
- , sourceid: this.data[i][2]
- , quantity: this.data[i][3]
- , optional: this.data[i][4]
- , takeprice: this.data[i][5]
- , productcode: this.data[i][6]
- , productid: this.data[i][7]
- };
- }
- }
-
- return tree;
-
-}
-
-Prod2ProdUtils.prototype._relateChilds = function()
-{
- var tree = this._buildTree(false);
-
- __relate("root");
-
- return tree;
-
- function __relate(pID)
- {
- for ( var id in tree )
- {
- if ( tree[id].destid == tree[pID].sourceid && tree[pID].ids.indexOf(id) == -1 )
- {
- tree[pID].ids.push(id);
- __relate(id);
- }
- }
- }
-}
-
-Prod2ProdUtils.prototype._relateParents = function()
-{
- var tree = this._buildTree(true);
-
- __relate("root");
-
- return tree;
-
-
- function __relate(pID)
- {
- for ( var id in tree )
- {
- if ( tree[id].sourceid == tree[pID].destid && tree[pID].ids.indexOf(id) == -1 )
- {
- tree[pID].ids.push(id);
- __relate(id);
- }
- }
- }
+import("system.logging");
+import("system.util");
+import("system.SQLTYPES");
+import("system.datetime");
+import("system.db");
+import("system.vars");
+import("system.translate");
+import("KeywordRegistry_basic");
+import("Util_lib");
+import("Binary_lib");
+import("Sql_lib");
+import("Keyword_lib");
+import("Data_lib");
+
+/**
+ * utility functions for products
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ProductUtils() {}
+
+/**
+ * Delivers the currently valid product price
+ *
+ * @param {String} pid ProductID
+ * @param {String} buySell possible values: PP, SP
+ *
+ * @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
+ *
+ * @return {Array[]} currently valid product price with currency: [price, "CURRENCY"] or [] if no price found
+ */
+ProductUtils.getCurrentProductPrice = function(pid, buySell) {
+ if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
+ {
+ var today = datetime.clearTime(vars.get("sys.date"), "utc");
+ var actualPriceCondition = SqlCondition.begin()
+ .andPrepare("PRODUCTPRICE.BUYSELL", buySell)
+ .andPrepare("PRODUCTPRICE.PRODUCT_ID", pid)
+ .andPrepare("PRODUCTPRICE.VALID_FROM", today, "# <= ?")
+ .andSqlCondition(SqlCondition.begin()
+ .orPrepare("PRODUCTPRICE.VALID_TO", today, "# >= ?")
+ .or("PRODUCTPRICE.VALID_TO is null"), "1 = 2");
+
+ var productPriceData = db.array(db.ROW, actualPriceCondition.buildSql("select PRICE, CURRENCY from PRODUCTPRICE", "1 = 2", "order by VALID_FROM desc"));
+
+ if (productPriceData[0] && productPriceData[1])
+ return [productPriceData[0], KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1])];
+ else
+ return [];
+ } else {
+ return [];
+ }
+}
+
+/**
+ * Delivers the stock
+ *
+ * @param {String} pid ProductID
+ *
+ * @example productUtils.getStockCount(vars.get("$field.PRODUCTID"))
+ *
+ * @return {String} stock count
+ */
+ProductUtils.getStockCount = function(pid) {
+ if (pid != undefined && pid != "")
+ {
+ var sum = db.cell(SqlCondition.begin()
+ .andPrepare("STOCK.PRODUCT_ID", pid)
+ .buildSql("select sum(QUANTITY * case IN_OUT when 0 then -1 else 1)"
+ + " from STOCK"));
+
+ if (sum == "")
+ sum = "0";
+
+ return sum;
+ }
+ else
+ {
+ throw new Error(translate.withArguments("${PRODUCT_LIB_NO_PRODUCT_ID} function: %0", ["ProductUtils.getStockCount"]));
+ }
+}
+
+/**
+ * Delivers metadata and price lists of the passed product.
+ * If parameter "priceListFilter" is passed valid price lists and the
+ * current price list to use for offer/order are delivered.
+ *
+ * @param {String} pid req ProductID
+ * @param {Object} priceListFilter opt { currency: "currencyValue", quantity: "quantityValue", relationId: "relationIdValue (for custom price lists)" }
+ * @param {String[]} additionalProductInfoFields additional fields from Product
+ * They are added to the result with the Fieldname as key. e.g. if the array is ["INFO"] the result will contain the key "INFO"
+ *
+ * @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
+ * var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
+ * var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ * var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ * var pUtils = new ProductUtils();
+ * var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
+ * var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
+ *
+ * @return {Object} { <br>
+ * productId: "productid" <br>
+ * , productName: "product name" <br>
+ * , groupCode: "keyvalue of keyword 'GROUPCODE'" <br>
+ * , unit: "keyvalue of keyword 'UNIT'" <br>
+ * , PriceLists: {$pricelistid$ { <br>
+ * priceListId: "pricelistid" <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
+ * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , price: "price" <br>
+ * , vat: "vat" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * } } <br>
+ * , CurrentValidPriceLists: {$pricelistid$ { <br>
+ * priceListId: "pricelistid" <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
+ * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , price: "price" <br>
+ * , vat: "vat" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * } } <br>
+ * , PriceListToUse: {$pricelistid$ { <br>
+ * priceListId: "pricelistid" <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
+ * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , price: "price" <br>
+ * , vat: "vat" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * } }, <br>
+ * INFO: "the productinfo"
+ * }
+ */
+ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoFields)
+{
+ if (additionalProductInfoFields == undefined) {additionalProductInfoFields = []}
+ var ProductDetails = {};
+
+ var cols = [];
+ var colsProduct = ["PRODUCT.PRODUCTID", "PRODUCT.PRODUCTNAME", "PRODUCT.GROUPCODEID", "PRODUCT.UNIT"];
+ var defaultProductFieldCount = colsProduct.length;
+ colsProduct = colsProduct.concat(additionalProductInfoFields.map(function(item) {return "PRODUCT." + item}));
+
+ cols = cols.concat(colsProduct);
+
+ var joins = [];
+ var orderby = ["PRODUCTID"];
+
+ //PriceList (all)
+ var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
+ , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
+
+ cols = cols.concat(colsPricelistAll);
+ joins.push(" left join PRODUCTPRICE allPP on allPP.PRODUCT_ID = PRODUCTID ");
+
+ //PriceList (currently valid)
+ var validPriceLists = false;
+ if (priceListFilter != undefined
+ && priceListFilter.currency != undefined && priceListFilter.currency != ""
+ && priceListFilter.quantity != undefined && priceListFilter.quantity != "")
+ {
+ validPriceLists = true;
+ var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
+ , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
+ orderby = orderby.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
+
+ cols = cols.concat(colsPricelistValid);
+ joins.push("left join PRODUCTPRICE validPP on "
+ + db.translateCondition(SqlCondition.begin()
+ .and("validPP.PRODUCT_ID = PRODUCTID")
+ .andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
+ .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
+ .andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
+ .andSqlCondition(SqlCondition.begin()
+ .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
+ .orSqlCondition(SqlCondition.begin()
+ .and("validPP.CONTACT_ID is null")
+ .andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'),
+ "1 = 2"),
+ "1 = 2")
+ .build("1 = 2")))
+ }
+
+ var ProductDataSql = SqlCondition.begin()
+ .andPrepare("PRODUCT.PRODUCTID", pid)
+ .buildSql("select " + cols.join(", ") + " from PRODUCT " + joins.join(" "),
+ "1 = 2",
+ "order by " + orderby.join(", "))
+
+ var ProductData = db.table(ProductDataSql);
+
+ for (var i = 0; i < ProductData.length; i++)
+ {
+ //Product
+ if (ProductDetails.productId == undefined)
+ {
+ ProductDetails = {
+ productId: ProductData[i][0]
+ , productName: ProductData[i][1]
+ , groupCode: ProductData[i][2]
+ , unit: ProductData[i][3]
+ , PriceLists: {}
+ , CurrentValidPriceLists: {}
+ , PriceListToUse: null
+ };
+
+ // add additional fields to the details
+ var countPos = defaultProductFieldCount;
+ additionalProductInfoFields.forEach(function(productField)
+ {
+ this[productField] = ProductData[i][countPos];
+ countPos++;
+ }, ProductDetails);
+ }
+ //Pricelist (all)
+ var colIdx = colsProduct.length;
+ if (ProductData[i][colIdx] != "" && ProductDetails.PriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
+ {
+ ProductDetails.PriceLists[ProductData[i][colIdx]] = _getPriceListObject();
+ }
+
+ //Pricelist (currently valid)
+ colIdx = colsProduct.length + colsPricelistAll.length;
+ if (validPriceLists)
+ {
+ if (ProductData[i][colIdx] != "" && ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
+ {
+ ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] = _getPriceListObject();
+ }
+ }
+ }
+
+ if (validPriceLists)
+ ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
+
+ return ProductDetails;
+
+ function _getPriceListObject() {
+ return {
+ priceListId: ProductData[i][colIdx++]
+ , relationId: ProductData[i][colIdx++]
+ , priceList: ProductData[i][colIdx++]
+ , price: ProductData[i][colIdx++]
+ , vat: ProductData[i][colIdx++]
+ , validFrom: ProductData[i][colIdx++]
+ , validTo: ProductData[i][colIdx++]
+ , buySell: ProductData[i][colIdx++]
+ , fromQuantity: ProductData[i][colIdx++]
+ , currency: ProductData[i][colIdx++]
+ };
+ }
+
+ //price list to use for offer/order
+ function _getPriceListToUse(priceLists, priceListFilter) {
+ for (var list in priceLists) {
+ //custom price (defined in Org -> Conditions)
+ if (priceListFilter.relationId != "" && priceListFilter.relationId == priceLists[list].relationId) {
+ return priceLists[list];
+ }
+ //customer deposited price list (defined by Attribute)
+ if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
+ return priceLists[list];
+ }
+ //default price list
+ if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
+ return priceLists[list];
+ }
+ }
+
+ //no valid price list found
+ return null;
+ }
+}
+
+/**
+ * Checks if there is already an existing price list identical to the passed price list
+ *
+ * @param {String} pid ProductID
+ * @param {Object} priceList { <br>
+ * priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * }
+ *
+ * @example //Productprice_entity, Field: PRICELIST, Process: onValidation
+ * var pUtils = new ProductUtils();
+ * var priceList = {
+ * priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
+ * , fromQuantity: vars.get("$field.FROMQUANTITY")
+ * , buySell: vars.get("$field.BUYSELL")
+ * , currency: vars.get("$field.CURRENCY")
+ * , validFrom: vars.get("$field.VALID_FROM")
+ * , validTo: vars.get("$field.VALID_TO")
+ * };
+ *
+ * var identicalPriceList = pUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
+ * if (identicalPriceList != null)
+ * {
+ * result.string(translate.text("Identical price list found!"));
+ * }
+ *
+ * @return {Object | null} null if no identical price list was found, otherwise the found price list
+ */
+ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
+ var PriceLists = this.getProductDetails(pid).PriceLists;
+
+ for (var pricelist in PriceLists) {
+ //different pricelist id
+ //equal price list
+ //equal fromquantity
+ //equal currency
+ //equal pp/sp
+ if (priceList.priceListId != PriceLists[pricelist].priceListId
+ && priceList.priceList == PriceLists[pricelist].priceList
+ && parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity)
+ && priceList.buySell == PriceLists[pricelist].buySell
+ && priceList.currency == PriceLists[pricelist].currency) {
+
+ //identical validFrom & validTo
+ // OR NOT [ validFrom_new <= validFrom & validTo_new <= validTo
+ // OR validFrom_new >= validFrom & validTo_new >= validTo
+ // OR validFrom_new < validFrom & validTo_new > validTo
+ // ]
+ if (priceList.validFrom == PriceLists[pricelist].validFrom && priceList.validTo == PriceLists[pricelist].validTo
+ || ! (priceList.validFrom <= PriceLists[pricelist].validFrom && priceList.validTo <= PriceLists[pricelist].validTo
+ || priceList.validFrom >= PriceLists[pricelist].validFrom && priceList.validTo >= PriceLists[pricelist].validTo
+ || priceList.validFrom < PriceLists[pricelist].validFrom && priceList.validTo > PriceLists[pricelist].validTo)) {
+ //identical price list found
+ return PriceLists[pricelist];
+ }
+ }
+ }
+
+ //no identical price list found
+ return null;
+}
+
+/**
+ * returns the image for a product
+ *
+ * @param {String} pProductId the id of the product.
+ * @param {String} pDefaultText the text, to use for default image generation.
+ * @return {String} base64 coded String of the image. If none existed, the given String is used to create an image.
+ */
+ProductUtils.getImage = function(pProductId, pDefaultText)
+{
+ return ImageUtils.get("PRODUCT", "IMAGE", pProductId, pDefaultText);
+}
+
+/**
+ * sets the image of a product
+ *
+ * @param {String} pProductId the id of the product.
+ * @param {String} pImageDateBase64 base64 coded String of the image.
+ * @return {Boolean} if image could be set
+ */
+ProductUtils.setImage = function(pProductId, pImageDateBase64)
+{
+ return ImageUtils.set("PRODUCT", "IMAGE", pProductId, pImageDateBase64, "ProductImage", "Image of the product");
+}
+
+/**
+ * deletes the image of a product
+ *
+ * @param {String} pProductId the id of the product.
+ * @return {Boolean} if image could be removed
+ */
+ProductUtils.removeImage = function(pProductId)
+{
+ return ImageUtils.remove("PRODUCT", "IMAGE", pProductId);
+}
+
+/**
+ * Class containing utility functions for Prod2Prod (Parts list)
+ *
+ * @param {String} productId req ProductID
+ *
+ * @class
+ *
+ */
+function Prod2ProdUtils(productId)
+{
+ this.productId = productId;
+ this.data = undefined;
+}
+
+/**
+ * Delivers an Object containing parts list structure for passed product "pProductId" (Constructor parameter)
+ *
+ * @return {Object} { $prod2prodid$ { <br>
+ * ids: [ Array containing child Prod2ProdIds for passed product "pProductId" (Constructor parameter) ] <br>
+ * , rowdata: [ "PROD2PRODID", "DEST_ID", "SOURCE_ID", "QUANTITY", "OPTIONAL", "TAKEPRICE" ] from DB-Table PROD2PROD <br>
+ * , destid: "Parent ProductID" <br>
+ * , sourceid: "Child ProductID" <br>
+ * , quantity: "Quantity" <br>
+ * , optional: "0" = not optional, "1" = optional <br>
+ * , takeprice: "0" = no price, "1" = price <br>
+ * , productcode: "Productcode" <br>
+ * , productid: "Productid" <br>
+ * } }
+ */
+Prod2ProdUtils.prototype.getPartsListObject = function()
+{
+ return this._relateChilds();
+}
+
+/**
+ * Delivers a 2D-Array for RecordContainer of Entity "Prod2prod_entity"
+ * containing parts list for passed product "productId" (Constructor parameter).
+ *
+ * It is necessary to generate a specifically UID for the RecordContainer because
+ * the same data record can be listed several times. Therefore the primary key "PROD2PRODID"
+ * can not be used for UID because this must be unique.
+ *
+ * @return {String[][]} [ ["UID"
+ * , "PARENTID" (equals "DEST_ID")
+ * , "PROD2PRODID"
+ * , "DEST_ID"
+ * , "SOURCE_ID"
+ * , "QUANTITY"
+ * , "OPTIONAL"
+ * , "TAKEPRICE"
+ * , "PRODUCTCODE"
+ * , "PRODUCTID"] ]
+ */
+Prod2ProdUtils.prototype.getPartsListForRecordContainer = function()
+{
+ var ret = [];
+ var childs = this._relateChilds();
+
+ __push(childs.root);
+
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
+ var rowdata = childs[pObj.ids[i]].rowdata;
+ var UID = util.getNewUUID();
+ var PARENTID = childs[pObj.ids[i]].destid;
+
+ rowdata = [UID, PARENTID].concat(rowdata);
+ ret.push(rowdata);
+ __push( childs[pObj.ids[i]] );
+ }
+ }
+ return ret;
+}
+
+/**
+* Delivers an Array containing productids of the parts list
+* for passed product "productId" (Constructor parameter).
+*
+*
+* @return {String[]} [ "SOURCE_ID" ]
+*/
+Prod2ProdUtils.prototype.getPartsListProdIds = function()
+{
+ var ret = [];
+ var childs = this._relateChilds();
+
+ __push(childs.root);
+
+ return ret;
+
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
+ ret.push(childs[pObj.ids[i]].sourceid);
+ __push( childs[pObj.ids[i]] );
+ }
+ }
+}
+
+/**
+* Delivers an Array containing productids of the parent list
+* for passed product "productId" (Constructor parameter).
+*
+*
+* @return {String[]} [ "DEST_ID" ]
+*/
+Prod2ProdUtils.prototype.getParentProdIds = function()
+{
+ var ret = [];
+ var parents = this._relateParents();
+
+ __push(parents.root);
+
+ return ret;
+
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
+ ret.push(parents[pObj.ids[i]].destid);
+ __push( parents[pObj.ids[i]] );
+ }
+ }
+}
+
+/**
+* Function to initalize class variable "data" containing complete Prod2Prod-Data.<br>
+* It guarantees a unique load of data per instance.
+*
+* @ignore
+*/
+Prod2ProdUtils.prototype._initProd2ProdData = function()
+{
+ if (this.data == undefined) {
+ this.data = db.table("select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID "
+ + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
+ + "order by PRODUCTCODE ");
+ }
+}
+
+/**
+ * object tree to relate products by DEST_ID / SOURCE_ID.
+ **/
+Prod2ProdUtils.prototype._buildTree = function(pSupervised)
+{
+ this._initProd2ProdData();
+
+ var tree = { root: {ids: [], sourceid: this.productId } };
+
+ if(pSupervised)
+ tree = { root: {ids: [], destid: this.productId } };
+
+ for (var i = 0; i < this.data.length; i++)
+ {
+ var prod2prodid = this.data[i][0];
+ if ( tree[prod2prodid] == undefined )
+ {
+ tree[prod2prodid] = {
+ ids: []
+ , rowdata: this.data[i].slice(0)//copy to get NativeArray for concatenation
+ , destid: this.data[i][1]
+ , sourceid: this.data[i][2]
+ , quantity: this.data[i][3]
+ , optional: this.data[i][4]
+ , takeprice: this.data[i][5]
+ , productcode: this.data[i][6]
+ , productid: this.data[i][7]
+ };
+ }
+ }
+
+ return tree;
+
+}
+
+Prod2ProdUtils.prototype._relateChilds = function()
+{
+ var tree = this._buildTree(false);
+
+ __relate("root");
+
+ return tree;
+
+ function __relate(pID)
+ {
+ for ( var id in tree )
+ {
+ if ( tree[id].destid == tree[pID].sourceid && tree[pID].ids.indexOf(id) == -1 )
+ {
+ tree[pID].ids.push(id);
+ __relate(id);
+ }
+ }
+ }
+}
+
+Prod2ProdUtils.prototype._relateParents = function()
+{
+ var tree = this._buildTree(true);
+
+ __relate("root");
+
+ return tree;
+
+
+ function __relate(pID)
+ {
+ for ( var id in tree )
+ {
+ if ( tree[id].sourceid == tree[pID].destid && tree[pID].ids.indexOf(id) == -1 )
+ {
+ tree[pID].ids.push(id);
+ __relate(id);
+ }
+ }
+ }
}
\ No newline at end of file
--
GitLab
From c3fe33dbebafc65ff489df5554f2434d8534e89b Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@aschindlbeck-nb.aditosoftware.local>
Date: Tue, 26 Mar 2019 11:50:00 +0100
Subject: [PATCH 055/250] Vat in % language fix
---
entity/Orderitem_entity/Orderitem_entity.aod | 622 +++++++++----------
1 file changed, 311 insertions(+), 311 deletions(-)
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index c7e1d5c6d7..de79c9ea43 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,311 +1,311 @@
-<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>Orderitem_entity</name>
- <title>Orderitem</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
- <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ASSIGNEDTO</name>
- </entityField>
- <entityField>
- <name>DISCOUNT</name>
- <title>Discount</title>
- </entityField>
- <entityField>
- <name>GROUPCODEID</name>
- <title>Commodity group</title>
- <consumer>KeywordProductGroupcodes</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ITEMNAME</name>
- <title>Designation</title>
- </entityField>
- <entityField>
- <name>ITEMPOSITION</name>
- <title>Position</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ITEMSORT</name>
- </entityField>
- <entityField>
- <name>SALESORDERITEMID</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SALESORDER_ID</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRICE</name>
- <title>Unit price</title>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
- <title>Article</title>
- <consumer>Products</consumer>
- <linkedContext>Product</linkedContext>
- <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
- <title>Quantity</title>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
- <onValidation></onValidation>
- <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>UNIT</name>
- <title>Unit</title>
- <consumer>KeywordQuantityUnits</consumer>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>VAT</title>
- <state>AUTO</state>
- </entityField>
- <entityParameter>
- <name>OrderId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>TotalPrice</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
- <title>Sum</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- <onValidation></onValidation>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Orderitems</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>INFO</name>
- <title>Note</title>
- </entityField>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </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>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
- <tableName>SALESORDERITEM</tableName>
- <primaryKey>SALESORDERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ASSIGNEDTO.value</name>
- <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISCOUNT.value</name>
- <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.value</name>
- <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMNAME.value</name>
- <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMPOSITION.value</name>
- <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMSORT.value</name>
- <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESORDERITEMID.value</name>
- <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESORDER_ID.value</name>
- <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OPTIONAL.value</name>
- <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICE.value</name>
- <recordfield>SALESORDERITEM.PRICE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>QUANTITY.value</name>
- <recordfield>SALESORDERITEM.QUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.value</name>
- <recordfield>SALESORDERITEM.UNIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>SALESORDERITEM.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>SALESORDERITEM.INFO</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>Orderitem_entity</name>
+ <title>Orderitem</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
+ <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ASSIGNEDTO</name>
+ </entityField>
+ <entityField>
+ <name>DISCOUNT</name>
+ <title>Discount</title>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <title>Commodity group</title>
+ <consumer>KeywordProductGroupcodes</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMNAME</name>
+ <title>Designation</title>
+ </entityField>
+ <entityField>
+ <name>ITEMPOSITION</name>
+ <title>Position</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMSORT</name>
+ </entityField>
+ <entityField>
+ <name>SALESORDERITEMID</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SALESORDER_ID</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <title>Optional</title>
+ <contentType>BOOLEAN</contentType>
+ <mandatory v="true" />
+ <possibleItemsProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <title>Unit price</title>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
+ <title>Article</title>
+ <consumer>Products</consumer>
+ <linkedContext>Product</linkedContext>
+ <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
+ <title>Quantity</title>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValidation></onValidation>
+ <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <title>Unit</title>
+ <consumer>KeywordQuantityUnits</consumer>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>VAT in %</title>
+ <state>AUTO</state>
+ </entityField>
+ <entityParameter>
+ <name>OrderId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TotalPrice</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
+ <title>Sum</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ <onValidation></onValidation>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OrderStatus_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Orderitems</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>INFO</name>
+ <title>Note</title>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </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>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
+ <tableName>SALESORDERITEM</tableName>
+ <primaryKey>SALESORDERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ASSIGNEDTO.value</name>
+ <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT.value</name>
+ <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.value</name>
+ <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMNAME.value</name>
+ <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMPOSITION.value</name>
+ <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMSORT.value</name>
+ <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESORDERITEMID.value</name>
+ <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESORDER_ID.value</name>
+ <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OPTIONAL.value</name>
+ <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE.value</name>
+ <recordfield>SALESORDERITEM.PRICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ <recordfield>SALESORDERITEM.QUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.value</name>
+ <recordfield>SALESORDERITEM.UNIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>SALESORDERITEM.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESORDERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
--
GitLab
From 8d341c7b665e8c57349ed833fc4c7c1ac8ed4f99 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 26 Mar 2019 12:04:25 +0100
Subject: [PATCH 056/250] create salesproject with contact_id param
---
entity/Salesproject_entity/Salesproject_entity.aod | 2 ++
.../entityfields/contact_id/displayValueProcess.js | 6 ++++++
.../entityfields/contact_id/valueProcess.js | 7 +++++++
3 files changed, 15 insertions(+)
create mode 100644 entity/Salesproject_entity/entityfields/contact_id/displayValueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 0afca7b3a7..17fe6bc790 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -63,6 +63,8 @@
<consumer>Organisations</consumer>
<linkedContext>Organisation</linkedContext>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>SALESPROJECTID</name>
diff --git a/entity/Salesproject_entity/entityfields/contact_id/displayValueProcess.js b/entity/Salesproject_entity/entityfields/contact_id/displayValueProcess.js
new file mode 100644
index 0000000000..85822946ab
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/contact_id/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+import("system.neon");
+
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/contact_id/valueProcess.js b/entity/Salesproject_entity/entityfields/contact_id/valueProcess.js
new file mode 100644
index 0000000000..1127220726
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/contact_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.ContactId_param"))
+{
+ result.string(vars.get("$param.ContactId_param"));
+}
\ No newline at end of file
--
GitLab
From 14e63f1651d39e9158911980b297a3e34b238d16 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 26 Mar 2019 12:06:20 +0100
Subject: [PATCH 057/250] new modules in 360 degree
---
entity/360Degree_entity/360Degree_entity.aod | 45 +++++++++++++++++++
.../children/newcontract/iconIdProcess.js | 0
.../children/newcontract/onActionProcess.js | 5 +++
.../children/newoffer/onActionProcess.js | 4 ++
.../newsalesproject/onActionProcess.js | 4 ++
.../children/objecttype_param/valueProcess.js | 4 ++
.../entityfields/year/valueProcess.js | 6 +++
.../_____LANGUAGE_EXTRA.aod | 9 ++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 12 +++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 9 ++++
.../360DegreeFilter_view.aod | 8 ++++
process/Contract_lib/process.js | 14 ++++++
process/Salesproject_lib/process.js | 13 ++++++
13 files changed, 133 insertions(+)
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js
create mode 100644 entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
create mode 100644 entity/360Degree_entity/entityfields/year/valueProcess.js
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index b06ecf030f..810f78a70c 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -65,6 +65,51 @@
<title>Date</title>
<contentType>DATE</contentType>
</entityField>
+ <entityProvider>
+ <name>PersonObjects</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>YEAR</name>
+ <title>Year</title>
+ <groupable v="true" />
+ <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/year/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>newModule</name>
+ <title>New module</title>
+ <iconId>VAADIN:PLUS</iconId>
+ <children>
+ <entityActionField>
+ <name>newOffer</name>
+ <fieldType>ACTION</fieldType>
+ <title>Offer</title>
+ <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newSalesproject</name>
+ <fieldType>ACTION</fieldType>
+ <title>Salesproject</title>
+ <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:BOOK_DOLLAR</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newContract</name>
+ <fieldType>ACTION</fieldType>
+ <title>Contract</title>
+ <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_TEXT</iconId>
+ <iconIdProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js</iconIdProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js
new file mode 100644
index 0000000000..c441f436ac
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Contract_lib");
+import("system.logging");
+
+ContractUtils.createNewContract(vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js
new file mode 100644
index 0000000000..0be1b35b78
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Offer_lib");
+
+OfferUtils.createNewOffer(null, vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js
new file mode 100644
index 0000000000..d7426e72df
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Salesproject_lib");
+
+Salesproject.createNewSalesproject(vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..bb07a1ee2e
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object(["Salesproject", "Offer", "Contract"]);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/year/valueProcess.js b/entity/360Degree_entity/entityfields/year/valueProcess.js
new file mode 100644
index 0000000000..c21dcc8cde
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/year/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.datetime");
+import("system.result");
+import("system.vars");
+
+var dateVal = vars.get("$field.DATE");
+result.string(datetime.toDate(dateVal, "yyyy"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index a4180005ab..39ba8770d5 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2577,6 +2577,15 @@
<entry>
<key>This combination of person and organisation does already exist and can not be created once more.</key>
</entry>
+ <entry>
+ <key>New module</key>
+ </entry>
+ <entry>
+ <key>New salesproject</key>
+ </entry>
+ <entry>
+ <key>New contract</key>
+ </entry>
<entry>
<key>Time in minutes</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 7fe597e082..499739e2d4 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -42,10 +42,18 @@
<key>Show all activities</key>
<value>Alle Aktivitäten anzeigen</value>
</entry>
+ <entry>
+ <key>New contract</key>
+ <value>Neuer Vertrag</value>
+ </entry>
<entry>
<key>${ADDRESS_STATE}</key>
<value>Staat</value>
</entry>
+ <entry>
+ <key>New module</key>
+ <value>Neuanlage</value>
+ </entry>
<entry>
<key>Show all contracts</key>
<value>Alle Verträge anzeigen</value>
@@ -1856,6 +1864,10 @@
<key>Cabo Verde</key>
<value>Cabo Verde</value>
</entry>
+ <entry>
+ <key>New salesproject</key>
+ <value>Neues Vertriebsprojekt</value>
+ </entry>
<entry>
<key>Ecuador</key>
<value>Ecuador</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index eec3b184f0..39e9b302cf 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2605,6 +2605,15 @@
<entry>
<key>Time in minutes</key>
</entry>
+ <entry>
+ <key>New module</key>
+ </entry>
+ <entry>
+ <key>New salesproject</key>
+ </entry>
+ <entry>
+ <key>New contract</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index 3ad97c3f6f..46a3db16a6 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -11,6 +11,7 @@
<children>
<treetableViewTemplate>
<name>Treetable</name>
+ <favoriteActionGroup2>newModule</favoriteActionGroup2>
<titleField>TITLE</titleField>
<descriptionField>DATE</descriptionField>
<defaultGroupFields>
@@ -18,5 +19,12 @@
</defaultGroupFields>
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
+ <timelineViewTemplate>
+ <name>Timeline</name>
+ <dateField>DATE</dateField>
+ <titleField>TITLE</titleField>
+ <descriptionField>CONTEXT_NAME</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
</children>
</neonView>
diff --git a/process/Contract_lib/process.js b/process/Contract_lib/process.js
index 292b26d66d..ad766aa91e 100644
--- a/process/Contract_lib/process.js
+++ b/process/Contract_lib/process.js
@@ -43,4 +43,18 @@ ContractUtils.validateContractNumber = function(pContractNumber) {
ContractUtils.getContractNumberValidationFailString = function() {
return translate.text("The contract number already exists!");
+}
+
+/**
+ * Create a new contract and open the contract context in NEW-mode
+ */
+ContractUtils.createNewContract = function(pRelationId)
+{
+ var params = {};
+
+ if (pRelationId)
+ params["ContactId_param"] = pRelationId;
+
+
+ neon.openContext("Contract", null, null, neon.OPERATINGSTATE_NEW, params);
}
\ No newline at end of file
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index 6887b3ee1b..380aecbc0d 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -80,3 +80,16 @@ Salesproject.getSalesProjectTitleById = function(pSalesProjectId)
.andPrepare("SALESPROJECT.SALESPROJECTID", pSalesProjectId)
.buildSql("select PROJECTTITLE from SALESPROJECT", "1=0"));
}
+
+/**
+ * Create a new Salesproject and open the Salesproject context in NEW-mode
+ */
+Salesproject.createNewSalesproject= function(pRelationId)
+{
+ var params = {};
+
+ if (pRelationId)
+ params["ContactId_param"] = pRelationId;
+
+ neon.openContext("Salesproject", null, null, neon.OPERATINGSTATE_NEW, params);
+}
--
GitLab
From 6f3b982c5d610ec8a5caeae036d382e82643f538 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 11:45:57 +0100
Subject: [PATCH 058/250] fix displayValue for simple attribute name
---
.../ab_attribute_id/displayValueProcess.js | 4 +++-
.../SalesprojectCompetition_entity.aod | 1 +
.../SalesprojectCompetitionEdit_view.aod | 5 -----
process/Attribute_lib/process.js | 10 +++++++---
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
index 7375ee03d2..acda6626ab 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
@@ -2,4 +2,6 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTE_ID")));
\ No newline at end of file
+result.string(AttributeUtil.getFullAttributeName(
+ vars.get("$field.AB_ATTRIBUTE_ID"),
+ vars.exists("$param.DisplaySimpleName_param") ? vars.get("$param.DisplaySimpleName_param") : false ));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index bdd5fa2a86..33fcc98794 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -219,6 +219,7 @@
<name>Attributes</name>
<title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <state>DISABLED</state>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
index badeadd20f..16ddeeaa24 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
@@ -51,10 +51,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>cba34c27-9abf-416b-99fc-f7e91bd3669c</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index fcd1ba99fa..6b234d3c23 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -61,11 +61,15 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
* returns the name of an attribute with all parent attribute names
*
* @param {String} pAttributeId the id of the attribute
+ * @param {Boolean} [pSimpleName=false] Use only the name of the attribute and not the names of the parents.
*
* @return {String} the name of the attribute
*/
-AttributeUtil.getFullAttributeName = function (pAttributeId)
+AttributeUtil.getFullAttributeName = function (pAttributeId, pSimpleName)
{
+ if (pSimpleName == undefined)
+ pSimpleName = false;
+
if (!pAttributeId)
return "";
var attributeNames = [];
@@ -83,8 +87,8 @@ AttributeUtil.getFullAttributeName = function (pAttributeId)
}
else
pAttributeId = "";
- } while (pAttributeId);
-
+ } while (pAttributeId && !pSimpleName);
+
return attributeNames.reverse().join(" / ");
}
--
GitLab
From 142dd3fbf69954452f2d1bc8c0c1fea01eb15c8e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 12:13:38 +0100
Subject: [PATCH 059/250] fix object relation
---
process/Context_lib/process.js | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 698392214a..5549cd81db 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -108,13 +108,20 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, CreationDate override Tablename (needed if Tablename is a join clause)
+ // contextId,
+ // nameField,
+ // Tablename (or from-part inc, joins),
+ // IDField,
+ // RelationField,
+ // CreationDate override Tablename (needed if Tablename is a join clause)
+
// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
"Organisation": [
"\"NAME\"",
"ORGANISATION",
"ORGANISATIONID",
"",
+ "",
""
],
"Person": [
@@ -143,6 +150,7 @@ ContextUtils._getSelectMap = function()
"SALESPROJECT",
"SALESPROJECTID",
"CONTACT_ID",
+ "",
"STARTDATE"
],
"Contract": [
@@ -153,6 +161,7 @@ ContextUtils._getSelectMap = function()
"CONTRACT",
"CONTRACTID",
"CONTACT_ID",
+ "",
"CONTRACTSTART"
],
"Offer": [
@@ -166,6 +175,7 @@ ContextUtils._getSelectMap = function()
"OFFER",
"OFFERID",
"CONTACT_ID",
+ "",
"OFFERDATE"
],
"Order": [
@@ -179,6 +189,7 @@ ContextUtils._getSelectMap = function()
"SALESORDER",
"SALESORDERID",
"CONTACT_ID",
+ "",
"ORDERDATE"
],
"Product": [
@@ -190,6 +201,7 @@ ContextUtils._getSelectMap = function()
"PRODUCT",
"PRODUCTID",
"",
+ "",
""
],
"Task": [
@@ -198,6 +210,7 @@ ContextUtils._getSelectMap = function()
"TASKID",
translate.text("Task"),
"",
+ "",
""
]
}
--
GitLab
From 2da3aebdf11aa8138ffa3e7aed0e8a452c5d6f79 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 26 Mar 2019 13:21:03 +0100
Subject: [PATCH 060/250] Indexes added, attribute usage inheritance
---
aliasDefinition/Data_alias/Data_alias.aod | 72 +++++++++
.../indexsearchgroups/contract/affectedIds.js | 4 +
.../indexsearchgroups/offer/affectedIds.js | 4 +
.../indexsearchgroups/offer/query.js | 22 +++
.../indexsearchgroups/product/affectedIds.js | 4 +
.../salesorder/affectedIds.js | 4 +
.../indexsearchgroups/salesorder/query.js | 22 +++
.../salesproject/affectedIds.js | 4 +
.../AttributeRelation_entity.aod | 1 +
.../recordcontainers/db/conditionProcess.js | 9 +-
.../AttributeUsage_entity.aod | 8 +
.../ab_attribute_id/valueProcess.js | 4 +-
.../entityfields/object_type/valueProcess.js | 5 +
.../recordcontainers/db/onDBDelete.js | 7 +
.../recordcontainers/db/onDBInsert.js | 8 +
.../recordcontainers/db/onDBUpdate.js | 9 ++
entity/Attribute_entity/Attribute_entity.aod | 5 +
.../attribute_type/stateProcess.js | 6 +-
.../attrparentid_param/valueProcess.js | 5 +-
.../attrparenttype_param/valueProcess.js | 8 +-
.../entityfields/tsest/onActionProcess.js | 3 +
.../entityfields/usagelist/valueProcess.js | 16 +-
.../entityfields/printoffer/stateProcess.js | 2 +-
.../SalesprojectCompetition_entity.aod | 4 +-
.../children/objecttype_param/valueProcess.js | 6 +-
process/Attribute_lib/process.js | 144 ++++++++++++++++++
process/Offer_lib/process.js | 2 +
27 files changed, 364 insertions(+), 24 deletions(-)
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js
create mode 100644 entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js
create mode 100644 entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js
create mode 100644 entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js
create mode 100644 entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js
create mode 100644 entity/Attribute_entity/entityfields/tsest/onActionProcess.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6bc32d7d9d..7e09926aa3 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5130,5 +5130,77 @@
</affectedTables>
<affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js</affectedIds>
</indexSearchGroup>
+ <indexSearchGroup>
+ <name>OFFER</name>
+ <title>Offer</title>
+ <icon>VAADIN:CART</icon>
+ <active v="false" />
+ <idColumn>OFFERID</idColumn>
+ <titleColumn>TITLECOLUMN</titleColumn>
+ <descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js</query>
+ <resultContextNeon>Offer</resultContextNeon>
+ <affectedTables>
+ <element>OFFER</element>
+ </affectedTables>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js</affectedIds>
+ </indexSearchGroup>
+ <indexSearchGroup>
+ <name>SALESORDER</name>
+ <title>Order</title>
+ <icon>VAADIN:DOLLAR</icon>
+ <active v="false" />
+ <idColumn>SALESORDERID</idColumn>
+ <titleColumn>TITLECOLUMN</titleColumn>
+ <descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js</query>
+ <resultContextNeon>Order</resultContextNeon>
+ <affectedTables>
+ <element>SALESORDER</element>
+ </affectedTables>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js</affectedIds>
+ </indexSearchGroup>
+ <indexSearchGroup>
+ <name>CONTRACT</name>
+ <title>Contract</title>
+ <icon>VAADIN:FILE_TEXT</icon>
+ <active v="false" />
+ <idColumn>CONTRACT</idColumn>
+ <titleColumn>TITLECOLUMN</titleColumn>
+ <descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <resultContextNeon>Contract</resultContextNeon>
+ <affectedTables>
+ <element>CONTRACT</element>
+ </affectedTables>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js</affectedIds>
+ </indexSearchGroup>
+ <indexSearchGroup>
+ <name>PRODUCT</name>
+ <title>Product</title>
+ <icon>VAADIN:HAMMER</icon>
+ <active v="false" />
+ <idColumn>PRODUCT</idColumn>
+ <titleColumn>TITLECOLUMN</titleColumn>
+ <descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <resultContextNeon>Product</resultContextNeon>
+ <affectedTables>
+ <element>PRODUCT</element>
+ </affectedTables>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js</affectedIds>
+ </indexSearchGroup>
+ <indexSearchGroup>
+ <name>SALESPROJECT</name>
+ <title>Salesproject</title>
+ <icon>VAADIN:BOOK_DOLLAR</icon>
+ <active v="false" />
+ <idColumn>SALESPROJECT</idColumn>
+ <titleColumn>TITLECOLUMN</titleColumn>
+ <descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <resultContextNeon>Salesproject</resultContextNeon>
+ <affectedTables>
+ <element>SALESPROJECT</element>
+ </affectedTables>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js</affectedIds>
+ </indexSearchGroup>
</indexSearchGroups>
</aliasDefinition>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js
new file mode 100644
index 0000000000..548f327a66
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js
new file mode 100644
index 0000000000..548f327a66
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
new file mode 100644
index 0000000000..d8bff6962e
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
@@ -0,0 +1,22 @@
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Sql_lib");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+if (vars.exists("$local.idvalue")) {
+ affectedIds = vars.get("$local.idvalue");
+ queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ //TODO: refactor this for incremental indexer (injections?)
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select OFFERID, "
+ + "OFFERCODE as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGNAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
+ + " as DESCCOLUMN, OFFERCODE, ORGNAME, CUSTOMERCODE "
+ + " from OFFER "
+ + " join CONTACT on OFFER.CONTACT_ID = CONTACTID "
+ + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
+ + queryCondition + " order by OFFERCODE ";
+result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js
new file mode 100644
index 0000000000..548f327a66
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js
new file mode 100644
index 0000000000..548f327a66
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
new file mode 100644
index 0000000000..39a1d15028
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
@@ -0,0 +1,22 @@
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Sql_lib");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+if (vars.exists("$local.idvalue")) {
+ affectedIds = vars.get("$local.idvalue");
+ queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ //TODO: refactor this for incremental indexer (injections?)
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select SALESORDERID, "
+ + " ORDERCODE as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGNAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
+ + " as DESCCOLUMN, ORDERCODE, ORGNAME, CUSTOMERCODE "
+ + " from SALESORDER "
+ + " join RELATION on SALESORDER.RELATION_ID = RELATIONID "
+ + " join ORG on ORGID = RELATION.ORG_ID "
+ + queryCondition + " order by ORDERCODE ";
+result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js
new file mode 100644
index 0000000000..548f327a66
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index cabd4f0e48..e257ce32b6 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -99,6 +99,7 @@
<entityParameter>
<name>ObjectRowId_param</name>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
index aee4108914..623fac4157 100644
--- a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
@@ -1,14 +1,17 @@
+import("system.logging");
import("system.vars");
import("system.db");
import("system.result");
import("Sql_lib");
-
-
var cond = SqlCondition.begin()
.andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.ObjectRowId_param");
-if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+if (vars.exists("$param.ObjectRowId_param"))
+ logging.log(vars.get("$param.ObjectRowId_param"))
+
+if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param")
+ && vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
{
var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
var filteredIdsCondition = new SqlCondition();
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 18af22e834..db802200ad 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -13,7 +13,12 @@
<name>OBJECT_TYPE</name>
<title>Module</title>
<consumer>Context</consumer>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
</entityField>
<entityField>
<name>AB_ATTRIBUTEUSAGEID</name>
@@ -71,6 +76,9 @@
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBInsert>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
diff --git a/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js b/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js
index c3a2248b66..9efed36fc2 100644
--- a/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js
+++ b/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js
@@ -3,4 +3,6 @@ import("system.result");
import("system.neon");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.AttributeId_param") && vars.get("$param.AttributeId_param") != null)
- result.string(vars.get("$param.AttributeId_param"));
\ No newline at end of file
+ result.string(vars.get("$param.AttributeId_param"));
+else if (vars.get("$field.AB_ATTRIBUTE_ID"))
+ result.string(vars.get("$field.AB_ATTRIBUTE_ID"));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js b/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000..40b7c76fc5
--- /dev/null
+++ b/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+
+//this is a workaround to get the old value in the onDBUpdate process
+//@TODO replace this when it's possible to get the old value in onDBUpdate
+vars.set("$context.originalObjectType", vars.get("$field.OBJECT_TYPE"));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js b/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000..b41e99cd82
--- /dev/null
+++ b/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("Attribute_lib");
+
+var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
+var objectType = vars.get("$field.OBJECT_TYPE");
+
+AttributeUsageUtil.deleteChildrenUsages(attributeId, objectType);
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js b/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000..73c28f2916
--- /dev/null
+++ b/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Attribute_lib");
+
+var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
+var objectType = vars.get("$field.OBJECT_TYPE");
+
+AttributeUsageUtil.insertChildrenUsages(attributeId, objectType);
+AttributeUsageUtil.removeDuplicates(attributeId);
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js b/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js
new file mode 100644
index 0000000000..02890f1b92
--- /dev/null
+++ b/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("Attribute_lib");
+
+var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
+var oldObjectType = vars.get("$context.originalObjectType");
+var newObjectType = vars.get("$field.OBJECT_TYPE");
+
+AttributeUsageUtil.updateChildrenUsages(attributeId, oldObjectType, newObjectType);
+AttributeUsageUtil.removeDuplicates(attributeId);
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 405955e8bd..a5c910a2b9 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -240,6 +240,11 @@
<title>Name</title>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/name_with_type/valueProcess.js</valueProcess>
</entityField>
+ <entityActionField>
+ <name>tsest</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/tsest/onActionProcess.js</onActionProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
index b768fb2fba..82e1e3f89f 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -8,5 +8,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.
{
var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
if (type == $AttributeTypes.COMBO)
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
\ No newline at end of file
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
+else if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
+ result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js
index f2318723e8..b68489b6e0 100644
--- a/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js
@@ -1,4 +1,7 @@
import("system.vars");
import("system.result");
+import("Attribute_lib");
-result.string(vars.getString("$field.AB_ATTRIBUTEID"));
+var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
+if (type == $AttributeTypes.GROUP || type == $AttributeTypes.COMBO)
+ result.string(vars.getString("$field.AB_ATTRIBUTEID"));
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js
index 372decd862..fe18eca06c 100644
--- a/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js
@@ -1,10 +1,4 @@
-import("system.neon");
import("system.vars");
import("system.result");
-var type;
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
- type = "GETGROUPS";
-else
- type = vars.getString("$field.ATTRIBUTE_TYPE").trim()
-result.string(type);
+result.string(vars.getString("$field.ATTRIBUTE_TYPE").trim());
diff --git a/entity/Attribute_entity/entityfields/tsest/onActionProcess.js b/entity/Attribute_entity/entityfields/tsest/onActionProcess.js
new file mode 100644
index 0000000000..dd3c5349ea
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/tsest/onActionProcess.js
@@ -0,0 +1,3 @@
+import("Attribute_lib");
+
+AttributeUsageUtil.removeDuplicates();
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/usagelist/valueProcess.js b/entity/Attribute_entity/entityfields/usagelist/valueProcess.js
index 0192da48ac..675da9521d 100644
--- a/entity/Attribute_entity/entityfields/usagelist/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/usagelist/valueProcess.js
@@ -3,10 +3,16 @@ import("system.result");
import("system.db");
import("system.vars");
import("Sql_lib");
+import("Attribute_lib");
-var usages = db.array(db.COLUMN, SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", vars.get("$field.AB_ATTRIBUTEID"))
- .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE"));
-var usageStr = translate.text("Usage");
+var retStr = "\u00A0"; // \u00A0 -> space character that doesn't get trimmed
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() != $AttributeTypes.COMBOVALUE)
+{
+ var usages = db.array(db.COLUMN, SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", vars.get("$field.AB_ATTRIBUTEID"))
+ .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE"));
+ if (usages.length)
+ retStr = translate.text("Usage") + ": " + usages.join(", ");
+}
-result.string(usages.length ? usageStr + ": " + usages.join(", ") : "\u00A0"); // \u00A0 -> space character that doesn't get trimmed
\ No newline at end of file
+result.string(retStr);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/printoffer/stateProcess.js b/entity/Offer_entity/entityfields/printoffer/stateProcess.js
index b6ef75cff7..bb8a76fc63 100644
--- a/entity/Offer_entity/entityfields/printoffer/stateProcess.js
+++ b/entity/Offer_entity/entityfields/printoffer/stateProcess.js
@@ -10,4 +10,4 @@ var itemcount = db.cell(SqlCondition.begin()
if(itemcount == "0")
result.string(neon.COMPONENTSTATE_DISABLED);
else
- result.string(neon.COMPONENTSTATE_AUTO);
\ No newline at end of file
+ result.string(neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 33fcc98794..0df2e74d7c 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -229,17 +229,15 @@
<entityParameter>
<name>FilteredAttributeIds_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
- <expose v="false" />
</entityParameter>
<entityParameter>
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
</entityParameter>
<entityParameter>
<name>DisplaySimpleName_param</name>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 41202c0153..9acfa14ada 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,3 +1,7 @@
+import("system.vars");
import("system.result");
-result.string("Organisation");
+if (vars.get("$field.CONTACT_ID"))
+ result.string("Organisation");
+else
+ result.string("true");
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 6b234d3c23..ff994422d9 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1,3 +1,5 @@
+import("system.logging");
+import("system.util");
import("system.datetime");
import("system.translate");
import("system.neon");
@@ -486,3 +488,145 @@ AttributeTypeUtil.getTypeColumnIndex = function (pAttributeType)
AttributeTypeUtil._initTypeColumnData();
return this._typeColumnMap[pAttributeType.trim()];
}
+
+/*********************************************************************************************************************/
+
+/**
+ * @class
+ */
+function AttributeUsageUtil () {}
+
+AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
+{
+ var table = "AB_ATTRIBUTEUSAGE";
+ var columns = ["AB_ATTRIBUTEUSAGEID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE"];
+ var types = db.getColumnTypes(table, columns);
+
+ var sqlSelect = "select AB_ATTRIBUTEID, "
+ + " exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID and OBJECT_TYPE = '"
+ + pObjectType + "') from AB_ATTRIBUTE";
+
+ var inserts = [];
+ _addInserts(pAttributeId, pObjectType);
+ db.inserts(inserts);
+
+ function _addInserts (pAttributeId, pObjectType)
+ {
+ var condition = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
+ var attributes = db.table(condition.buildSql(sqlSelect));
+
+ attributes.forEach(function (row)
+ {
+ if (row[1] != "true")
+ {
+ let values = [util.getNewUUID(), row[0], pObjectType];
+ inserts.push([table, columns, types, values]);
+ }
+ _addInserts(row[0], pObjectType);
+ });
+ }
+}
+
+AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType, pNewObjectType)
+{
+ if (!pNewObjectType)
+ return;
+
+ var table = "AB_ATTRIBUTEUSAGE";
+
+ var sqlSelect = "select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID, "
+ + " exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID and OBJECT_TYPE = '"
+ + pNewObjectType + "')"
+ + " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pOldObjectType + "'";
+
+ var updateIds = [];
+
+ //it is possible that the new objectType is already in a subordinate attribute
+ //and an update could cause a duplicate entry so one has to be deleted
+ var deleteIds = [];
+
+ _addUpdateIds(pAttributeId, pOldObjectType);
+
+ if (updateIds.length)
+ db.updateData(table, ["OBJECT_TYPE"], null, [pNewObjectType], SqlCondition.begin()
+ .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID in ('" + updateIds.join("','") + "')")
+ .build("1=2")
+ );
+ if (deleteIds.length)
+ db.deleteData(table, SqlCondition.begin()
+ .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID in ('" + deleteIds.join("','") + "')")
+ .build("1=2"));
+
+ function _addUpdateIds (pAttributeId)
+ {
+ var condition = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
+ var attributes = db.table(condition.buildSql(sqlSelect));
+
+ attributes.forEach(function (row)
+ {
+ if (row[1] && row[2] == "true")
+ deleteIds.push(row[1]);
+ else if (row[1])
+ updateIds.push(row[1]);
+ _addUpdateIds(row[0]);
+ });
+ }
+}
+
+AttributeUsageUtil.deleteChildrenUsages = function (pAttributeId, pObjectType)
+{
+ var table = "AB_ATTRIBUTEUSAGE";
+
+ var sqlSelect = "select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID "
+ + " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pObjectType + "'";
+
+ var deleteIds = [];
+ _addDeleteIds(pAttributeId, pObjectType);
+ if (deleteIds.length)
+ db.deleteData(table, SqlCondition.begin()
+ .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID in ('" + deleteIds.join("','") + "')")
+ .build("1=2"));
+
+ function _addDeleteIds (pAttributeId)
+ {
+ var condition = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
+ var attributes = db.table(condition.buildSql(sqlSelect));
+
+ attributes.forEach(function (row)
+ {
+ if (row[1])
+ deleteIds.push(row[1]);
+ _addDeleteIds(row[0]);
+ });
+ }
+}
+
+AttributeUsageUtil.removeDuplicates = function (pAttributeId)
+{
+ var condition = SqlCondition.begin()
+ .and("exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE AU where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AU.AB_ATTRIBUTE_ID "
+ + "and AB_ATTRIBUTEUSAGE.OBJECT_TYPE = AU.OBJECT_TYPE and AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID != AU.AB_ATTRIBUTEUSAGEID)");
+ if (pAttributeId)
+ condition.andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", pAttributeId);
+
+ var duplicates = db.table(condition.buildSql("select AB_ATTRIBUTEUSAGEID, AB_ATTRIBUTE_ID, OBJECT_TYPE from AB_ATTRIBUTEUSAGE"));
+ var usageObj = {};
+ var deleteCond = SqlCondition.begin();
+
+ duplicates.forEach(function (row)
+ {
+ if (!(row[1] in this))
+ this[row[1]] = {};
+ if (row[2] in this[row[1]])
+ deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[0]);
+ this[row[1]][row[2]] = true;
+ }, usageObj);
+ if (deleteCond.isSet())
+ db.deleteData("AB_ATTRIBUTEUSAGE", deleteCond.build("1=2"));
+}
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index aa218c4ff4..b4c8bea33f 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -148,6 +148,8 @@ OfferUtils.openOfferReport = function (pOfferID)
);
var itemData = db.table(offerItemSql);
+ if (itemData.length == 0)
+ return;
// TODO: AddrObject implementieren
//var addrobj = new AddrObject(contactId);
--
GitLab
From 762433975dc1e376f322bb7da736ba6fd43add50 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 13:47:05 +0100
Subject: [PATCH 061/250] fix product tree
---
entity/Prod2prod_entity/Prod2prod_entity.aod | 8 +++-----
.../recordcontainers/jdito/contentProcess.js | 2 +-
.../Prod2prod_entity/recordcontainers/jdito/onDelete.js | 3 ++-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 80bbc2d7cd..78d288fbd0 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -52,11 +52,6 @@
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityField>
- <name>PARENTID</name>
- <title>Parent</title>
- <groupable v="true" />
- </entityField>
<entityField>
<name>PROD2PRODID</name>
<valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js</valueProcess>
@@ -145,6 +140,9 @@
<element>QUANTITY.value</element>
<element>PRODUCTCODE.value</element>
<element>PRODUCTID.value</element>
+ <element>PROD2PRODID.value</element>
+ <element>OPTIONAL.value</element>
+ <element>TAKEPRICE.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
index 2e71e4c9dd..eeef1e962f 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
@@ -119,7 +119,7 @@ if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
if(prodid != "")
{
// First 3 columns are crucial, the rest is optional.
- var data = db.table("select PROD2PRODID, SOURCE_ID, DEST_ID, QUANTITY, PRODUCTCODE, PRODUCTID "
+ var data = db.table("select PROD2PRODID, SOURCE_ID, DEST_ID, QUANTITY, PRODUCTCODE, PRODUCTID, PROD2PRODID, OPTIONAL, TAKEPRICE "
+ "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
+ "order by PRODUCTCODE");
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js b/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js
index 75472b5759..3f5b37d8a0 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js
@@ -1,3 +1,4 @@
+import("system.vars");
import("system.neon");
import("system.db");
import("Sql_lib");
@@ -7,4 +8,4 @@ db.deleteData("PROD2PROD", SqlCondition.begin()
.build("1=2"));
// Refresh otherwise the children of the deleted node would be moved to the root.
-neon.refresh()
\ No newline at end of file
+neon.refresh();
\ No newline at end of file
--
GitLab
From 8568b555a54267b48a3b05a63f708b2b9a478039 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 11:29:52 +0100
Subject: [PATCH 062/250] Contact: added droplists for department, contactrole
and position
---
entity/Contact_entity/Contact_entity.aod | 6 +
.../contactrole/possibleItemsProcess.js | 9 ++
.../department/possibleItemsProcess.js | 9 ++
.../position/possibleItemsProcess.js | 9 ++
entity/Person_entity/Person_entity.aod | 6 +
.../contactrole/possibleItemsProcess.js | 9 ++
.../department/possibleItemsProcess.js | 9 ++
.../position/possibleItemsProcess.js | 9 ++
.../_____LANGUAGE_EXTRA.aod | 45 ++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 54 +++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 81 ++++++++---
neonView/PersonEdit_view/PersonEdit_view.aod | 12 ++
.../AditoBasic/init_ContactContactrole.xml | 135 ++++++++++++++++++
.../AditoBasic/init_ContactDepartment.xml | 87 +++++++++++
.../AditoBasic/init_ContactPosition.xml | 55 +++++++
.../data_alias/basic/2019.2/changelog.xml | 3 +
process/KeywordRegistry_basic/process.js | 3 +
process/Keyword_lib/process.js | 19 +++
18 files changed, 542 insertions(+), 18 deletions(-)
create mode 100644 entity/Contact_entity/entityfields/contactrole/possibleItemsProcess.js
create mode 100644 entity/Contact_entity/entityfields/department/possibleItemsProcess.js
create mode 100644 entity/Contact_entity/entityfields/position/possibleItemsProcess.js
create mode 100644 entity/Person_entity/entityfields/contactrole/possibleItemsProcess.js
create mode 100644 entity/Person_entity/entityfields/department/possibleItemsProcess.js
create mode 100644 entity/Person_entity/entityfields/position/possibleItemsProcess.js
create mode 100644 others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 4ce8a38fd6..fdf60122d4 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -33,14 +33,20 @@
<entityField>
<name>DEPARTMENT</name>
<title>Department</title>
+ <possibleItemsProcess>%aditoprj%/entity/Contact_entity/entityfields/department/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
</entityField>
<entityField>
<name>POSITION</name>
<title>Position</title>
+ <possibleItemsProcess>%aditoprj%/entity/Contact_entity/entityfields/position/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
</entityField>
<entityField>
<name>CONTACTROLE</name>
<title>Contactrole</title>
+ <possibleItemsProcess>%aditoprj%/entity/Contact_entity/entityfields/contactrole/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
</entityField>
<entityConsumer>
<name>Organisations</name>
diff --git a/entity/Contact_entity/entityfields/contactrole/possibleItemsProcess.js b/entity/Contact_entity/entityfields/contactrole/possibleItemsProcess.js
new file mode 100644
index 0000000000..96627ddf00
--- /dev/null
+++ b/entity/Contact_entity/entityfields/contactrole/possibleItemsProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactContactrole()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/department/possibleItemsProcess.js b/entity/Contact_entity/entityfields/department/possibleItemsProcess.js
new file mode 100644
index 0000000000..77d99fa219
--- /dev/null
+++ b/entity/Contact_entity/entityfields/department/possibleItemsProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactDepartment()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/position/possibleItemsProcess.js b/entity/Contact_entity/entityfields/position/possibleItemsProcess.js
new file mode 100644
index 0000000000..a86d682091
--- /dev/null
+++ b/entity/Contact_entity/entityfields/position/possibleItemsProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactPosition()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 744aac134e..9689370be3 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -691,14 +691,20 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityField>
<name>DEPARTMENT</name>
<title>Department</title>
+ <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/department/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
</entityField>
<entityField>
<name>POSITION</name>
<title>Position</title>
+ <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/position/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
</entityField>
<entityField>
<name>CONTACTROLE</name>
<title>Contactrole</title>
+ <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/contactrole/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
</entityField>
<entityConsumer>
<name>OtherContacts</name>
diff --git a/entity/Person_entity/entityfields/contactrole/possibleItemsProcess.js b/entity/Person_entity/entityfields/contactrole/possibleItemsProcess.js
new file mode 100644
index 0000000000..96627ddf00
--- /dev/null
+++ b/entity/Person_entity/entityfields/contactrole/possibleItemsProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactContactrole()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/department/possibleItemsProcess.js b/entity/Person_entity/entityfields/department/possibleItemsProcess.js
new file mode 100644
index 0000000000..77d99fa219
--- /dev/null
+++ b/entity/Person_entity/entityfields/department/possibleItemsProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactDepartment()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/position/possibleItemsProcess.js b/entity/Person_entity/entityfields/position/possibleItemsProcess.js
new file mode 100644
index 0000000000..a86d682091
--- /dev/null
+++ b/entity/Person_entity/entityfields/position/possibleItemsProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var res = KeywordUtils.getEntryNamesByContainer($KeywordRegistry.contactPosition()).map(function (e){
+ return [e, e]; //currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
+});
+
+result.object(res);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 39ba8770d5..b94a5f181b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2589,6 +2589,51 @@
<entry>
<key>Time in minutes</key>
</entry>
+ <entry>
+ <key>Sales manager</key>
+ </entry>
+ <entry>
+ <key>IT</key>
+ </entry>
+ <entry>
+ <key>Administrator</key>
+ </entry>
+ <entry>
+ <key>Managing director</key>
+ </entry>
+ <entry>
+ <key>Production manager</key>
+ </entry>
+ <entry>
+ <key>Production</key>
+ </entry>
+ <entry>
+ <key>CEO</key>
+ </entry>
+ <entry>
+ <key>Purchasing manager</key>
+ </entry>
+ <entry>
+ <key>Marketing manager</key>
+ </entry>
+ <entry>
+ <key>IT manager</key>
+ </entry>
+ <entry>
+ <key>Marketing</key>
+ </entry>
+ <entry>
+ <key>CSO</key>
+ </entry>
+ <entry>
+ <key>Executive board</key>
+ </entry>
+ <entry>
+ <key>Supervisory board</key>
+ </entry>
+ <entry>
+ <key>Management</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 499739e2d4..e8263db5ac 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3335,6 +3335,60 @@
<key>Time in minutes</key>
<value>Zeit in Minuten</value>
</entry>
+ <entry>
+ <key>Sales manager</key>
+ <value>Vertriebsleiter</value>
+ </entry>
+ <entry>
+ <key>IT</key>
+ </entry>
+ <entry>
+ <key>Administrator</key>
+ </entry>
+ <entry>
+ <key>Managing director</key>
+ <value>Geschäftsführer</value>
+ </entry>
+ <entry>
+ <key>Production manager</key>
+ <value>Produktionsleiter</value>
+ </entry>
+ <entry>
+ <key>Production</key>
+ <value>Produktion</value>
+ </entry>
+ <entry>
+ <key>CEO</key>
+ </entry>
+ <entry>
+ <key>Purchasing manager</key>
+ <value>Einkaufsleiter</value>
+ </entry>
+ <entry>
+ <key>Marketing manager</key>
+ <value>Marketingleiter</value>
+ </entry>
+ <entry>
+ <key>IT manager</key>
+ <value>IT-Leiter</value>
+ </entry>
+ <entry>
+ <key>Marketing</key>
+ </entry>
+ <entry>
+ <key>CSO</key>
+ </entry>
+ <entry>
+ <key>Executive board</key>
+ <value>Vorstand</value>
+ </entry>
+ <entry>
+ <key>Supervisory board</key>
+ <value>Aufsichtsrat</value>
+ </entry>
+ <entry>
+ <key>Management</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 39e9b302cf..79abe938b8 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -521,7 +521,7 @@
</entry>
<entry>
<key>${EURO_SIGN}</key>
- <value>�</value>
+ <value>?</value>
</entry>
<entry>
<key>Planned</key>
@@ -1218,7 +1218,7 @@
<key>Context name</key>
</entry>
<entry>
- <key>Schlüsselwort</key>
+ <key>Schlüsselwort</key>
</entry>
<entry>
<key>Cambodia</key>
@@ -1308,7 +1308,7 @@
<key>Jordan</key>
</entry>
<entry>
- <key>Côte d'Ivoire</key>
+ <key>Côte d'Ivoire</key>
</entry>
<entry>
<key>United Arab Emirates</key>
@@ -1678,7 +1678,7 @@
<key>Kazakhstan</key>
</entry>
<entry>
- <key>Ã…land Islands</key>
+ <key>Åland Islands</key>
</entry>
<entry>
<key>Bahamas</key>
@@ -1959,7 +1959,7 @@
<key>Ukraine</key>
</entry>
<entry>
- <key>Curaçao</key>
+ <key>Curaçao</key>
</entry>
<entry>
<key>Anguilla</key>
@@ -2058,7 +2058,7 @@
<key>ended</key>
</entry>
<entry>
- <key>Saint Barthélemy</key>
+ <key>Saint Barthélemy</key>
</entry>
<entry>
<key>Wallis and Futuna</key>
@@ -2076,7 +2076,7 @@
<key>Hungary</key>
</entry>
<entry>
- <key>Réunion</key>
+ <key>Réunion</key>
</entry>
<entry>
<key>Japan</key>
@@ -2485,7 +2485,7 @@
<key>Other Contactroles</key>
</entry>
<entry>
- <key>Bitte Datumseingabe prüfen!</key>
+ <key>Bitte Datumseingabe prüfen!</key>
</entry>
<entry>
<key>In Bearbeitung</key>
@@ -2500,10 +2500,10 @@
<key>Bitte Filterbedingungen setzen</key>
</entry>
<entry>
- <key>Bestätigt</key>
+ <key>Bestätigt</key>
</entry>
<entry>
- <key>Vorläufig</key>
+ <key>Vorläufig</key>
</entry>
<entry>
<key>keine</key>
@@ -2518,7 +2518,7 @@
<key>&Aufgaben (%0)</key>
</entry>
<entry>
- <key>erledigt / zurückgestellt</key>
+ <key>erledigt / zurückgestellt</key>
</entry>
<entry>
<key>hoch</key>
@@ -2527,7 +2527,7 @@
<key>Keine Berechtigung zum Verschieben der Aufgabe</key>
</entry>
<entry>
- <key>Zurückgestellt</key>
+ <key>Zurückgestellt</key>
</entry>
<entry>
<key>Erledigt</key>
@@ -2539,13 +2539,13 @@
<key>Abgesagt</key>
</entry>
<entry>
- <key>Außer Haus</key>
+ <key>Außer Haus</key>
</entry>
<entry>
<key>Abbrechen</key>
</entry>
<entry>
- <key>Benutzer auswählen</key>
+ <key>Benutzer auswählen</key>
</entry>
<entry>
<key>delegiert</key>
@@ -2554,7 +2554,7 @@
<key>frei</key>
</entry>
<entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
</entry>
<entry>
<key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
@@ -2606,13 +2606,58 @@
<key>Time in minutes</key>
</entry>
<entry>
- <key>New module</key>
+ <key>Sales manager</key>
</entry>
<entry>
- <key>New salesproject</key>
+ <key>IT</key>
</entry>
<entry>
- <key>New contract</key>
+ <key>Administrator</key>
+ </entry>
+ <entry>
+ <key>Managing director</key>
+ </entry>
+ <entry>
+ <key>Production manager</key>
+ </entry>
+ <entry>
+ <key>Production</key>
+ </entry>
+ <entry>
+ <key>CEO</key>
+ </entry>
+ <entry>
+ <key>Purchasing manager</key>
+ </entry>
+ <entry>
+ <key>Marketing manager</key>
+ </entry>
+ <entry>
+ <key>IT manager</key>
+ </entry>
+ <entry>
+ <key>Marketing</key>
+ </entry>
+ <entry>
+ <key>CSO</key>
+ </entry>
+ <entry>
+ <key>Executive board</key>
+ </entry>
+ <entry>
+ <key>Supervisory board</key>
+ </entry>
+ <entry>
+ <key>Management</key>
+ </entry>
+ <entry>
+ <key>New module</key>
+ </entry>
+ <entry>
+ <key>New salesproject</key>
+ </entry>
+ <entry>
+ <key>New contract</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonView/PersonEdit_view/PersonEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
index 55ea2a761b..97dfc7bb74 100644
--- a/neonView/PersonEdit_view/PersonEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_view.aod
@@ -57,6 +57,18 @@
<name>f8ec0e41-7ead-4c80-878c-df75ce5fce34</name>
<entityField>STATUS</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>16b3b029-eed3-45b7-94b0-446c89d70594</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>720ba110-faa2-4c64-823b-82a2089f337c</name>
+ <entityField>CONTACTROLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7bad6e30-fda3-4ee4-858c-712a60437397</name>
+ <entityField>POSITION</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
new file mode 100644
index 0000000000..e63bb7ba7d
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
@@ -0,0 +1,135 @@
+<?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="88938510-188f-4814-b25d-0b5e393cd837">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="767b89c6-2461-4d0e-9b7a-dda33e5090c9"/>
+
+ <column name="KEYID" value="47abd1f8-d449-4d81-9e6d-c48783119b0b"/>
+ <column name="TITLE" value="Managing director"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2fa7cddb-1e2c-438f-8f16-92f245af09f4"/>
+
+ <column name="KEYID" value="07ec8a18-c830-4982-a4c6-d2795841b07a"/>
+ <column name="TITLE" value="Purchasing manager"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="67ea4d33-b683-4a04-b2e3-4af54d6debcb"/>
+
+ <column name="KEYID" value="91411987-8700-43d7-a101-4bd375c6e3af"/>
+ <column name="TITLE" value="Executive board"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="d7be200e-ffc0-47a7-b0bb-3da92f39b993"/>
+
+ <column name="KEYID" value="bd0c1b58-6c8c-42a4-b68b-7099ef05bc0e"/>
+ <column name="TITLE" value="Marketing manager"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3b836d42-9ecf-49b9-8df9-570c27860c01"/>
+
+ <column name="KEYID" value="97d0d10d-14a2-4d85-908d-ea14624b2bfd"/>
+ <column name="TITLE" value="Sales manager"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2a4e6516-8493-4dde-a9df-bf2efd4db0c8"/>
+
+ <column name="KEYID" value="9c3aea50-b402-4e51-b48d-bfc50c107232"/>
+ <column name="TITLE" value="Supervisory board"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3e7f2a42-ad8b-48da-aa11-95525ca36d01"/>
+
+ <column name="KEYID" value="7b71b7e0-fb4a-4557-a4ab-7122574b292b"/>
+ <column name="TITLE" value="Administrator"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="11c05d41-78ec-4d7c-acbe-f94912f2386c"/>
+
+ <column name="KEYID" value="6d6f2261-2dbd-445a-9189-18418e7c44ef"/>
+ <column name="TITLE" value="IT manager"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="7"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <rollback>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="767b89c6-2461-4d0e-9b7a-dda33e5090c9" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="2fa7cddb-1e2c-438f-8f16-92f245af09f4" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="67ea4d33-b683-4a04-b2e3-4af54d6debcb" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="d7be200e-ffc0-47a7-b0bb-3da92f39b993" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="3b836d42-9ecf-49b9-8df9-570c27860c01" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="2a4e6516-8493-4dde-a9df-bf2efd4db0c8" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="3e7f2a42-ad8b-48da-aa11-95525ca36d01" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="11c05d41-78ec-4d7c-acbe-f94912f2386c" />
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
new file mode 100644
index 0000000000..15f81f525d
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
@@ -0,0 +1,87 @@
+<?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="88938510-188f-4814-b25d-0b5e393cd837">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="75bd97bc-56f3-4ea3-a132-df3cb9cda071"/>
+
+ <column name="KEYID" value="c58a028c-772a-444f-8109-37cfde3f60a0"/>
+ <column name="TITLE" value="Management"/>
+ <column name="CONTAINER" value="ContactDepartment"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6e30d397-e31f-4ccb-96e9-51cf71d259fa"/>
+
+ <column name="KEYID" value="afc7a9b8-895d-41b9-b68c-e1bdb8ba878f"/>
+ <column name="TITLE" value="Sales"/>
+ <column name="CONTAINER" value="ContactDepartment"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="722e83bc-148a-4762-abda-d491bf590bd5"/>
+
+ <column name="KEYID" value="e00eb3fc-2c8d-46a9-990a-ed2bf1948ffe"/>
+ <column name="TITLE" value="Production"/>
+ <column name="CONTAINER" value="ContactDepartment"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="191617b2-09cc-4fe6-bc02-1cee746285d5"/>
+
+ <column name="KEYID" value="bde6d083-517e-45bd-8326-d84e7f8aeba0"/>
+ <column name="TITLE" value="Marketing"/>
+ <column name="CONTAINER" value="ContactDepartment"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="87f97554-c335-4328-911a-345d8a9abd7d"/>
+
+ <column name="KEYID" value="b1113c19-2f1f-4d0a-806e-b0165ecc1b4a"/>
+ <column name="TITLE" value="IT"/>
+ <column name="CONTAINER" value="ContactDepartment"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <rollback>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="75bd97bc-56f3-4ea3-a132-df3cb9cda071" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="6e30d397-e31f-4ccb-96e9-51cf71d259fa" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="722e83bc-148a-4762-abda-d491bf590bd5" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="191617b2-09cc-4fe6-bc02-1cee746285d5" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="87f97554-c335-4328-911a-345d8a9abd7d" />
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
new file mode 100644
index 0000000000..136f8bbd47
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
@@ -0,0 +1,55 @@
+<?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="88938510-188f-4814-b25d-0b5e393cd837">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="ba369295-c717-48eb-ae76-314087375e06"/>
+
+ <column name="KEYID" value="3308c1e5-cf4d-4934-86b7-981b8f026369"/>
+ <column name="TITLE" value="CEO"/>
+ <column name="CONTAINER" value="ContactPosition"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="dcacb175-4c8a-4941-a417-69a971f52583"/>
+
+ <column name="KEYID" value="a4952791-73e4-41a1-8a78-5a27640ff0fd"/>
+ <column name="TITLE" value="CSO"/>
+ <column name="CONTAINER" value="ContactPosition"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="1a508899-e2bf-409d-8a57-3ca31c9c832d"/>
+
+ <column name="KEYID" value="77dcf148-112e-4251-8a0e-9e8bd811f0b7"/>
+ <column name="TITLE" value="Production manager"/>
+ <column name="CONTAINER" value="ContactPosition"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <rollback>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="ba369295-c717-48eb-ae76-314087375e06" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="dcacb175-4c8a-4941-a417-69a971f52583" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="1a508899-e2bf-409d-8a57-3ca31c9c832d" />
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index a9809f5a9d..05f9a8b2d4 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -105,4 +105,7 @@
<include relativeToChangelogFile="true" file="Salesproject_add_column.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/update_Strength_Weakness.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/init_ContactDepartment.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/init_ContactContactrole.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/init_ContactPosition.xml"/>
</databaseChangeLog>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 2addda46a4..f9c474f06c 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -60,4 +60,7 @@ $KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectC
$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType"};
$KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm"};
$KeywordRegistry.paymentTerm = function(){return "PaymentTerm"};
+$KeywordRegistry.contactDepartment = function(){return "ContactDepartment"};
+$KeywordRegistry.contactPosition = function(){return "ContactPosition"};
+$KeywordRegistry.contactContactrole = function(){return "ContactContactrole"};
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 273862a307..3c150d05ed 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -147,6 +147,25 @@ KeywordUtils.getContainerNames = function()
return list;
};
+/**
+* provides a translated list of keyword-entry-titles in the system filtered by a containerName;
+* usefull for lists where the key is the name which is then a editable displayValue
+*
+* @param {String} pContainerName name of the keyword container for filtering
+*
+* @return {String[]} translated titles as 1D-Array
+*/
+KeywordUtils.getEntryNamesByContainer = function(pContainerName)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName)
+ .buildSql("select AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", null, "order by AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
+ var list = db.array(db.COLUMN, sql).map(function (v){
+ return translate.text(v);
+ });
+ return list;
+};
+
/**
* object that provides featrues for a single keyword attribute; initalizes itself on creation with a specific keyword-attribute
*
--
GitLab
From 298fa9d00563bf55aabd71e320a5e4e5e6e33a14 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 14:42:10 +0100
Subject: [PATCH 063/250] use new UUIDs for very similar personIds
---
.../AditoBasic/ObjectRelation_exampleData.xml | 4 ++--
.../data/example_person/PERSON_gruener.xml | 6 +++---
.../data/example_person/PERSON_kanzler.xml | 6 +++---
.../2019.2/data/example_person/PERSON_leicht.xml | 16 ++++++++--------
.../2019.2/data/example_person/PERSON_muller.xml | 10 +++++-----
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
index db8fa70a9c..448f72ab56 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
@@ -6,14 +6,14 @@
<insert tableName="AB_OBJECTRELATION">
<column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="OBJECT2_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
<column name="AB_OBJECTRELATIONTYPE2" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
</insert>
<insert tableName="AB_OBJECTRELATION">
<column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
<column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="OBJECT2_ROWID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
<column name="AB_OBJECTRELATIONTYPE1" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
<column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
</insert>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
index 4c56d28a9f..3d748a734c 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
@@ -2,7 +2,7 @@
<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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
<insert tableName="PERSON">
- <column name="PERSONID" value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSONID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
<column name="FIRSTNAME" value="Jerome"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Grüner"/>
@@ -13,7 +13,7 @@
<insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
<column name="CONTACTID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="0"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -28,7 +28,7 @@
<delete tableName="PERSON">
<where>PERSONID = ?</where>
<whereParams>
- <param value="73d732ce-e7f5-11e8-9f32-f2801f1b9fd1" />
+ <param value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5" />
</whereParams>
</delete>
</rollback>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
index 8b82284ee0..6eade59392 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
@@ -2,7 +2,7 @@
<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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
<insert tableName="PERSON">
- <column name="PERSONID" value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSONID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
<column name="FIRSTNAME" value="Ludwig"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Kanzler"/>
@@ -13,7 +13,7 @@
<insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
<column name="CONTACTID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="ORGANISATION_ID" value="0"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
@@ -28,7 +28,7 @@
<delete tableName="PERSON">
<where>PERSONID = ?</where>
<whereParams>
- <param value="73d7306c-e7f5-11e8-9f32-f2801f1b9fd1" />
+ <param value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf" />
</whereParams>
</delete>
</rollback>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
index 286d335285..d14a4606b8 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
@@ -2,7 +2,7 @@
<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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
<insert tableName="PERSON">
- <column name="PERSONID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSONID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="FIRSTNAME" value="Birgit"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Leicht"/>
@@ -13,8 +13,8 @@
<insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+ <column name="CONTACTID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
@@ -23,7 +23,7 @@
<column name="ADDR_TYPE" valueNumeric="2"/>
<column name="CITY" value="Landshut"/>
<column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="ADDRIDENTIFIER" value=""/>
<column name="REGION" value="Niederbayern"/>
<column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
@@ -38,7 +38,7 @@
<column name="ADDR_TYPE" valueNumeric="3"/>
<column name="CITY" value="Landshut"/>
<column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="ADDRIDENTIFIER" value=""/>
<column name="REGION" value="Niederbayern"/>
<column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
@@ -52,19 +52,19 @@
<delete tableName="CONTACT">
<where>CONTACTID = ?</where>
<whereParams>
- <param value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1" />
+ <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
</whereParams>
</delete>
<delete tableName="PERSON">
<where>PERSONID = ?</where>
<whereParams>
- <param value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1" />
+ <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
</whereParams>
</delete>
<delete tableName="ADDRESS">
<where>CONTACT_ID = ?</where>
<whereParams>
- <param value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1" />
+ <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
</whereParams>
</delete>
</rollback>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
index 92325841d4..a647b15464 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
@@ -2,7 +2,7 @@
<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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
<insert tableName="PERSON">
- <column name="PERSONID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="PERSONID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="FIRSTNAME" value="Franz"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Müller"/>
@@ -13,8 +13,8 @@
<insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
- <column name="CONTACTID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="PERSON_ID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="CONTACTID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+ <column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
</insert>
@@ -22,13 +22,13 @@
<delete tableName="CONTACT">
<where>CONTACTID = ?</where>
<whereParams>
- <param value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1" />
+ <param value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
</whereParams>
</delete>
<delete tableName="PERSON">
<where>PERSONID = ?</where>
<whereParams>
- <param value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1" />
+ <param value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
</whereParams>
</delete>
</rollback>
--
GitLab
From c4aaffd22d3b5ca477f73e783bc8a32afac6cbbd Mon Sep 17 00:00:00 2001
From: "m.escher" <m.escher@adito.de>
Date: Tue, 26 Mar 2019 15:04:47 +0100
Subject: [PATCH 064/250] fix missing column in Activity onDelete
---
entity/Activity_entity/recordcontainers/db/onDBDelete.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entity/Activity_entity/recordcontainers/db/onDBDelete.js b/entity/Activity_entity/recordcontainers/db/onDBDelete.js
index 787c4614c1..0ae27fca3c 100644
--- a/entity/Activity_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Activity_entity/recordcontainers/db/onDBDelete.js
@@ -4,7 +4,7 @@ import("Sql_lib");
import("Context_lib");
var activityObjectsCondition = SqlCondition.begin()
- .andPrepare("AB_OBJECTRELATION.OBJECT1_TYPE", ContextUtils.getCurrentContextId())
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", ContextUtils.getCurrentContextId())
.andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$field.ACTIVITYID");
db.deleteData("AB_OBJECTRELATION", activityObjectsCondition.build("1=2"));
--
GitLab
From 25d3b1428a360f3f9386e5337fe9284e06ada944 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 14:52:40 +0100
Subject: [PATCH 065/250] reverting broken languages after 8568b55
---
.../_____LANGUAGE_EXTRA.aod | 45 -----------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 54 -------------
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 81 +++++--------------
3 files changed, 18 insertions(+), 162 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index b94a5f181b..39ba8770d5 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2589,51 +2589,6 @@
<entry>
<key>Time in minutes</key>
</entry>
- <entry>
- <key>Sales manager</key>
- </entry>
- <entry>
- <key>IT</key>
- </entry>
- <entry>
- <key>Administrator</key>
- </entry>
- <entry>
- <key>Managing director</key>
- </entry>
- <entry>
- <key>Production manager</key>
- </entry>
- <entry>
- <key>Production</key>
- </entry>
- <entry>
- <key>CEO</key>
- </entry>
- <entry>
- <key>Purchasing manager</key>
- </entry>
- <entry>
- <key>Marketing manager</key>
- </entry>
- <entry>
- <key>IT manager</key>
- </entry>
- <entry>
- <key>Marketing</key>
- </entry>
- <entry>
- <key>CSO</key>
- </entry>
- <entry>
- <key>Executive board</key>
- </entry>
- <entry>
- <key>Supervisory board</key>
- </entry>
- <entry>
- <key>Management</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 e8263db5ac..499739e2d4 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3335,60 +3335,6 @@
<key>Time in minutes</key>
<value>Zeit in Minuten</value>
</entry>
- <entry>
- <key>Sales manager</key>
- <value>Vertriebsleiter</value>
- </entry>
- <entry>
- <key>IT</key>
- </entry>
- <entry>
- <key>Administrator</key>
- </entry>
- <entry>
- <key>Managing director</key>
- <value>Geschäftsführer</value>
- </entry>
- <entry>
- <key>Production manager</key>
- <value>Produktionsleiter</value>
- </entry>
- <entry>
- <key>Production</key>
- <value>Produktion</value>
- </entry>
- <entry>
- <key>CEO</key>
- </entry>
- <entry>
- <key>Purchasing manager</key>
- <value>Einkaufsleiter</value>
- </entry>
- <entry>
- <key>Marketing manager</key>
- <value>Marketingleiter</value>
- </entry>
- <entry>
- <key>IT manager</key>
- <value>IT-Leiter</value>
- </entry>
- <entry>
- <key>Marketing</key>
- </entry>
- <entry>
- <key>CSO</key>
- </entry>
- <entry>
- <key>Executive board</key>
- <value>Vorstand</value>
- </entry>
- <entry>
- <key>Supervisory board</key>
- <value>Aufsichtsrat</value>
- </entry>
- <entry>
- <key>Management</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 79abe938b8..1e9b26ca10 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -521,7 +521,7 @@
</entry>
<entry>
<key>${EURO_SIGN}</key>
- <value>?</value>
+ <value>€</value>
</entry>
<entry>
<key>Planned</key>
@@ -1218,7 +1218,7 @@
<key>Context name</key>
</entry>
<entry>
- <key>Schlüsselwort</key>
+ <key>Schlüsselwort</key>
</entry>
<entry>
<key>Cambodia</key>
@@ -1308,7 +1308,7 @@
<key>Jordan</key>
</entry>
<entry>
- <key>Côte d'Ivoire</key>
+ <key>Côte d'Ivoire</key>
</entry>
<entry>
<key>United Arab Emirates</key>
@@ -1678,7 +1678,7 @@
<key>Kazakhstan</key>
</entry>
<entry>
- <key>Åland Islands</key>
+ <key>Ã…land Islands</key>
</entry>
<entry>
<key>Bahamas</key>
@@ -1959,7 +1959,7 @@
<key>Ukraine</key>
</entry>
<entry>
- <key>Curaçao</key>
+ <key>Curaçao</key>
</entry>
<entry>
<key>Anguilla</key>
@@ -2058,7 +2058,7 @@
<key>ended</key>
</entry>
<entry>
- <key>Saint Barthélemy</key>
+ <key>Saint Barthélemy</key>
</entry>
<entry>
<key>Wallis and Futuna</key>
@@ -2076,7 +2076,7 @@
<key>Hungary</key>
</entry>
<entry>
- <key>Réunion</key>
+ <key>Réunion</key>
</entry>
<entry>
<key>Japan</key>
@@ -2485,7 +2485,7 @@
<key>Other Contactroles</key>
</entry>
<entry>
- <key>Bitte Datumseingabe prüfen!</key>
+ <key>Bitte Datumseingabe prüfen!</key>
</entry>
<entry>
<key>In Bearbeitung</key>
@@ -2500,10 +2500,10 @@
<key>Bitte Filterbedingungen setzen</key>
</entry>
<entry>
- <key>Bestätigt</key>
+ <key>Bestätigt</key>
</entry>
<entry>
- <key>Vorläufig</key>
+ <key>Vorläufig</key>
</entry>
<entry>
<key>keine</key>
@@ -2518,7 +2518,7 @@
<key>&Aufgaben (%0)</key>
</entry>
<entry>
- <key>erledigt / zurückgestellt</key>
+ <key>erledigt / zurückgestellt</key>
</entry>
<entry>
<key>hoch</key>
@@ -2527,7 +2527,7 @@
<key>Keine Berechtigung zum Verschieben der Aufgabe</key>
</entry>
<entry>
- <key>Zurückgestellt</key>
+ <key>Zurückgestellt</key>
</entry>
<entry>
<key>Erledigt</key>
@@ -2539,13 +2539,13 @@
<key>Abgesagt</key>
</entry>
<entry>
- <key>Außer Haus</key>
+ <key>Außer Haus</key>
</entry>
<entry>
<key>Abbrechen</key>
</entry>
<entry>
- <key>Benutzer auswählen</key>
+ <key>Benutzer auswählen</key>
</entry>
<entry>
<key>delegiert</key>
@@ -2554,7 +2554,7 @@
<key>frei</key>
</entry>
<entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
</entry>
<entry>
<key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
@@ -2606,58 +2606,13 @@
<key>Time in minutes</key>
</entry>
<entry>
- <key>Sales manager</key>
+ <key>New module</key>
</entry>
<entry>
- <key>IT</key>
+ <key>New salesproject</key>
</entry>
<entry>
- <key>Administrator</key>
- </entry>
- <entry>
- <key>Managing director</key>
- </entry>
- <entry>
- <key>Production manager</key>
- </entry>
- <entry>
- <key>Production</key>
- </entry>
- <entry>
- <key>CEO</key>
- </entry>
- <entry>
- <key>Purchasing manager</key>
- </entry>
- <entry>
- <key>Marketing manager</key>
- </entry>
- <entry>
- <key>IT manager</key>
- </entry>
- <entry>
- <key>Marketing</key>
- </entry>
- <entry>
- <key>CSO</key>
- </entry>
- <entry>
- <key>Executive board</key>
- </entry>
- <entry>
- <key>Supervisory board</key>
- </entry>
- <entry>
- <key>Management</key>
- </entry>
- <entry>
- <key>New module</key>
- </entry>
- <entry>
- <key>New salesproject</key>
- </entry>
- <entry>
- <key>New contract</key>
+ <key>New contract</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
--
GitLab
From dd6380ceff23c4287c52bbecd3b681583872cd62 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 15:05:48 +0100
Subject: [PATCH 066/250] fix languages
---
.../_____LANGUAGE_EXTRA.aod | 48 ++++++-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 65 +++++++--
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 132 +++++++++++-------
3 files changed, 180 insertions(+), 65 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 39ba8770d5..737d126139 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1164,9 +1164,6 @@
<entry>
<key>Attribute Usage</key>
</entry>
- <entry>
- <key>Beziehung</key>
- </entry>
<entry>
<key>Key</key>
</entry>
@@ -2581,13 +2578,52 @@
<key>New module</key>
</entry>
<entry>
- <key>New salesproject</key>
+ <key>Time in minutes</key>
</entry>
<entry>
- <key>New contract</key>
+ <key>Sales manager</key>
</entry>
<entry>
- <key>Time in minutes</key>
+ <key>IT</key>
+ </entry>
+ <entry>
+ <key>Administrator</key>
+ </entry>
+ <entry>
+ <key>Managing director</key>
+ </entry>
+ <entry>
+ <key>Production manager</key>
+ </entry>
+ <entry>
+ <key>Production</key>
+ </entry>
+ <entry>
+ <key>CEO</key>
+ </entry>
+ <entry>
+ <key>Purchasing manager</key>
+ </entry>
+ <entry>
+ <key>Marketing manager</key>
+ </entry>
+ <entry>
+ <key>IT manager</key>
+ </entry>
+ <entry>
+ <key>Marketing</key>
+ </entry>
+ <entry>
+ <key>CSO</key>
+ </entry>
+ <entry>
+ <key>Executive board</key>
+ </entry>
+ <entry>
+ <key>Supervisory board</key>
+ </entry>
+ <entry>
+ <key>Management</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 499739e2d4..61efa9f24a 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -42,10 +42,6 @@
<key>Show all activities</key>
<value>Alle Aktivitäten anzeigen</value>
</entry>
- <entry>
- <key>New contract</key>
- <value>Neuer Vertrag</value>
- </entry>
<entry>
<key>${ADDRESS_STATE}</key>
<value>Staat</value>
@@ -1610,9 +1606,6 @@
<key>Attribute Usage</key>
<value>Eigenschaftsverwendung</value>
</entry>
- <entry>
- <key>Beziehung</key>
- </entry>
<entry>
<key>Key</key>
</entry>
@@ -1864,10 +1857,6 @@
<key>Cabo Verde</key>
<value>Cabo Verde</value>
</entry>
- <entry>
- <key>New salesproject</key>
- <value>Neues Vertriebsprojekt</value>
- </entry>
<entry>
<key>Ecuador</key>
<value>Ecuador</value>
@@ -3335,6 +3324,60 @@
<key>Time in minutes</key>
<value>Zeit in Minuten</value>
</entry>
+ <entry>
+ <key>Sales manager</key>
+ <value>Vertriebsleiter</value>
+ </entry>
+ <entry>
+ <key>IT</key>
+ </entry>
+ <entry>
+ <key>Administrator</key>
+ </entry>
+ <entry>
+ <key>Managing director</key>
+ <value>Geschäftsführer</value>
+ </entry>
+ <entry>
+ <key>Production manager</key>
+ <value>Produktionsleiter</value>
+ </entry>
+ <entry>
+ <key>Production</key>
+ <value>Produktion</value>
+ </entry>
+ <entry>
+ <key>CEO</key>
+ </entry>
+ <entry>
+ <key>Purchasing manager</key>
+ <value>Einkaufsleiter</value>
+ </entry>
+ <entry>
+ <key>Marketing manager</key>
+ <value>Marketingleiter</value>
+ </entry>
+ <entry>
+ <key>IT manager</key>
+ <value>IT-Leiter</value>
+ </entry>
+ <entry>
+ <key>Marketing</key>
+ </entry>
+ <entry>
+ <key>CSO</key>
+ </entry>
+ <entry>
+ <key>Executive board</key>
+ <value>Vorstand</value>
+ </entry>
+ <entry>
+ <key>Supervisory board</key>
+ <value>Aufsichtsrat</value>
+ </entry>
+ <entry>
+ <key>Management</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 1e9b26ca10..de4f31a483 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -521,7 +521,7 @@
</entry>
<entry>
<key>${EURO_SIGN}</key>
- <value>€</value>
+ <value>?</value>
</entry>
<entry>
<key>Planned</key>
@@ -1184,9 +1184,6 @@
<entry>
<key>Attribute Usage</key>
</entry>
- <entry>
- <key>Beziehung</key>
- </entry>
<entry>
<key>Key</key>
</entry>
@@ -1217,9 +1214,6 @@
<entry>
<key>Context name</key>
</entry>
- <entry>
- <key>Schlüsselwort</key>
- </entry>
<entry>
<key>Cambodia</key>
</entry>
@@ -1307,9 +1301,6 @@
<entry>
<key>Jordan</key>
</entry>
- <entry>
- <key>Côte d'Ivoire</key>
- </entry>
<entry>
<key>United Arab Emirates</key>
</entry>
@@ -1677,9 +1668,6 @@
<entry>
<key>Kazakhstan</key>
</entry>
- <entry>
- <key>Ã…land Islands</key>
- </entry>
<entry>
<key>Bahamas</key>
</entry>
@@ -1958,9 +1946,6 @@
<entry>
<key>Ukraine</key>
</entry>
- <entry>
- <key>Curaçao</key>
- </entry>
<entry>
<key>Anguilla</key>
</entry>
@@ -2057,9 +2042,6 @@
<entry>
<key>ended</key>
</entry>
- <entry>
- <key>Saint Barthélemy</key>
- </entry>
<entry>
<key>Wallis and Futuna</key>
</entry>
@@ -2075,9 +2057,6 @@
<entry>
<key>Hungary</key>
</entry>
- <entry>
- <key>Réunion</key>
- </entry>
<entry>
<key>Japan</key>
</entry>
@@ -2484,9 +2463,6 @@
<entry>
<key>Other Contactroles</key>
</entry>
- <entry>
- <key>Bitte Datumseingabe prüfen!</key>
- </entry>
<entry>
<key>In Bearbeitung</key>
</entry>
@@ -2499,12 +2475,6 @@
<entry>
<key>Bitte Filterbedingungen setzen</key>
</entry>
- <entry>
- <key>Bestätigt</key>
- </entry>
- <entry>
- <key>Vorläufig</key>
- </entry>
<entry>
<key>keine</key>
</entry>
@@ -2517,18 +2487,12 @@
<entry>
<key>&Aufgaben (%0)</key>
</entry>
- <entry>
- <key>erledigt / zurückgestellt</key>
- </entry>
<entry>
<key>hoch</key>
</entry>
<entry>
<key>Keine Berechtigung zum Verschieben der Aufgabe</key>
</entry>
- <entry>
- <key>Zurückgestellt</key>
- </entry>
<entry>
<key>Erledigt</key>
</entry>
@@ -2538,24 +2502,15 @@
<entry>
<key>Abgesagt</key>
</entry>
- <entry>
- <key>Außer Haus</key>
- </entry>
<entry>
<key>Abbrechen</key>
</entry>
- <entry>
- <key>Benutzer auswählen</key>
- </entry>
<entry>
<key>delegiert</key>
</entry>
<entry>
<key>frei</key>
</entry>
- <entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
- </entry>
<entry>
<key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
</entry>
@@ -2605,14 +2560,95 @@
<entry>
<key>Time in minutes</key>
</entry>
+ <entry>
+ <key>Sales manager</key>
+ </entry>
+ <entry>
+ <key>IT</key>
+ </entry>
+ <entry>
+ <key>Administrator</key>
+ </entry>
+ <entry>
+ <key>Managing director</key>
+ </entry>
+ <entry>
+ <key>Production manager</key>
+ </entry>
+ <entry>
+ <key>Production</key>
+ </entry>
+ <entry>
+ <key>CEO</key>
+ </entry>
+ <entry>
+ <key>Purchasing manager</key>
+ </entry>
+ <entry>
+ <key>Marketing manager</key>
+ </entry>
+ <entry>
+ <key>IT manager</key>
+ </entry>
+ <entry>
+ <key>Marketing</key>
+ </entry>
+ <entry>
+ <key>CSO</key>
+ </entry>
+ <entry>
+ <key>Executive board</key>
+ </entry>
+ <entry>
+ <key>Supervisory board</key>
+ </entry>
+ <entry>
+ <key>Management</key>
+ </entry>
<entry>
<key>New module</key>
</entry>
<entry>
- <key>New salesproject</key>
+ <key>Côte d'Ivoire</key>
+ </entry>
+ <entry>
+ <key>Bitte Datumseingabe prüfen!</key>
+ </entry>
+ <entry>
+ <key>Bestätigt</key>
+ </entry>
+ <entry>
+ <key>Vorläufig</key>
+ </entry>
+ <entry>
+ <key>Saint Barthélemy</key>
+ </entry>
+ <entry>
+ <key>erledigt / zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>Zurückgestellt</key>
+ </entry>
+ <entry>
+ <key>Außer Haus</key>
+ </entry>
+ <entry>
+ <key>Benutzer auswählen</key>
+ </entry>
+ <entry>
+ <key>Ã…land Islands</key>
+ </entry>
+ <entry>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
</entry>
<entry>
- <key>New contract</key>
+ <key>Curaçao</key>
+ </entry>
+ <entry>
+ <key>Schlüsselwort</key>
+ </entry>
+ <entry>
+ <key>Réunion</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
--
GitLab
From b169346d94c7e5f3f246392f04196ab1b5d11b31 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 26 Mar 2019 15:07:28 +0100
Subject: [PATCH 067/250] Attribute and AttributeUsage fixes
---
entity/Attribute_entity/Attribute_entity.aod | 5 --
entity/Attribute_entity/afterUiInit.js | 4 +-
.../attribute_type/stateProcess.js | 29 +++++--
.../keyword_container/stateProcess.js | 4 +-
.../entityfields/tsest/onActionProcess.js | 3 -
process/Attribute_lib/process.js | 83 ++++++++++++++-----
6 files changed, 92 insertions(+), 36 deletions(-)
delete mode 100644 entity/Attribute_entity/entityfields/tsest/onActionProcess.js
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index a5c910a2b9..405955e8bd 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -240,11 +240,6 @@
<title>Name</title>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/name_with_type/valueProcess.js</valueProcess>
</entityField>
- <entityActionField>
- <name>tsest</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/tsest/onActionProcess.js</onActionProcess>
- </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Attribute_entity/afterUiInit.js b/entity/Attribute_entity/afterUiInit.js
index f36f9fbc0e..87febc93d5 100644
--- a/entity/Attribute_entity/afterUiInit.js
+++ b/entity/Attribute_entity/afterUiInit.js
@@ -3,13 +3,15 @@ import("system.db");
import("system.neon");
import("system.vars");
import("Context_lib");
+import("Attribute_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.get("$field.ATTRIBUTE_TYPE").trim() != $AttributeTypes.COMBOVALUE
&& vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param"))
{
var parentId = vars.get("$param.AttrParentId_param");
var attributeId = vars.get("$field.AB_ATTRIBUTEID");
-
+
var usageSql = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
.buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE", "1=0");
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
index 82e1e3f89f..f663dddf57 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -3,12 +3,29 @@ import("system.neon");
import("system.result");
import("system.vars");
import("Attribute_lib");
+import("Sql_lib");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
+var state = neon.COMPONENTSTATE_AUTO
+if (type == $AttributeTypes.COMBOVALUE)
{
- var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
- if (type == $AttributeTypes.COMBO)
- result.string(neon.COMPONENTSTATE_READONLY);
+ state = neon.COMPONENTSTATE_READONLY;
}
-else if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
- result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
+else if (type == $AttributeTypes.GROUP || type == $AttributeTypes.COMBO)
+{
+ var hasSubordinate = db.cell(SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTEID")
+ .buildSql(
+ "select exists ("
+ + "select SUB.AB_ATTRIBUTEID from AB_ATTRIBUTE SUB "
+ + "where SUB.ATTRIBUTE_PARENT_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
+ + ") from AB_ATTRIBUTE", "1=2"
+ )
+ ) == "true";
+ if (hasSubordinate)
+ state = neon.COMPONENTSTATE_READONLY;
+}
+else if (AttributeUtil.hasRelations(vars.get("$field.AB_ATTRIBUTEID")))
+ state = neon.COMPONENTSTATE_READONLY;
+
+result.string(state)
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
index 9ce13917b5..67de95ea15 100644
--- a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
@@ -4,9 +4,9 @@ import("system.result");
import("Attribute_lib");
var fieldState;
-if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.KEYWORD)
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.KEYWORD && !AttributeUtil.hasRelations(vars.get("$field.AB_ATTRIBUTEID")))
fieldState = neon.COMPONENTSTATE_EDITABLE;
else
- fieldState = neon.COMPONENTSTATE_DISABLED;
+ fieldState = neon.COMPONENTSTATE_READONLY;
result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/tsest/onActionProcess.js b/entity/Attribute_entity/entityfields/tsest/onActionProcess.js
deleted file mode 100644
index dd3c5349ea..0000000000
--- a/entity/Attribute_entity/entityfields/tsest/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("Attribute_lib");
-
-AttributeUsageUtil.removeDuplicates();
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index ff994422d9..6614f1c741 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -134,6 +134,28 @@ AttributeUtil.getAllChildren = function (pAttributeId)
return childIds;
}
+/**
+ * checks if an attribute has attribute relations
+ *
+ * @param {String} pAttributeId the id of the attribute
+ *
+ * @result {boolean} true if it has relations
+ */
+AttributeUtil.hasRelations = function (pAttributeId)
+{
+ if (!pAttributeId)
+ return false;
+ return db.cell(SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+ .buildSql(
+ "select exists ("
+ + "select AB_ATTRIBUTERELATIONID from AB_ATTRIBUTERELATION "
+ + "where AB_ATTRIBUTE_ID = AB_ATTRIBUTEID"
+ + ") from AB_ATTRIBUTE", "1=2"
+ )
+ ) == "true";
+}
+
/*********************************************************************************************************************/
/**
@@ -492,10 +514,20 @@ AttributeTypeUtil.getTypeColumnIndex = function (pAttributeType)
/*********************************************************************************************************************/
/**
+ * Functions for AttributeUsages.
+ * Do not instanciate this!
+ *
* @class
*/
function AttributeUsageUtil () {}
+/**
+ * Creates AttributeUsages for all subordinate attributes of an attribute.
+ * This is required when an usage is added to a superordinate attribute.
+ *
+ * @param {String} pAttributeId the id of the superordinate attribute
+ * @param {String} pObjectType the context
+ */
AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
{
var table = "AB_ATTRIBUTEUSAGE";
@@ -529,6 +561,14 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
}
}
+/**
+ * Updates AttributeUsages for all subordinate attributes of an attribute.
+ * This is required when an usage of a superordinate attribute is changed.
+ *
+ * @param {String} pAttributeId the id of the superordinate attribute
+ * @param {String} pOldObjectType ye olde context
+ * @param {String} pNewObjectType the new context
+ */
AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType, pNewObjectType)
{
if (!pNewObjectType)
@@ -541,23 +581,18 @@ AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType
+ pNewObjectType + "')"
+ " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pOldObjectType + "'";
- var updateIds = [];
+ var updateCond = SqlCondition.begin();
//it is possible that the new objectType is already in a subordinate attribute
//and an update could cause a duplicate entry so one has to be deleted
- var deleteIds = [];
+ var deleteCond = SqlCondition.begin();
_addUpdateIds(pAttributeId, pOldObjectType);
- if (updateIds.length)
- db.updateData(table, ["OBJECT_TYPE"], null, [pNewObjectType], SqlCondition.begin()
- .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID in ('" + updateIds.join("','") + "')")
- .build("1=2")
- );
- if (deleteIds.length)
- db.deleteData(table, SqlCondition.begin()
- .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID in ('" + deleteIds.join("','") + "')")
- .build("1=2"));
+ if (updateCond.isSet())
+ db.updateData(table, ["OBJECT_TYPE"], null, [pNewObjectType], updateCond.build("1=2"));
+ if (deleteCond.isSet())
+ db.deleteData(table, deleteCond.build("1=2"));
function _addUpdateIds (pAttributeId)
{
@@ -569,14 +604,21 @@ AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType
attributes.forEach(function (row)
{
if (row[1] && row[2] == "true")
- deleteIds.push(row[1]);
+ deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1]);
else if (row[1])
- updateIds.push(row[1]);
+ updateCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1]);
_addUpdateIds(row[0]);
});
}
}
+/**
+ * Deletes AttributeUsages for all subordinate attributes of an attribute.
+ * This is required when an usage is removed from a superordinate attribute.
+ *
+ * @param {String} pAttributeId the id of the superordinate attribute
+ * @param {String} pObjectType the context
+ */
AttributeUsageUtil.deleteChildrenUsages = function (pAttributeId, pObjectType)
{
var table = "AB_ATTRIBUTEUSAGE";
@@ -584,12 +626,10 @@ AttributeUsageUtil.deleteChildrenUsages = function (pAttributeId, pObjectType)
var sqlSelect = "select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID "
+ " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pObjectType + "'";
- var deleteIds = [];
+ var deleteCond = SqlCondition.begin();
_addDeleteIds(pAttributeId, pObjectType);
- if (deleteIds.length)
- db.deleteData(table, SqlCondition.begin()
- .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID in ('" + deleteIds.join("','") + "')")
- .build("1=2"));
+ if (deleteCond.isSet())
+ db.deleteData(table, deleteCond.build("1=2"));
function _addDeleteIds (pAttributeId)
{
@@ -601,12 +641,17 @@ AttributeUsageUtil.deleteChildrenUsages = function (pAttributeId, pObjectType)
attributes.forEach(function (row)
{
if (row[1])
- deleteIds.push(row[1]);
+ deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1])
_addDeleteIds(row[0]);
});
}
}
+/**
+ * Deletes duplicate attribute usages.
+ *
+ * @param {String} [pAttributeId=null] attribute id, if omitted, all duplicates will be deleted
+ */
AttributeUsageUtil.removeDuplicates = function (pAttributeId)
{
var condition = SqlCondition.begin()
--
GitLab
From 8061fa1331b3f8ea906ec7db58f7efca6484981b Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 15:30:55 +0100
Subject: [PATCH 068/250] ScanService fixes & Projektteam preview fix
---
.../_____SYSTEM_APPLICATION_NEON.aod | 1 -
entity/360Degree_entity/360Degree_entity.aod | 1 -
.../children/newcontract/iconIdProcess.js | 0
.../AnyContact_entity/AnyContact_entity.aod | 2 +-
.../children/contactid_param/valueProcess.js | 4 -
.../children/contextid_param/valueProcess.js | 0
.../children/objecttype_param/valueProcess.js | 0
entity/Contact_entity/Contact_entity.aod | 1 -
entity/Contact_entity/onValidation.js | 0
.../children/objecttype_param/code.js | 0
.../targetobjectrowid/valueProcess.js | 0
.../targetobjecttype/valueProcess.js | 0
.../recordcontainers/jdito/contentProcess.js | 4 +-
entity/Offeritem_entity/Offeritem_entity.aod | 647 +++++++++---------
.../children/currency_param/valueProcess.js | 0
entity/Person_entity/Person_entity.aod | 26 +-
.../recordcontainers/db/conditionProcess.js | 22 +-
.../SalesprojectMember_entity.aod | 6 +-
.../excludedcontactids_param/valueProcess.js | 13 +
.../salesprojectid_param/valueProcess.js | 4 -
20 files changed, 379 insertions(+), 352 deletions(-)
delete mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js
delete mode 100644 entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js
delete mode 100644 entity/Appointment_entity/entityfields/contexts/children/contextid_param/valueProcess.js
delete mode 100644 entity/Appointment_entity/entityfields/objects/children/objecttype_param/valueProcess.js
delete mode 100644 entity/Contact_entity/onValidation.js
delete mode 100644 entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js
delete mode 100644 entity/ObjectRelation_entity/entityfields/targetobjectrowid/valueProcess.js
delete mode 100644 entity/ObjectRelation_entity/entityfields/targetobjecttype/valueProcess.js
delete mode 100644 entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js
create mode 100644 entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
delete mode 100644 entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 29aff4640e..4e90b5b470 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -32,7 +32,6 @@
<node name="Attribute" kind="10077" />
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
- <node name="Salutation" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 810f78a70c..9f195d6db8 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -106,7 +106,6 @@
<title>Contract</title>
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js</onActionProcess>
<iconId>VAADIN:FILE_TEXT</iconId>
- <iconIdProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js</iconIdProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 505785aee4..ef3c7122fe 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -88,7 +88,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<children>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/organisation/children/ContactId_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js
deleted file mode 100644
index 7b6137b4d1..0000000000
--- a/entity/AnyContact_entity/entityfields/organisation/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/contexts/children/contextid_param/valueProcess.js b/entity/Appointment_entity/entityfields/contexts/children/contextid_param/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Appointment_entity/entityfields/objects/children/objecttype_param/valueProcess.js b/entity/Appointment_entity/entityfields/objects/children/objecttype_param/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index fdf60122d4..866f81d40b 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -4,7 +4,6 @@
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
- <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/Contact_entity/onValidation.js b/entity/Contact_entity/onValidation.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js b/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ObjectRelation_entity/entityfields/targetobjectrowid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/targetobjectrowid/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ObjectRelation_entity/entityfields/targetobjecttype/valueProcess.js b/entity/ObjectRelation_entity/entityfields/targetobjecttype/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 19b4227d96..34ef784773 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -81,7 +81,7 @@ function buildTreeData (pObjectRelations) {
var i = 0;
for (i = 0; i < pObjectRelations.length; i++) {
- var currentRelation = pObjectRelations[i];
+ let currentRelation = pObjectRelations[i];
if (relationTypeMapping[currentRelation[0]] === undefined)
relationTypeMapping[currentRelation[0]] = currentRelation[2];
@@ -89,7 +89,7 @@ function buildTreeData (pObjectRelations) {
var treeRows = []
for (i = 0; i < pObjectRelations.length; i++) {
- var currentRelation = pObjectRelations[i];
+ let currentRelation = pObjectRelations[i];
treeRows.push([currentRelation[3], currentRelation[0], currentRelation[4]]);
}
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index bca109621b..236c205986 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,324 +1,323 @@
-<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>Offeritem_entity</name>
- <title>Offeritem</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
- <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ASSIGNEDTO</name>
- </entityField>
- <entityField>
- <name>DISCOUNT</name>
- <title>Discount %</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0</outputFormat>
- </entityField>
- <entityField>
- <name>GROUPCODEID</name>
- <title>Commodity group</title>
- <consumer>KeywordProductGroupcodes</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ITEMNAME</name>
- <title>Designation</title>
- </entityField>
- <entityField>
- <name>ITEMPOSITION</name>
- <title>Position</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>ITEMSORT</name>
- </entityField>
- <entityField>
- <name>OFFERITEMID</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OFFER_ID</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRICE</name>
- <title>Unit price</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
- <title>Article</title>
- <consumer>Products</consumer>
- <linkedContext>Product</linkedContext>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
- <title>Quantity</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#</outputFormat>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
- <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>UNIT</name>
- <title>Unit</title>
- <consumer>KeywordQuantityUnits</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>PROCESS</element>
- <element>MASK</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>VAT in %</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <state>READONLY</state>
- </entityField>
- <entityParameter>
- <name>OfferId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>TotalPrice</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
- <title>Sum</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OfferStatus_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>OfferItems</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Offeritems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferStatus_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>INFO</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
- <title>Note</title>
- <contentType>LONG_TEXT</contentType>
- <state>READONLY</state>
- </entityField>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </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>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
- <tableName>OFFERITEM</tableName>
- <primaryKey>OFFERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ASSIGNEDTO.value</name>
- <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISCOUNT.value</name>
- <recordfield>OFFERITEM.DISCOUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.value</name>
- <recordfield>OFFERITEM.GROUPCODEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMNAME.value</name>
- <recordfield>OFFERITEM.ITEMNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMPOSITION.value</name>
- <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMSORT.value</name>
- <recordfield>OFFERITEM.ITEMSORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFERITEMID.value</name>
- <recordfield>OFFERITEM.OFFERITEMID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFER_ID.value</name>
- <recordfield>OFFERITEM.OFFER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OPTIONAL.value</name>
- <recordfield>OFFERITEM.OPTIONAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICE.value</name>
- <recordfield>OFFERITEM.PRICE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>QUANTITY.value</name>
- <recordfield>OFFERITEM.QUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.value</name>
- <recordfield>OFFERITEM.UNIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>OFFERITEM.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>OFFERITEM.INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.displayValue</name>
- <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <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>
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>Offeritem_entity</name>
+ <title>Offeritem</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
+ <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ASSIGNEDTO</name>
+ </entityField>
+ <entityField>
+ <name>DISCOUNT</name>
+ <title>Discount %</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0</outputFormat>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <title>Commodity group</title>
+ <consumer>KeywordProductGroupcodes</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMNAME</name>
+ <title>Designation</title>
+ </entityField>
+ <entityField>
+ <name>ITEMPOSITION</name>
+ <title>Position</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>ITEMSORT</name>
+ </entityField>
+ <entityField>
+ <name>OFFERITEMID</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OFFER_ID</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <title>Optional</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <title>Unit price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
+ <title>Article</title>
+ <consumer>Products</consumer>
+ <linkedContext>Product</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
+ <title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
+ <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <title>Unit</title>
+ <consumer>KeywordQuantityUnits</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>PROCESS</element>
+ <element>MASK</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>VAT in %</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <state>READONLY</state>
+ </entityField>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TotalPrice</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
+ <title>Sum</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>OfferItems</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Offeritems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>INFO</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
+ <title>Note</title>
+ <contentType>LONG_TEXT</contentType>
+ <state>READONLY</state>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </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>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
+ <tableName>OFFERITEM</tableName>
+ <primaryKey>OFFERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ASSIGNEDTO.value</name>
+ <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT.value</name>
+ <recordfield>OFFERITEM.DISCOUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.value</name>
+ <recordfield>OFFERITEM.GROUPCODEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMNAME.value</name>
+ <recordfield>OFFERITEM.ITEMNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMPOSITION.value</name>
+ <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMSORT.value</name>
+ <recordfield>OFFERITEM.ITEMSORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFERITEMID.value</name>
+ <recordfield>OFFERITEM.OFFERITEMID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFER_ID.value</name>
+ <recordfield>OFFERITEM.OFFER_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OPTIONAL.value</name>
+ <recordfield>OFFERITEM.OPTIONAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE.value</name>
+ <recordfield>OFFERITEM.PRICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ <recordfield>OFFERITEM.QUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.value</name>
+ <recordfield>OFFERITEM.UNIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>OFFERITEM.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>OFFERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.displayValue</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <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>
diff --git a/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js b/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9689370be3..38985904a7 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -372,6 +372,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<expose v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -722,17 +726,20 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>ORGANISATION_NAME</name>
+ </entityField>
<entityParameter>
- <name>SalesprojectId_param</name>
+ <name>ExcludedContactIds_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>SalesprojectMemberContact</name>
+ <name>Contacts</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
- <name>a6372a65-6cbe-4a8e-b428-f77b7f1ea4db</name>
+ <name>75f0e309-8b3f-4224-b599-a203405f1bff</name>
<entityName>SalesprojectMember_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
@@ -740,14 +747,19 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dependencies>
<children>
<entityParameter>
- <name>SalesprojectId_param</name>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OrgId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
- <entityField>
- <name>ORGANISATION_NAME</name>
- </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index 77acb02a09..47f1ee3551 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -4,13 +4,27 @@ import("system.result");
import("Sql_lib");
var cond = new SqlCondition();
-cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
-cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
+cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param")
+ .andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
+if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedContactIds_param"))
+{
+ var excludedContacts = JSON.parse(vars.get("$param.ExcludedContactIds_param"));
+ var excludedCond = SqlCondition.begin();
+
+ excludedContacts.forEach(function(pContactId)
+ {
+ excludedCond.andPrepare("CONTACT.CONTACTID", pContactId, "#<>?");
+ });
+
+ cond.andSqlCondition(excludedCond, "1=1");
+}
+
+/*
//in salesprojectMember, only people that aren't already in the salesproject should be selectable
cond.andPrepareVars("PERSON.PERSONID", "$param.SalesprojectId_param",
"# not in (select CONTACT.PERSON_ID from SALESPROJECT_MEMBER join CONTACT on SALESPROJECT_MEMBER.CONTACT_ID = CONTACT.CONTACTID "
+ " where SALESPROJECT_MEMBER.SALESPROJECT_ID = ?)");
-
+*/
//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+result.string(db.translateCondition(cond.build("1 = 1")));
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 94831ab568..34540f9d11 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -137,12 +137,12 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
- <fieldName>SalesprojectMemberContact</fieldName>
+ <fieldName>Contacts</fieldName>
</dependency>
<children>
<entityParameter>
- <name>SalesprojectId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js</valueProcess>
+ <name>ExcludedContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
new file mode 100644
index 0000000000..35ca5d0cce
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+logging.log(db.array(db.COLUMN, SqlCondition.begin()
+ .andPrepare("SALESPROJECT_MEMBER.SALESPROJECT_ID", vars.get("$field.SALESPROJECT_ID"))
+ .buildSql("select CONTACT_ID from SALESPROJECT_MEMBER", "1=2")).toSource())
+result.object(db.array(db.COLUMN, SqlCondition.begin()
+ .andPrepare("SALESPROJECT_MEMBER.SALESPROJECT_ID", vars.get("$field.SALESPROJECT_ID"))
+ .buildSql("select CONTACT_ID from SALESPROJECT_MEMBER", "1=2")));
+
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index 0456b23233..0000000000
--- a/entity/SalesprojectMember_entity/entityfields/contacts/children/salesprojectid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.SALESPROJECT_ID"));
\ No newline at end of file
--
GitLab
From 936fea10147d8148ec4075722d0c18cb7d8670a1 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 15:54:53 +0100
Subject: [PATCH 069/250] Activity / Task fix onDelete
---
entity/Activity_entity/recordcontainers/db/onDBDelete.js | 7 ++-----
entity/Task_entity/recordcontainers/db/onDBDelete.js | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/entity/Activity_entity/recordcontainers/db/onDBDelete.js b/entity/Activity_entity/recordcontainers/db/onDBDelete.js
index 0ae27fca3c..3ede978287 100644
--- a/entity/Activity_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Activity_entity/recordcontainers/db/onDBDelete.js
@@ -1,11 +1,8 @@
import("system.vars");
import("system.db");
import("Sql_lib");
-import("Context_lib");
var activityObjectsCondition = SqlCondition.begin()
- .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", ContextUtils.getCurrentContextId())
- .andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$field.ACTIVITYID");
-
-db.deleteData("AB_OBJECTRELATION", activityObjectsCondition.build("1=2"));
+ .andPrepareVars("ACTIVITYLINK.ACTIVITY_ID", "$field.ACTIVITYID");
+db.deleteData("ACTIVITYLINK", activityObjectsCondition.build("1=2"));
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/onDBDelete.js b/entity/Task_entity/recordcontainers/db/onDBDelete.js
index 7857f67130..d19d38f6e9 100644
--- a/entity/Task_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Task_entity/recordcontainers/db/onDBDelete.js
@@ -5,5 +5,4 @@ import("Sql_lib");
var condition = SqlCondition.begin()
.andPrepareVars("TASKLINK.TASK_ID", "$field.TASKID");
-db.deleteData("TASKLINK", condition.build("1=2"));
-
+db.deleteData("TASKLINK", condition.build("1=2"));
\ No newline at end of file
--
GitLab
From 7ca66950f902c53d3693b68b01e7df9f33e8f75c Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 16:12:29 +0100
Subject: [PATCH 070/250] fix Vertriebsdashboard: offene vertriebsprojekte,
versendete Angebote auf neue keywords angepast
---
neonView/OfferFilter_view/OfferFilter_view.aod | 2 +-
neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 8bd1c5f25d..edf7596f2f 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -27,7 +27,7 @@
<name>SendOffersDashlet</name>
<title>Sent offers</title>
<description>Show all sent offers</description>
- <fragment>Offer/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
+ <fragment>Offer/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImU1ZDZiNWE0LTc1NzYtNDQwZi04MzMyLWJjNDAxNDdjMDMzNSIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
<icon>vaadin:cart</icon>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 5baa8af9d1..1ea48c8e82 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -27,7 +27,7 @@
<name>OpenSalesprojectsDashlet</name>
<title>Open salesprojects</title>
<description>Show open salesprojects</description>
- <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlS2V5IjoiMSIsInZhbHVlIjoiT2ZmZW4iLCJjb250ZW50VHlwZSI6IlRFWFQifV0%253D</fragment>
+ <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
<icon>vaadin:filter</icon>
--
GitLab
From 2a1cd8069d73e8e7b4ac1e436d2d9572a9f2a091 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 16:48:08 +0100
Subject: [PATCH 071/250] TaskLink: could not creaty new tasks anymore
---
process/ActivityTask_lib/process.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 421a419f4f..4228e5d38d 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -165,7 +165,7 @@ _ActivityTaskUtils._addLinkRecords = function(pObjectIdField, pRowIdField, pAddi
break;
case "Task":
presetLinks = presetLinks.concat(db.table(SqlCondition.begin()
- .andPrepare("TASKLINK.ACTIVITY_ID", vars.get(pParentIdField))
+ .andPrepare("TASKLINK.TASK_ID", vars.get(pParentIdField))
.buildSql("select OBJECT_TYPE, OBJECT_ROWID from TASKLINK", "1=2")));
break;
}
--
GitLab
From e6bff1f416a5ecb607992832678b33fe6b6a0084 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 17:20:56 +0100
Subject: [PATCH 072/250] Task&Activity: use of correct displayValues
---
entity/Activity_entity/Activity_entity.aod | 2 +-
.../creator/displayValueProcess.js | 8 ++++++
.../entityfields/creator/valueProcess.js | 8 ------
.../editor_contact_id/displayValueProcess.js | 3 ++-
.../displayValueProcess.js | 3 ++-
process/Contact_lib/process.js | 26 ++++++++++++++++++-
6 files changed, 38 insertions(+), 12 deletions(-)
create mode 100644 entity/Activity_entity/entityfields/creator/displayValueProcess.js
delete mode 100644 entity/Activity_entity/entityfields/creator/valueProcess.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index dc0e95ce40..3f998199e7 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -263,7 +263,7 @@
<consumer>Contacts</consumer>
<linkedContext>Person</linkedContext>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>ModuleTrees</name>
diff --git a/entity/Activity_entity/entityfields/creator/displayValueProcess.js b/entity/Activity_entity/entityfields/creator/displayValueProcess.js
new file mode 100644
index 0000000000..0dde82e772
--- /dev/null
+++ b/entity/Activity_entity/entityfields/creator/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+var id = vars.get("$this.value");
+//show the simpel title since this will be later an employee-entry and therefore no organisation is needed
+var title = ContactUtils.getTitleByContactId(id);
+result.string(title);
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/creator/valueProcess.js b/entity/Activity_entity/entityfields/creator/valueProcess.js
deleted file mode 100644
index fbf6105a85..0000000000
--- a/entity/Activity_entity/entityfields/creator/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.neon");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- result.string(vars.get("$sys.user"));
-}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/editor_contact_id/displayValueProcess.js b/entity/Task_entity/entityfields/editor_contact_id/displayValueProcess.js
index ee76682f8e..0dde82e772 100644
--- a/entity/Task_entity/entityfields/editor_contact_id/displayValueProcess.js
+++ b/entity/Task_entity/entityfields/editor_contact_id/displayValueProcess.js
@@ -3,5 +3,6 @@ import("system.vars");
import("Contact_lib");
var id = vars.get("$this.value");
-var title = ContactUtils.getFullTitleByContactId(id);
+//show the simpel title since this will be later an employee-entry and therefore no organisation is needed
+var title = ContactUtils.getTitleByContactId(id);
result.string(title);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/requestor_contact_id/displayValueProcess.js b/entity/Task_entity/entityfields/requestor_contact_id/displayValueProcess.js
index ee76682f8e..0dde82e772 100644
--- a/entity/Task_entity/entityfields/requestor_contact_id/displayValueProcess.js
+++ b/entity/Task_entity/entityfields/requestor_contact_id/displayValueProcess.js
@@ -3,5 +3,6 @@ import("system.vars");
import("Contact_lib");
var id = vars.get("$this.value");
-var title = ContactUtils.getFullTitleByContactId(id);
+//show the simpel title since this will be later an employee-entry and therefore no organisation is needed
+var title = ContactUtils.getTitleByContactId(id);
result.string(title);
\ No newline at end of file
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 4dc852d62e..f4d5068268 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -235,6 +235,7 @@ ContactUtils.getFullTitleByContactId = function(pContactId)
/**
* get the name of the person
+ * do not use this for a mass of data (e.g. in a loop) since this will be slow due to select-time
*
* @param {String} pPersonId the id of the person where the data shall be loaded
*
@@ -259,6 +260,28 @@ ContactUtils.getTitleByPersonId = function(pPersonId)
return "";
}
+/**
+ * get the name of the person
+ * do not use this for a mass of data (e.g. in a loop) since this will be slow due to select-time
+ *
+ * @param {String} pContactId the id of the contact entry with the person where the data shall be loaded
+ *
+ * @return {String} the name or ""
+ */
+ContactUtils.getTitleByContactId = function(pContactId)
+{
+ if (pContactId)
+ {
+ var personId = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", pContactId)
+ .buildSql("select CONTACT.PERSON_ID from CONTACT ", "1 = 2"));
+ if (personId)
+ return ContactUtils.getTitleByPersonId(personId);
+ }
+
+ return "";
+}
+
/**
* returns the from string for the contact joined with org, person, address
*
@@ -368,7 +391,7 @@ Contact.createWithColumnPreset = function()
function ContactTitleRenderer(pContact, pOptions)
{
this.contact = pContact;
- if (pOptions !== undefined)//null means null which is "no option"; so check exactly for undefined
+ if (pOptions !== undefined)//null means null which is "no option"; so check exactly for undefined to check if default option has to be set
this._options = pOptions;
else
this._options = ContactTitleRenderer.OPTIONS.IncludeOrganisation;
@@ -401,6 +424,7 @@ function ContactTitleRenderer(pContact, pOptions)
* @static
*/
ContactTitleRenderer.OPTIONS = {
+ NoOption: 0,
IncludeOrganisation: 1
};
--
GitLab
From ba7feab291af35fa96b191c34d2f8bd8947d98a5 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 26 Mar 2019 17:31:13 +0100
Subject: [PATCH 073/250] 360 degree in person and icons
---
entity/360Degree_entity/360Degree_entity.aod | 19 ++++++++++++++++++-
.../entityfields/icon/valueProcess.js | 17 +++++++++++++++++
.../children/newcontract/stateProcess.js | 16 ++++++++++++++++
.../children/newoffer/stateProcess.js | 15 +++++++++++++++
.../children/newsalesproject/stateProcess.js | 15 +++++++++++++++
.../children/objecttype_param/valueProcess.js | 2 +-
entity/Person_entity/Person_entity.aod | 16 ++++++++++++++++
.../objectrowid_param/valueProcess.js | 4 ++++
.../360DegreeFilter_view.aod | 1 +
neonView/PersonMain_view/PersonMain_view.aod | 5 +++++
10 files changed, 108 insertions(+), 2 deletions(-)
create mode 100644 entity/360Degree_entity/entityfields/icon/valueProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
create mode 100644 entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 810f78a70c..13f96a0d0a 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -68,6 +68,14 @@
<entityProvider>
<name>PersonObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>360DegreeObjects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -84,7 +92,7 @@
<entityActionGroup>
<name>newModule</name>
<title>New module</title>
- <iconId>VAADIN:PLUS</iconId>
+ <iconId>VAADIN:PLUS_CIRCLE</iconId>
<children>
<entityActionField>
<name>newOffer</name>
@@ -92,6 +100,7 @@
<title>Offer</title>
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
+ <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newSalesproject</name>
@@ -99,6 +108,7 @@
<title>Salesproject</title>
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js</onActionProcess>
<iconId>VAADIN:BOOK_DOLLAR</iconId>
+ <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newContract</name>
@@ -107,9 +117,16 @@
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js</onActionProcess>
<iconId>VAADIN:FILE_TEXT</iconId>
<iconIdProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js</iconIdProcess>
+ <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js</stateProcess>
</entityActionField>
</children>
</entityActionGroup>
+ <entityField>
+ <name>ICON</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/360Degree_entity/entityfields/icon/valueProcess.js b/entity/360Degree_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000..6b0bb83e3c
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,17 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var context = vars.getString("$field.TARGET_CONTEXT");
+switch (context)
+{
+ case "Salesproject":
+ result.string("VAADIN:BOOK_DOLLAR");
+ break;
+ case "Offer":
+ result.string("VAADIN:CART");
+ break;
+ case "Contract":
+ result.string("VAADIN:FILE_TEXT");
+ break;
+}
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
new file mode 100644
index 0000000000..45d4c0d1ca
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("system.logging");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+var found = false;
+contextList.forEach(function (context)
+{
+ if(context == "Contract")
+ found = true;
+});
+if(found)
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
new file mode 100644
index 0000000000..43eff24495
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+var found = false;
+contextList.forEach(function (context)
+{
+ if(context == "Offer")
+ found = true;
+});
+if(found)
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
new file mode 100644
index 0000000000..faec2ba794
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+var found = false;
+contextList.forEach(function (context)
+{
+ if(context == "Salesproject")
+ found = true;
+});
+if(found)
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index bb07a1ee2e..15de0e1ae4 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.object(["Salesproject", "Offer", "Contract"]);
\ No newline at end of file
+result.object(["Offer", "Contract"]);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 744aac134e..cbf15c42b4 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -742,6 +742,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityField>
<name>ORGANISATION_NAME</name>
</entityField>
+ <entityConsumer>
+ <name>360DegreeObjects</name>
+ <title>360 Degree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>360Degree_entity</entityName>
+ <fieldName>PersonObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..bdc67e9f84
--- /dev/null
+++ b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.PERSONID"));
\ No newline at end of file
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index 46a3db16a6..49cd28ef68 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -14,6 +14,7 @@
<favoriteActionGroup2>newModule</favoriteActionGroup2>
<titleField>TITLE</titleField>
<descriptionField>DATE</descriptionField>
+ <iconField>ICON</iconField>
<defaultGroupFields>
<element>CONTEXT_NAME</element>
</defaultGroupFields>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index c27980a4d2..dd6165d8f3 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -19,6 +19,11 @@
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
+ <entityField>360DegreeObjects</entityField>
+ <view>360DegreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>573d2b77-f948-47bc-bac1-621dd824c697</name>
<entityField>Tasks</entityField>
--
GitLab
From 64819c5dacee9c572a221a30c09a684c1e48132e Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 26 Mar 2019 17:58:14 +0100
Subject: [PATCH 074/250] Context_lib fixes
---
process/Context_lib/process.js | 8 --------
1 file changed, 8 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 5549cd81db..7eee3571db 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -121,14 +121,12 @@ ContextUtils._getSelectMap = function()
"ORGANISATION",
"ORGANISATIONID",
"",
- "",
""
],
"Person": [
(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()),
"PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ",
"CONTACTID",
- "",
"CONTACT",
""
],
@@ -150,7 +148,6 @@ ContextUtils._getSelectMap = function()
"SALESPROJECT",
"SALESPROJECTID",
"CONTACT_ID",
- "",
"STARTDATE"
],
"Contract": [
@@ -161,7 +158,6 @@ ContextUtils._getSelectMap = function()
"CONTRACT",
"CONTRACTID",
"CONTACT_ID",
- "",
"CONTRACTSTART"
],
"Offer": [
@@ -175,7 +171,6 @@ ContextUtils._getSelectMap = function()
"OFFER",
"OFFERID",
"CONTACT_ID",
- "",
"OFFERDATE"
],
"Order": [
@@ -189,7 +184,6 @@ ContextUtils._getSelectMap = function()
"SALESORDER",
"SALESORDERID",
"CONTACT_ID",
- "",
"ORDERDATE"
],
"Product": [
@@ -201,7 +195,6 @@ ContextUtils._getSelectMap = function()
"PRODUCT",
"PRODUCTID",
"",
- "",
""
],
"Task": [
@@ -210,7 +203,6 @@ ContextUtils._getSelectMap = function()
"TASKID",
translate.text("Task"),
"",
- "",
""
]
}
--
GitLab
From 05f2c4eafca8361b54039ae7599d5cfdfe33e5da Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 26 Mar 2019 17:59:35 +0100
Subject: [PATCH 075/250] Person_entity fixes
---
entity/Person_entity/Person_entity.aod | 6 ------
1 file changed, 6 deletions(-)
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index a1bfbf3da6..f441407fcc 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -760,10 +760,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityProvider>
-<<<<<<< HEAD
- <entityField>
- <name>ORGANISATION_NAME</name>
- </entityField>
<entityConsumer>
<name>360DegreeObjects</name>
<title>360 Degree</title>
@@ -780,8 +776,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
-=======
->>>>>>> e6bff1f416a5ecb607992832678b33fe6b6a0084
</entityFields>
<recordContainers>
<dbRecordContainer>
--
GitLab
From a291bfb8f8f061acad5344fb2bc5f757899e952a Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 26 Mar 2019 18:05:46 +0100
Subject: [PATCH 076/250] 360degree objects removed from main views
---
.../OrganisationMain_view.aod | 15 ---------------
neonView/PersonMain_view/PersonMain_view.aod | 10 ----------
2 files changed, 25 deletions(-)
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 7a18c8683f..3e7ccf4980 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -45,16 +45,6 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>50f61cda-5f85-4212-b3b2-3a55b9fae54d</name>
- <entityField>Offers</entityField>
- <view>OfferFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>fd099297-e87d-4ada-b7e7-e04afafbd8b0</name>
- <entityField>Contracts</entityField>
- <view>ContractFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>ab7d3db4-af9d-4903-b28a-6347f2512a54</name>
<entityField>ObjectRelations</entityField>
@@ -70,10 +60,5 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>dc1aa0ca-d0bd-45fd-84dc-55cfcf3ca430</name>
- <entityField>Salesprojects</entityField>
- <view>SalesprojectFilter_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index dd6165d8f3..afe8033aee 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -34,16 +34,6 @@
<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>
- <view>ContractFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>a713a58e-eae0-4657-9cb0-ffffbd41d4ab</name>
<entityField>ObjectRelations</entityField>
--
GitLab
From efe25aeca808475d41a6fe9373e5f0df096fac25 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 26 Mar 2019 17:46:27 +0100
Subject: [PATCH 077/250] added validation for date of birth
---
entity/Person_entity/Person_entity.aod | 1 +
.../entityfields/dateofbirth/onValidation.js | 9 +++++++++
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 3 +++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
5 files changed, 20 insertions(+)
create mode 100644 entity/Person_entity/entityfields/dateofbirth/onValidation.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index f441407fcc..e550ec716d 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -16,6 +16,7 @@
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
+ <onValidation>%aditoprj%/entity/Person_entity/entityfields/dateofbirth/onValidation.js</onValidation>
</entityField>
<entityField>
<name>FIRSTNAME</name>
diff --git a/entity/Person_entity/entityfields/dateofbirth/onValidation.js b/entity/Person_entity/entityfields/dateofbirth/onValidation.js
new file mode 100644
index 0000000000..9da0a7497b
--- /dev/null
+++ b/entity/Person_entity/entityfields/dateofbirth/onValidation.js
@@ -0,0 +1,9 @@
+import("system.datetime");
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("Entity_lib");
+
+var dob = ProcessHandlingUtils.getOnValidationValue();
+if (Number(datetime.clearTime(dob)) > Number(vars.get("$sys.today")))
+ result.string(translate.text("date of birth must not be in the future"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 737d126139..b09b295268 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2625,6 +2625,9 @@
<entry>
<key>Management</key>
</entry>
+ <entry>
+ <key>date of birth must not be in the future</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 61efa9f24a..512dfcf882 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -114,6 +114,10 @@
<key>${QUANTITY_LOWER_THAN_1}</key>
<value>Die Menge muss mindestens 1 sein.</value>
</entry>
+ <entry>
+ <key>date of birth must not be in the future</key>
+ <value>Geburtsdatum darf nicht in der Zukunft liegen</value>
+ </entry>
<entry>
<key>Days inactive</key>
<value>Tage inaktiv</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index de4f31a483..63182afd57 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2650,6 +2650,9 @@
<entry>
<key>Réunion</key>
</entry>
+ <entry>
+ <key>date of birth must not be in the future</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 813fb96662ee4d34390d6beed8c982153dc5346c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 07:57:26 +0100
Subject: [PATCH 078/250] better KeywordRegistry-syntax
---
process/KeywordRegistry_basic/process.js | 84 ++++++++++++------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index f9c474f06c..6b42e2ff36 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -17,50 +17,50 @@
*/
function $KeywordRegistry(){}
-$KeywordRegistry.attributeType = function(){return "AttributeType"};
-$KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType"};
-$KeywordRegistry.contractPayment = function(){return "ContractPayment"};
-$KeywordRegistry.contractStatus = function(){return "ContractStatus"};
-$KeywordRegistry.contractType = function(){return "ContractType"};
-$KeywordRegistry.activityDirection = function(){return "ActivityDirection"};
+$KeywordRegistry.attributeType = function(){return "AttributeType";};
+$KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
+$KeywordRegistry.contractPayment = function(){return "ContractPayment";};
+$KeywordRegistry.contractStatus = function(){return "ContractStatus";};
+$KeywordRegistry.contractType = function(){return "ContractType";};
+$KeywordRegistry.activityDirection = function(){return "ActivityDirection";};
-$KeywordRegistry.contactStatus = function(){return "ContactStatus"};
-$KeywordRegistry.contactStatus$active = function(){return "BSIC0rel-stat-actv-ae03-b6b04430e90b"};
+$KeywordRegistry.contactStatus = function(){return "ContactStatus";};
+$KeywordRegistry.contactStatus$active = function(){return "BSIC0rel-stat-actv-ae03-b6b04430e90b";};
-$KeywordRegistry.currency = function(){return "Currency"};
-$KeywordRegistry.productGroupcode = function(){return "ProductGroupcode"};
-$KeywordRegistry.offerStatus = function(){return "OfferStatus"};
-$KeywordRegistry.organisationType = function(){return "OrganisationType"};
-$KeywordRegistry.personGender = function(){return "PersonGender"};
-$KeywordRegistry.taskStatus = function(){return "TaskStatus"};
-$KeywordRegistry.taskType = function(){return "TaskType"};
+$KeywordRegistry.currency = function(){return "Currency";};
+$KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
+$KeywordRegistry.offerStatus = function(){return "OfferStatus";};
+$KeywordRegistry.organisationType = function(){return "OrganisationType";};
+$KeywordRegistry.personGender = function(){return "PersonGender";};
+$KeywordRegistry.taskStatus = function(){return "TaskStatus";};
+$KeywordRegistry.taskType = function(){return "TaskType";};
-$KeywordRegistry.productPricelist = function(){return "ProductPricelist"};
-$KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9"};
+$KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
+$KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9";};
-$KeywordRegistry.quantityUnit = function(){return "QuantityUnit"};
-$KeywordRegistry.salesprojectMemberRole = function(){return "SalesprojectMemberRole"};
-$KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource"};
-$KeywordRegistry.salesorderState = function(){return "SalesorderState"};
-$KeywordRegistry.salesprojectWonLost = function(){return "SalesprojectWonLost"};
-$KeywordRegistry.stockWarehouse = function(){return "StockWarehouse"};
-$KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbability"};
-$KeywordRegistry.activityCategory = function(){return "ActivityCategory"};
-$KeywordRegistry.addressType = function(){return "AddressType"};
-$KeywordRegistry.offerProbability = function(){return "OfferProbability"};
-$KeywordRegistry.communicationMedium = function(){return "CommunicationMedium"};
-$KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics"};
-$KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness"};
-$KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"};
-$KeywordRegistry.salesprojectState = function(){return "SalesprojectState"};
-$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"};
-$KeywordRegistry.taskPriority = function(){return "TaskPriority"};
-$KeywordRegistry.taskProgress = function(){return "TaskProgress"};
-$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState"};
-$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType"};
-$KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm"};
-$KeywordRegistry.paymentTerm = function(){return "PaymentTerm"};
-$KeywordRegistry.contactDepartment = function(){return "ContactDepartment"};
-$KeywordRegistry.contactPosition = function(){return "ContactPosition"};
-$KeywordRegistry.contactContactrole = function(){return "ContactContactrole"};
+$KeywordRegistry.quantityUnit = function(){return "QuantityUnit";};
+$KeywordRegistry.salesprojectMemberRole = function(){return "SalesprojectMemberRole";};
+$KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource";};
+$KeywordRegistry.salesorderState = function(){return "SalesorderState";};
+$KeywordRegistry.salesprojectWonLost = function(){return "SalesprojectWonLost";};
+$KeywordRegistry.stockWarehouse = function(){return "StockWarehouse";};
+$KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbability";};
+$KeywordRegistry.activityCategory = function(){return "ActivityCategory";};
+$KeywordRegistry.addressType = function(){return "AddressType";};
+$KeywordRegistry.offerProbability = function(){return "OfferProbability";};
+$KeywordRegistry.communicationMedium = function(){return "CommunicationMedium";};
+$KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics";};
+$KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness";};
+$KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght";};
+$KeywordRegistry.salesprojectState = function(){return "SalesprojectState";};
+$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
+$KeywordRegistry.taskPriority = function(){return "TaskPriority";};
+$KeywordRegistry.taskProgress = function(){return "TaskProgress";};
+$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState";};
+$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType";};
+$KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm";};
+$KeywordRegistry.paymentTerm = function(){return "PaymentTerm";};
+$KeywordRegistry.contactDepartment = function(){return "ContactDepartment";};
+$KeywordRegistry.contactPosition = function(){return "ContactPosition";};
+$KeywordRegistry.contactContactrole = function(){return "ContactContactrole";};
--
GitLab
From 3032c3c4cd41842a4b35e5e252e950bec4ec59d5 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 27 Mar 2019 08:58:22 +0100
Subject: [PATCH 079/250] Attribute and Index optimization
---
aliasDefinition/Data_alias/Data_alias.aod | 6 +++---
.../Data_alias/indexsearchgroups/offer/query.js | 10 +++++++---
.../indexsearchgroups/organisation/query.js | 2 +-
.../Data_alias/indexsearchgroups/person/query.js | 2 +-
.../indexsearchgroups/salesorder/query.js | 13 +++++++------
.../AttributeRelation_entity.aod | 2 ++
.../attribute_parent_id/displayValueProcess.js | 5 +++++
.../recordcontainers/db/orderClauseProcess.js | 5 +++++
entity/Attribute_entity/Attribute_entity.aod | 3 +++
.../AttributeRelationFilter_view.aod | 8 +++++---
10 files changed, 39 insertions(+), 17 deletions(-)
create mode 100644 entity/AttributeRelation_entity/entityfields/attribute_parent_id/displayValueProcess.js
create mode 100644 entity/AttributeRelation_entity/recordcontainers/db/orderClauseProcess.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 7e09926aa3..7e3443fa75 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5134,7 +5134,7 @@
<name>OFFER</name>
<title>Offer</title>
<icon>VAADIN:CART</icon>
- <active v="false" />
+ <active v="true" />
<idColumn>OFFERID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
@@ -5147,9 +5147,9 @@
</indexSearchGroup>
<indexSearchGroup>
<name>SALESORDER</name>
- <title>Order</title>
+ <title>Receipt</title>
<icon>VAADIN:DOLLAR</icon>
- <active v="false" />
+ <active v="true" />
<idColumn>SALESORDERID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
index d8bff6962e..1ad88702c6 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
@@ -2,9 +2,12 @@ import("system.result");
import("system.vars");
import("system.calendars");
import("system.db");
+import("Keyword_lib");
import("Sql_lib");
+import("KeywordRegistry_basic");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
@@ -12,9 +15,10 @@ if (vars.exists("$local.idvalue")) {
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select OFFERID, "
- + "OFFERCODE as TITLECOLUMN, "
- + sqlHelper.concat(["ORGNAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
- + " as DESCCOLUMN, OFFERCODE, ORGNAME, CUSTOMERCODE "
+ + sqlHelper.concat(["OFFERCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ")
+ + " as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
+ + " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ " from OFFER "
+ " join CONTACT on OFFER.CONTACT_ID = CONTACTID "
+ " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
index 8deb7a7a4f..5778a7f9e4 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
@@ -12,7 +12,7 @@ if (vars.exists("$local.idvalue")) {
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select CONTACT.CONTACTID "
- + "," + sqlHelper.concat(["ORGANISATION.NAME", "ORGANISATION.CUSTOMERCODE"])
+ + "," + sqlHelper.concat(["ORGANISATION.NAME", "ORGANISATION.CUSTOMERCODE"], " | ")
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
index 8dd398447f..6178113261 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
@@ -12,7 +12,7 @@ if (vars.exists("$local.idvalue")) {
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select CONTACT.CONTACTID "
- + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "ORGANISATION.NAME"])
+ + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
index 39a1d15028..02db43bf56 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
@@ -5,6 +5,7 @@ import("system.db");
import("Sql_lib");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
@@ -12,11 +13,11 @@ if (vars.exists("$local.idvalue")) {
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select SALESORDERID, "
- + " ORDERCODE as TITLECOLUMN, "
- + sqlHelper.concat(["ORGNAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
- + " as DESCCOLUMN, ORDERCODE, ORGNAME, CUSTOMERCODE "
+ + " SALESORDERCODE as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
+ + " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ " from SALESORDER "
- + " join RELATION on SALESORDER.RELATION_ID = RELATIONID "
- + " join ORG on ORGID = RELATION.ORG_ID "
- + queryCondition + " order by ORDERCODE ";
+ + " join CONTACT on SALESORDER.CONTACT_ID = CONTACTID "
+ + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
+ + queryCondition + " order by SALESORDERCODE ";
result.string(sqlQuery);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index e257ce32b6..f4ad545d26 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -130,6 +130,7 @@
<title>Superordinate Attribute</title>
<possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
+ <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -198,6 +199,7 @@
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>14697123-47ee-4ff0-8ab2-2b8d1217f637</name>
diff --git a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/displayValueProcess.js
new file mode 100644
index 0000000000..b853103366
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+result.string(AttributeUtil.getFullAttributeName(vars.get("$field.ATTRIBUTE_PARENT_ID")));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/orderClauseProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..b70300ec1e
--- /dev/null
+++ b/entity/AttributeRelation_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.db");
+import("system.result");
+result.object({
+ "AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID" : db.ASCENDING
+});
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 405955e8bd..ead7f6425a 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -38,6 +38,7 @@
<title>Superordinate Attribute</title>
<consumer>AttributeChildren</consumer>
<linkedContext>Attribute</linkedContext>
+ <searchable v="false" />
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
@@ -122,6 +123,7 @@
<title>Active</title>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/possibleItemsProcess.js</possibleItemsProcess>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
@@ -152,6 +154,7 @@
<name>KEYWORD_CONTAINER</name>
<title>Keyword</title>
<possibleItemsProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/possibleItemsProcess.js</possibleItemsProcess>
+ <searchable v="false" />
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js</stateProcess>
</entityField>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index 73c5a2e0f2..d655cdd2da 100644
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
@@ -27,9 +27,11 @@
</tableViewTemplate>
<treetableViewTemplate>
<name>RelationsTreetable</name>
- <parentField>ATTRIBUTE_PARENT_ID</parentField>
- <titleField>AB_ATTRIBUTE_ID</titleField>
- <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
+ <titleField>valueProxy</titleField>
+ <defaultGroupFields>
+ <element>ATTRIBUTE_PARENT_ID</element>
+ <element>AB_ATTRIBUTE_ID</element>
+ </defaultGroupFields>
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
</children>
--
GitLab
From ef2cfaabed2bce7964d4259c9966b2cf2f3100a7 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 27 Mar 2019 10:29:52 +0100
Subject: [PATCH 080/250] Attribute usages updated
---
.../valueproxy/possibleItemsProcess.js | 1 +
.../data/example_attribute/AttributeUsage.xml | 307 ++++++++++++------
2 files changed, 203 insertions(+), 105 deletions(-)
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
index 779fd24fa9..48d4fad4dd 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
@@ -11,6 +11,7 @@ var attrType = AttributeHandler.begin(attributeId).getAttributeType();
if (attrType == $AttributeTypes.COMBO)
{
var valueSql = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1")
.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
.buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE");
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
index e6019bb9b6..d1cc31c444 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -1,6 +1,11 @@
<?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="s.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
+ <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
<column name="AB_ATTRIBUTE_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
@@ -43,11 +48,6 @@
<column name="MIN_COUNT" valueNumeric="1"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="5b9d5f38-4486-4586-8de0-9c607d51e698"/>
- <column name="AB_ATTRIBUTE_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
- <column name="OBJECT_TYPE" value="Document_entity"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
<column name="AB_ATTRIBUTE_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
@@ -58,21 +58,11 @@
<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="OBJECT_TYPE" value="Person"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="8adfbc93-2daa-4e6b-a3ce-76110b46e458"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="OBJECT_TYPE" value="Contract"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="31b6b6f1-b980-4b14-a382-a718be560009"/>
- <column name="AB_ATTRIBUTE_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
- <column name="OBJECT_TYPE" value="Document_entity"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
<column name="AB_ATTRIBUTE_ID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
@@ -98,36 +88,11 @@
<column name="AB_ATTRIBUTE_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
<column name="OBJECT_TYPE" value="Product"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="89be2b44-2766-4dea-9a73-725b84a20d6d"/>
- <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="OBJECT_TYPE" value="Contact"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="0766ff88-304d-41a7-8224-642a0aee5587"/>
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="ef63620d-f247-4ca0-bd92-9efa0b14676e"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="512ef5be-3381-42ac-860a-b1fbb9be665b"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="dbb70409-43b2-4a94-b7f7-bbb4e4ba101d"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="f579e0d5-42f4-4682-99b5-358e06ffe4a1"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
<column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
@@ -145,21 +110,11 @@
<column name="MIN_COUNT" valueNumeric="1"/>
<column name="OBJECT_TYPE" value="Person"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="9a145e7f-bb66-4541-bb99-28c2dd944f3d"/>
- <column name="AB_ATTRIBUTE_ID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
- <column name="OBJECT_TYPE" value="Document_entity"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
<column name="AB_ATTRIBUTE_ID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
<column name="OBJECT_TYPE" value="Product"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="fade7115-40fb-41a2-8f71-dbb6905176e9"/>
- <column name="AB_ATTRIBUTE_ID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
- <column name="OBJECT_TYPE" value="Document_entity"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
@@ -177,11 +132,6 @@
<column name="MIN_COUNT" valueNumeric="2"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="6fd80f33-6d9a-4b95-b420-c3c5b249caf9"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
<column name="AB_ATTRIBUTE_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
@@ -203,12 +153,6 @@
<column name="AB_ATTRIBUTE_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
<column name="OBJECT_TYPE" value="Person"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="ebb3b2a2-0fd2-4307-8f21-c118e7ad7b8e"/>
- <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Contact"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="755239d0-7fe3-46bc-8ec4-923977148455"/>
<column name="AB_ATTRIBUTE_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
@@ -219,12 +163,6 @@
<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
<column name="OBJECT_TYPE" value="Person"/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="0826cf13-f379-417d-9fed-302fe44a618e"/>
- <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
@@ -241,7 +179,118 @@
<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
<column name="OBJECT_TYPE" value="Product"/>
</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
+ <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
+ <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
+ <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
+ <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
+ <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
+ <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
+ <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="5fcdb4a4-5b63-4379-a839-319701612438"/>
+ <column name="AB_ATTRIBUTE_ID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
+ <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
+ <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
+ <column name="AB_ATTRIBUTE_ID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
+ <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
+ <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
+ <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
+ <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+</insert>
<rollback>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
+ </whereParams>
+</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
@@ -293,229 +342,277 @@
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="5b9d5f38-4486-4586-8de0-9c607d51e698"/>
+ <param value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
+ <param value="f06dd320-4757-4261-aace-cb827a313d28"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="f06dd320-4757-4261-aace-cb827a313d28"/>
+ <param value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="8adfbc93-2daa-4e6b-a3ce-76110b46e458"/>
+ <param value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
+ <param value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="31b6b6f1-b980-4b14-a382-a718be560009"/>
+ <param value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
+ <param value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
+ <param value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
+ <param value="0766ff88-304d-41a7-8224-642a0aee5587"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
+ <param value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
+ <param value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="89be2b44-2766-4dea-9a73-725b84a20d6d"/>
+ <param value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="0766ff88-304d-41a7-8224-642a0aee5587"/>
+ <param value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="ef63620d-f247-4ca0-bd92-9efa0b14676e"/>
+ <param value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="512ef5be-3381-42ac-860a-b1fbb9be665b"/>
+ <param value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="dbb70409-43b2-4a94-b7f7-bbb4e4ba101d"/>
+ <param value="05576033-1bee-4547-ab82-fdfcdd039642"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="f579e0d5-42f4-4682-99b5-358e06ffe4a1"/>
+ <param value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
+ <param value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
+ <param value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
+ <param value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="9a145e7f-bb66-4541-bb99-28c2dd944f3d"/>
+ <param value="755239d0-7fe3-46bc-8ec4-923977148455"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
+ <param value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="fade7115-40fb-41a2-8f71-dbb6905176e9"/>
+ <param value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
+ <param value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
+ <param value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="05576033-1bee-4547-ab82-fdfcdd039642"/>
+ <param value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="6fd80f33-6d9a-4b95-b420-c3c5b249caf9"/>
+ <param value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
+ <param value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
+ <param value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
+ <param value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
+ <param value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="ebb3b2a2-0fd2-4307-8f21-c118e7ad7b8e"/>
+ <param value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="755239d0-7fe3-46bc-8ec4-923977148455"/>
+ <param value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
+ <param value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="0826cf13-f379-417d-9fed-302fe44a618e"/>
+ <param value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
+ <param value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
+ <param value="5fcdb4a4-5b63-4379-a839-319701612438"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
<whereParams>
- <param value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
+ <param value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
</whereParams>
</delete>
</rollback>
--
GitLab
From df15e994f94a8424a555ea6f03389ac29c1b9a5b Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 10:36:03 +0100
Subject: [PATCH 081/250] =?UTF-8?q?Mitbewerber=20&=20Produkt=20Einschr?=
=?UTF-8?q?=C3=A4nkung=20auf=20attribut=20Zielgruppe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Organisation_entity.aod | 90 +++++++++++++++----
.../recordcontainers/db/conditionProcess.js | 24 +++++
.../recordcontainers/db/conditionProcess.js | 6 --
entity/Product_entity/Product_entity.aod | 12 ++-
.../attributeid_param/valueProcess.js | 4 +
.../attributekeyid_param/valueProcess.js | 4 +
.../SalesprojectCompetition_entity.aod | 18 +++-
.../children/contactid_param/valueProcess.js | 4 -
.../attributeid_param/valueProcess.js | 4 +
.../attributekeyid_param/valueProcess.js | 4 +
.../excludedcontactids_param/valueProcess.js | 8 ++
.../excludedcontactids_param/valueProcess.js | 4 -
.../init_AttributeKeyword_target_group.xml | 90 +++++++++++++++++++
.../data_alias/basic/2019.2/changelog.xml | 2 +
14 files changed, 238 insertions(+), 36 deletions(-)
create mode 100644 entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
create mode 100644 entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
delete mode 100644 entity/SalesprojectCompetition_entity/entityfields/organisation/children/contactid_param/valueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
create mode 100644 others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 64f7d41a88..90e490097c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -128,12 +128,6 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>120c8bfb-1b03-408d-97e7-88e3b7249c53</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>Organisation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>19a28531-bec6-49e2-b00d-aae3816e6690</name>
<entityName>Person_entity</entityName>
@@ -154,6 +148,18 @@
<name>ExcludeOrganisationsByPersonId</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -247,18 +253,6 @@
<entityProvider>
<name>#PROVIDER</name>
<dependencies>
- <entityDependency>
- <name>f78c0ca6-7939-4a0e-903e-0fbbbf512e76</name>
- <entityName>Product_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1fa399a8-8c0c-470f-94a8-6c748293d93d</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>c84fdb27-45a1-4dec-b013-af43751f6a7b</name>
<entityName>Salesproject_entity</entityName>
@@ -667,6 +661,66 @@
</entityParameter>
</children>
</entityProvider>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>WithAttribute</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f368be61-1a15-449f-b37c-b1343069412c</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>WithPrivate_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index d8f6c2d5a8..a42eafd440 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -2,6 +2,7 @@ import("system.vars");
import("system.db");
import("system.result");
import("Sql_lib");
+import("Context_lib");
var cond = SqlCondition.begin()
.andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param");
@@ -16,5 +17,28 @@ if (excludeOrgsWithPersonId)
.andPrepare("CONTACT.PERSON_ID", excludeOrgsWithPersonId)
.buildSql("ORGANISATION.ORGANISATIONID not in (select CONTACT.ORGANISATION_ID from CONTACT", null, ")"));
+if (vars.exists("$param.AttributeId_param") && vars.get("$param.AttributeId_param"))
+{
+ var hasAttributeCondition = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", ContextUtils.getCurrentContextId())
+ .andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", vars.get("$param.AttributeId_param"))
+ .andPrepareVars("AB_ATTRIBUTERELATION.ID_VALUE", "$param.AttributeKeyId_param");
+
+ cond.andAttachPrepared(hasAttributeCondition.buildSql("ORGANISATION.ORGANISATIONID in (select OBJECT_ROWID from AB_ATTRIBUTERELATION", "1=2", ")"));
+}
+
+if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedContactIds_param"))
+{
+ var excludedContacts = JSON.parse(vars.get("$param.ExcludedContactIds_param"));
+ var excludedCond = SqlCondition.begin();
+
+ excludedContacts.forEach(function(pContactId)
+ {
+ excludedCond.andPrepare("CONTACT.CONTACTID", pContactId, "#<>?");
+ });
+
+ cond.andSqlCondition(excludedCond, "1=1");
+}
+
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index 47f1ee3551..d31e4c68e7 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -20,11 +20,5 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
cond.andSqlCondition(excludedCond, "1=1");
}
-/*
-//in salesprojectMember, only people that aren't already in the salesproject should be selectable
-cond.andPrepareVars("PERSON.PERSONID", "$param.SalesprojectId_param",
- "# not in (select CONTACT.PERSON_ID from SALESPROJECT_MEMBER join CONTACT on SALESPROJECT_MEMBER.CONTACT_ID = CONTACT.CONTACTID "
- + " where SALESPROJECT_MEMBER.SALESPROJECT_ID = ?)");
-*/
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 5501274d10..cd11c3d2bc 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -83,8 +83,18 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>WithAttribute</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>Productprices</name>
diff --git a/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
new file mode 100644
index 0000000000..645b2d9365
--- /dev/null
+++ b/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+// Target Group (Zielgruppe)
+result.string("5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
new file mode 100644
index 0000000000..4a5bc0b05c
--- /dev/null
+++ b/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+// Manufacturer
+result.string("41b0832f-8de2-4ab5-a6e0-9a793c5f80c3");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 0df2e74d7c..e4a89fde11 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -91,8 +91,6 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -109,8 +107,22 @@
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>WithAttribute</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>KeywordWonLost</name>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisation/children/contactid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisation/children/contactid_param/valueProcess.js
deleted file mode 100644
index 7e0951d02b..0000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/organisation/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
new file mode 100644
index 0000000000..645b2d9365
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+// Target Group (Zielgruppe)
+result.string("5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
new file mode 100644
index 0000000000..ca41e6e260
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+// Competitor
+result.string("fc09afd5-5f74-4e48-af26-3600bb4c9610");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
new file mode 100644
index 0000000000..09c14009f3
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+result.object(db.array(db.COLUMN, SqlCondition.begin()
+ .andPrepare("SALESPROJECT_COMPETITION.SALESPROJECT_ID", vars.get("$field.SALESPROJECT_ID"))
+ .buildSql("select CONTACT_ID from SALESPROJECT_COMPETITION", "1=2")));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
index 35ca5d0cce..4f34874adf 100644
--- a/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
@@ -1,12 +1,8 @@
-import("system.logging");
import("system.result");
import("system.vars");
import("system.db");
import("Sql_lib");
-logging.log(db.array(db.COLUMN, SqlCondition.begin()
- .andPrepare("SALESPROJECT_MEMBER.SALESPROJECT_ID", vars.get("$field.SALESPROJECT_ID"))
- .buildSql("select CONTACT_ID from SALESPROJECT_MEMBER", "1=2")).toSource())
result.object(db.array(db.COLUMN, SqlCondition.begin()
.andPrepare("SALESPROJECT_MEMBER.SALESPROJECT_ID", vars.get("$field.SALESPROJECT_ID"))
.buildSql("select CONTACT_ID from SALESPROJECT_MEMBER", "1=2")));
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
new file mode 100644
index 0000000000..5d05350bab
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
@@ -0,0 +1,90 @@
+<?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.hoermann" id="7401faab-a383-48de-82db-0a869b77445d">
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+ <column name="ATTRIBUTE_NAME" value="Zielgruppe"/>
+ <column name="ATTRIBUTE_PARENT_ID"/>
+ <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
+ <column name="KEYWORD_CONTAINER" value="TargetGroup"/>
+ </insert>
+
+ <insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d3d71563-cb7a-41a1-80be-148f090dafe1"/>
+ <column name="AB_ATTRIBUTE_ID" value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="e9d25ed2-60d6-4512-81e0-f0c234bb099b"/>
+ <column name="KEYID" value="9ba661a1-82df-46b1-8e9f-79d9c14a2f8c"/>
+ <column name="TITLE" value="Customer"/>
+ <column name="CONTAINER" value="TargetGroup"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="739898f5-f498-4d55-b384-03d0f2399581"/>
+ <column name="KEYID" value="765e57ad-964c-47da-91eb-9bcdaa63b6c8"/>
+ <column name="TITLE" value="Prospective customer"/>
+ <column name="CONTAINER" value="TargetGroup"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3417041a-11bc-47e6-9ebb-43c82fbb9c05"/>
+ <column name="KEYID" value="41b0832f-8de2-4ab5-a6e0-9a793c5f80c3"/>
+ <column name="TITLE" value="Manufacturer"/>
+ <column name="CONTAINER" value="TargetGroup"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="d3e23da8-3551-4d7f-ba8c-da8b6839c3da"/>
+ <column name="KEYID" value="fc09afd5-5f74-4e48-af26-3600bb4c9610"/>
+ <column name="TITLE" value="Competitor"/>
+ <column name="CONTAINER" value="TargetGroup"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="aaef93fa-6ca5-46b7-a850-84e02a99de48"/>
+ <column name="KEYID" value="defe2588-5892-46b2-81d9-00ebde7ca3d7"/>
+ <column name="TITLE" value="Partner"/>
+ <column name="CONTAINER" value="TargetGroup"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <rollback>
+ <delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID in (?)</where>
+ <whereParams>
+ <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTE_ID in (?)</where>
+ <whereParams>
+ <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID in (?, ?, ?, ?, ?)</where>
+ <whereParams>
+ <param value="e9d25ed2-60d6-4512-81e0-f0c234bb099b"/>
+ <param value="739898f5-f498-4d55-b384-03d0f2399581"/>
+ <param value="3417041a-11bc-47e6-9ebb-43c82fbb9c05"/>
+ <param value="d3e23da8-3551-4d7f-ba8c-da8b6839c3da"/>
+ <param value="aaef93fa-6ca5-46b7-a850-84e02a99de48"/>
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 05f9a8b2d4..0020833885 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -108,4 +108,6 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactDepartment.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactContactrole.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactPosition.xml"/>
+
+ <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeKeyword_target_group.xml"/>
</databaseChangeLog>
--
GitLab
From 5640fee5be61a7875e58980aeefbac763b359e69 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 10:46:01 +0100
Subject: [PATCH 082/250] =?UTF-8?q?Mitbewerber=20&=20Produkt=20Einschr?=
=?UTF-8?q?=C3=A4nkung=20auf=20attribut=20Zielgruppe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../_____LANGUAGE_EXTRA.aod | 12 ++++++++++++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 18 +++++++++++++++++-
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 12 ++++++++++++
3 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index b09b295268..127eb4ad15 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2628,6 +2628,18 @@
<entry>
<key>date of birth must not be in the future</key>
</entry>
+ <entry>
+ <key>Manufacturer</key>
+ </entry>
+ <entry>
+ <key>Prospective customer</key>
+ </entry>
+ <entry>
+ <key>Competitor</key>
+ </entry>
+ <entry>
+ <key>Partner</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 512dfcf882..7b30b805b9 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3062,7 +3062,7 @@
</entry>
<entry>
<key>competitor</key>
- <value>Konkurrent</value>
+ <value>Mitbewerber</value>
</entry>
<entry>
<key>0%</key>
@@ -3382,6 +3382,22 @@
<entry>
<key>Management</key>
</entry>
+ <entry>
+ <key>Manufacturer</key>
+ <value>Hersteller</value>
+ </entry>
+ <entry>
+ <key>Prospective customer</key>
+ <value>Potenzieller Kunde</value>
+ </entry>
+ <entry>
+ <key>Competitor</key>
+ <value>Mitbewerber</value>
+ </entry>
+ <entry>
+ <key>Partner</key>
+ <value>Partner</value>
+ </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 63182afd57..ccf5eb9707 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2653,6 +2653,18 @@
<entry>
<key>date of birth must not be in the future</key>
</entry>
+ <entry>
+ <key>Manufacturer</key>
+ </entry>
+ <entry>
+ <key>Prospective customer</key>
+ </entry>
+ <entry>
+ <key>Competitor</key>
+ </entry>
+ <entry>
+ <key>Partner</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 49f985884a97d2f48e2183787102e92b0d7774ba Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Wed, 27 Mar 2019 10:56:38 +0100
Subject: [PATCH 083/250] #1035771 Standard address/communication
---
entity/Address_entity/Address_entity.aod | 1 +
.../recordcontainers/db/onDBInsert.js | 13 +
.../Communication_entity.aod | 2 +
.../recordcontainers/db/onDBInsert.js | 5 +
.../recordcontainers/db/onDBUpdate.js | 10 +
entity/Person_entity/Person_entity.aod | 1 +
.../entityfields/address_id/valueProcess.js | 13 +
.../StandardObject_lib/StandardObject_lib.aod | 10 +
process/StandardObject_lib/documentation.adoc | 3 +
process/StandardObject_lib/process.js | 283 ++++++++++++++++++
10 files changed, 341 insertions(+)
create mode 100644 entity/Address_entity/recordcontainers/db/onDBInsert.js
create mode 100644 entity/Communication_entity/recordcontainers/db/onDBInsert.js
create mode 100644 entity/Communication_entity/recordcontainers/db/onDBUpdate.js
create mode 100644 entity/Person_entity/entityfields/address_id/valueProcess.js
create mode 100644 process/StandardObject_lib/StandardObject_lib.aod
create mode 100644 process/StandardObject_lib/documentation.adoc
create mode 100644 process/StandardObject_lib/process.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 67b08770d2..05fa30709b 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -256,6 +256,7 @@
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<linkInformation>
<linkInformation>
<name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
diff --git a/entity/Address_entity/recordcontainers/db/onDBInsert.js b/entity/Address_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000..4f0f20e26a
--- /dev/null
+++ b/entity/Address_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.vars");
+import("StandardObject_lib");
+
+var typeParam = vars.get("$param.ContactType_param");
+var scopeType = null
+if (typeParam === "contact")
+ scopeType = "Person"
+else if (typeParam === "organisation")
+ scopeType = "Organisation"
+
+new StandardObject("Address", vars.get("$field.ADDRESSID"), scopeType, vars.get("$field.CONTACT_ID"))
+ .onObjectInsert()
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 3a60711e69..e6c42a3ec7 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -206,6 +206,8 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>e3567770-187a-4366-bb87-fb22ff7ff257</name>
diff --git a/entity/Communication_entity/recordcontainers/db/onDBInsert.js b/entity/Communication_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000..4c78aed8ff
--- /dev/null
+++ b/entity/Communication_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("StandardObject_lib");
+
+new StandardObject("Communication", vars.get("$field.COMMUNICATIONID"), "Person", vars.get("$field.CONTACT_ID"))
+ .onCommunicationInsert(vars.get("$field.MEDIUM_ID"));
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
new file mode 100644
index 0000000000..bf5479355e
--- /dev/null
+++ b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
@@ -0,0 +1,10 @@
+import("system.logging");
+import("system.vars");
+import("StandardObject_lib");
+
+logging.log("Object " + vars.get("$field.COMMUNICATIONID"))
+logging.log("Contact " + vars.get("$field.CONTACT_ID"))
+logging.log("Medium " + vars.get("$field.MEDIUM_ID"))
+
+new StandardObject("Communication", vars.get("$field.COMMUNICATIONID"), "Person", vars.get("$field.CONTACT_ID"))
+ .onCommunicationUpdate(vars.get("$field.MEDIUM_ID"));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 744aac134e..dcdf96b857 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -474,6 +474,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>standard address</title>
<consumer>ContactAndOrganisationAddresses</consumer>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
diff --git a/entity/Person_entity/entityfields/address_id/valueProcess.js b/entity/Person_entity/entityfields/address_id/valueProcess.js
new file mode 100644
index 0000000000..72dfe18cc0
--- /dev/null
+++ b/entity/Person_entity/entityfields/address_id/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("StandardObject_lib");
+// Check if the standard address is already set.
+if (vars.get("$field.ADDRESS_ID") === null || vars.get("$field.ADDRESS_ID") === "" || vars.get("$field.ADDRESS_ID") == 0) {
+ var possibleStandardAddressID = new StandardObject("Address", null, "Person", vars.get("$field.PERSONID"))
+ .onPersonValueChange(vars.get("$field.ORGANISATION_ID"));
+
+ // If a possible standard addrss was found it should get applied to the field.
+ if (possibleStandardAddressID !== null)
+ result.string(possibleStandardAddressID);
+}
\ No newline at end of file
diff --git a/process/StandardObject_lib/StandardObject_lib.aod b/process/StandardObject_lib/StandardObject_lib.aod
new file mode 100644
index 0000000000..ae58a214e8
--- /dev/null
+++ b/process/StandardObject_lib/StandardObject_lib.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process 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/process/1.2.0">
+ <name>StandardObject_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/process/StandardObject_lib/documentation.adoc</documentation>
+ <process>%aditoprj%/process/StandardObject_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/StandardObject_lib/documentation.adoc b/process/StandardObject_lib/documentation.adoc
new file mode 100644
index 0000000000..894375807d
--- /dev/null
+++ b/process/StandardObject_lib/documentation.adoc
@@ -0,0 +1,3 @@
+StandardObject_lib
+==================
+
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
new file mode 100644
index 0000000000..15358cf2b9
--- /dev/null
+++ b/process/StandardObject_lib/process.js
@@ -0,0 +1,283 @@
+import("system.logging");
+import("system.db");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+function StandardObject (pObjectType, pObjectID, pScopeType, pScopeID) {
+ if (!this._isValidType("object", pObjectType))
+ throw new Error("StandardObject: Invalid object type")
+ if (!this._isValidType("scope", pScopeType))
+ throw new Error("StandardObject: Invalid scope type")
+
+ this.objectType = pObjectType
+ this.objectID = pObjectID
+ this.scopeType = pScopeType
+ this.scopeID = pScopeID
+
+ this.__mediumCache = {};
+}
+
+StandardObject.CONST_OBJECT_ADDRESS = function () {
+ return "Address"
+}
+
+StandardObject.CONST_OBJECT_COMMUNICATION = function () {
+ return "Communication"
+}
+
+StandardObject.CONST_SCOPE_PERSON = function () {
+ return "Person"
+}
+
+StandardObject.CONST_SCOPE_ORGANISATION = function () {
+ return "Organisation"
+}
+
+StandardObject.prototype._isValidType = function (pFor, pType) {
+ var validObjectTypes = ["Address", "Communication"]
+ var validScopeTypes = ["Person", "Organisation"]
+ if (pFor === "object") {
+ return validObjectTypes.indexOf(pType) !== -1
+ } else if (pFor === "scope"){
+ return validScopeTypes.indexOf(pType) !== -1
+ } else {
+ return false;
+ }
+}
+
+/**
+ * Asserts the object type of this instance against the
+ * given type.
+ *
+ * @throws Error if assertion fails.
+ */
+StandardObject.prototype._assertObjectType = function (pType) {
+ if (this.objectType !== pType)
+ throw new Error("Object assertion: Invalid type");
+}
+
+/**
+ * Asserts the scope type of this instance against the
+ * given type.
+ *
+ * @throws Error if assertion fails.
+ */
+StandardObject.prototype._assertScopeType = function (pType) {
+ if (this.scopeType !== pType)
+ throw new Error("Scope assertion: Invalid type");
+}
+
+/**
+ * Asserts that the object ID is NOT null.
+ *
+ * @throws Error if assertion fails.
+ */
+StandardObject.prototype._assertObjectIdNotNull = function () {
+ if (this.objectID === null)
+ throw new Error("Object assertion: ID is null");
+}
+
+/**
+ * Asserts that the scope ID is NOT null.
+ *
+ * @throws Error if assertion fails.
+ */
+StandardObject.prototype._assertScopeIdNotNull = function () {
+ if (this.scopeID === null)
+ throw new Error("Scope assertion: ID is null");
+}
+
+/**
+ * Shall be executed in the `valueProcess` of the `ADDRESS_ID` in the
+ * `Person` entity. This function will take care about the standard address
+ * of the linked organisation.o
+ *
+ * @param pSelectedOrganisationID The ID of the currently selected organisation.
+ * @return Standard address to apply to the field or null
+ * (if no standard address was found)
+ */
+StandardObject.prototype.onPersonValueChange = function (pSelectedOrganisationID) {
+ this._assertScopeIdNotNull();
+
+ // Check if the organisation has an standard address
+ var addressID = this._getCompanyStandardAddress(pSelectedOrganisationID);
+
+ return addressID;
+}
+
+/**
+ * Shall be executed on the `onDBInsert` process of the recordContainer
+ * of the object type (Address or Communication). This algorithm works
+ * on a "random" basis: Which object gets first inserted will get the
+ * place as standard.
+ */
+StandardObject.prototype.onObjectInsert = function () {
+ this._assertObjectIdNotNull();
+ this._assertScopeIdNotNull();
+
+ if (this.objectType === StandardObject.CONST_OBJECT_ADDRESS()) {
+ this._onAddressInsert()
+ } else if (this.objectType === StandardObject.CONST_OBJECT_COMMUNICATION) {
+ this._onCommunicationInsert()
+ }
+}
+
+StandardObject.prototype.onObjectUpdate = function () {
+
+}
+
+/**
+ * Shall be execute only on the `onDBInsert` process of the recordContainer
+ * of the `Address` entity. This will set the standard address on the
+ * contact if it's currently null.
+ */
+StandardObject.prototype._onAddressInsert = function () {
+ // Assert
+ this._assertObjectType(StandardObject.CONST_OBJECT_ADDRESS());
+
+ if (!this._hasContactStandardAddress(this.scopeID)) {
+ this._setContactStandardAddress(this.objectID, this.scopeID)
+ }
+}
+
+StandardObject.prototype.onCommunicationInsert = function (pMediumID) {
+ // Assert
+ this._assertObjectType(StandardObject.CONST_OBJECT_COMMUNICATION());
+ this._assertObjectIdNotNull();
+ this._assertScopeIdNotNull();
+
+ var mediumCategory = this._getMediumCategory(pMediumID);
+
+ var hasStandard = this._hasStandardCommunicationByMedium(this.scopeID, mediumCategory);
+ if (!hasStandard) {
+ this._setStandardCommunication(this.objectID, 1);
+ }
+}
+
+StandardObject.prototype.onCommunicationUpdate = function (pMediumID) {
+ // Assert
+ this._assertObjectType(StandardObject.CONST_OBJECT_COMMUNICATION());
+ this._assertObjectIdNotNull();
+ this._assertScopeIdNotNull();
+
+ this._setStandardCommunication(this.objectID, 0);
+
+ var mediumCategory = this._getMediumCategory(pMediumID);
+
+ var hasStandard = this._hasStandardCommunicationByMedium(this.scopeID, mediumCategory);
+ if (!hasStandard)
+ this._setStandardCommunication(this.objectID, 1);
+}
+
+StandardObject.prototype._onAddressUpdate = function (pAddressID) {
+
+}
+
+StandardObject.prototype._onAddressDelete = function (pAddressID) {
+
+}
+
+/**
+ * Checks if the given contact ID has any address ID set. If there is a standard
+ * address it will return `true`, otherwise `false`. This function asserts that
+ * it's currently working on a `Address` object.
+ *
+ * @param pContactID Contact ID to check.
+ * @return If the contact ID has standard address.
+ */
+StandardObject.prototype._hasContactStandardAddress = function (pContactID) {
+ this._assertObjectType(StandardObject.CONST_OBJECT_ADDRESS());
+
+ var databaseResult = db.cell("select ADDRESS_ID from CONTACT"
+ + " where CONTACTID = '" + pContactID + "'");
+
+ return databaseResult !== "";
+}
+
+/**
+ * Will set the given address ID on the given contact ID. This function asserts
+ * that it's currently working on an `Address` object.
+ *
+ * @param pAddressID New address ID to set on the contact.
+ * @param pContactID The contact ID to set the address ID on.
+ */
+StandardObject.prototype._setContactStandardAddress = function (pAddressID, pContactID) {
+ // Assert.
+ this._assertObjectType(StandardObject.CONST_OBJECT_ADDRESS());
+
+ // Update data.
+ db.updateData(
+ "CONTACT",
+ ["ADDRESS_ID"],
+ db.getColumnTypes("CONTACT", ["ADDRESS_ID"]),
+ [pAddressID],
+ "CONTACTID = '" + pContactID + "'")
+}
+
+/**
+ * Will return the standard address of the given organisation. If the organisation
+ * has no standard address set it will just return null.
+ *
+ * @return Standard address of the organisation or null.
+ */
+StandardObject.prototype._getCompanyStandardAddress = function (pOrganisationID) {
+ var addressIdResult = db.cell("select ADDRESS_ID from CONTACT"
+ + " where ORGANISATION_ID = '" + pOrganisationID + "'"
+ + " and ADDRESS_ID is not null and PERSON_ID is null");
+
+ if (addressIdResult === "")
+ return null;
+ return addressIdResult;
+}
+
+/**
+ * Checks if the given contact ID already has a standard set with the given medium
+ * category.
+ *
+ * @param pContactID {String} Contact ID to check.
+ * @param pMediumCategory {String} Medium category to check.
+ * @return {Boolean} If the contact already has a standard addres with the given
+ * medium category.
+ */
+StandardObject.prototype._hasStandardCommunicationByMedium = function (pContactID, pMediumCategory) {
+ logging.log("Contact: " + pContactID)
+
+ var dbResult = db.array(db.COLUMN, "select CHAR_VALUE from COMMUNICATION"
+ + " left join AB_KEYWORD_ENTRY on KEYID = MEDIUM_ID"
+ + " left join AB_KEYWORD_ATTRIBUTERELATION on AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID and AB_KEYWORD_ATTRIBUTE_ID = '7250ff28-1d48-41cc-bb36-8c33ace341bb'"
+ + " where STANDARD = 1 and CONTACT_ID = '" + pContactID + "'")
+
+ return dbResult.indexOf(pMediumCategory) !== -1;
+}
+
+/**
+ * Resolves the given pMediumID with the category.
+ *
+ * @param pMediumID {String} ID of the medium to resolve.
+ * @return {String} Resovled category.
+ */
+StandardObject.prototype._getMediumCategory = function (pMediumID) {
+ var categories = KeywordUtils.getAttributeRelationsByKey(pMediumID, $KeywordRegistry.communicationMedium())
+
+ return categories.category;
+}
+
+/**
+ * Will set the given communication ID as standard. (Will update the `STANDARD`
+ * column.)
+ *
+ * @param pCommunicationID {String} The communication ID to set as standard.
+ * @param pValue {Number} 0 or 1 (boolean)
+ */
+StandardObject.prototype._setStandardCommunication = function (pCommunicationID, pValue) {
+ // Assert.
+ this._assertObjectType(StandardObject.CONST_OBJECT_COMMUNICATION());
+
+ // Update data.
+ db.updateData(
+ "COMMUNICATION",
+ ["STANDARD"],
+ db.getColumnTypes("COMMUNICATION", ["STANDARD"]),
+ [pValue],
+ "COMMUNICATIONID = '" + pCommunicationID + "'")
+}
\ No newline at end of file
--
GitLab
From 2c822cf4a82ae12798264225338796d3c75b9af8 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 27 Mar 2019 11:02:06 +0100
Subject: [PATCH 084/250] Attribute Liquibase fix
---
.../basic/2019.2/data/example_attribute/Attribute.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 6c2c36f53f..e625a181d2 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -895,13 +895,6 @@
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
- <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="MIN_COUNT"/>
- <column name="MAX_COUNT"/>
-</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
--
GitLab
From aa762ae5bbe2dfc6f05a698b18b8c8fc3f40e0da Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 11:05:56 +0100
Subject: [PATCH 085/250] fix Preisliste attribut
---
.../data_alias/basic/2019.2/data/example_attribute/Attribute.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index e625a181d2..2ae99c4f9e 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -894,6 +894,7 @@
<column name="ATTRIBUTE_NAME" value="Preisliste"/>
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
+ <column name="KEYWORD_CONTAINER" value="ProductPricelist"/>
</insert>
<insert tableName="AB_ATTRIBUTE">
--
GitLab
From 76953b7243f6fb85e6d2feff62eaa69d36590ed0 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Wed, 27 Mar 2019 11:21:47 +0100
Subject: [PATCH 086/250] #1035771 Standard address/communication
---
.../recordcontainers/db/onDBUpdate.js | 4 ---
process/StandardObject_lib/process.js | 32 ++++++++-----------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
index bf5479355e..7e2690d20a 100644
--- a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
@@ -2,9 +2,5 @@ import("system.logging");
import("system.vars");
import("StandardObject_lib");
-logging.log("Object " + vars.get("$field.COMMUNICATIONID"))
-logging.log("Contact " + vars.get("$field.CONTACT_ID"))
-logging.log("Medium " + vars.get("$field.MEDIUM_ID"))
-
new StandardObject("Communication", vars.get("$field.COMMUNICATIONID"), "Person", vars.get("$field.CONTACT_ID"))
.onCommunicationUpdate(vars.get("$field.MEDIUM_ID"));
\ No newline at end of file
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 15358cf2b9..28c728cd76 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -13,8 +13,6 @@ function StandardObject (pObjectType, pObjectID, pScopeType, pScopeID) {
this.objectID = pObjectID
this.scopeType = pScopeType
this.scopeID = pScopeID
-
- this.__mediumCache = {};
}
StandardObject.CONST_OBJECT_ADDRESS = function () {
@@ -122,10 +120,6 @@ StandardObject.prototype.onObjectInsert = function () {
}
}
-StandardObject.prototype.onObjectUpdate = function () {
-
-}
-
/**
* Shall be execute only on the `onDBInsert` process of the recordContainer
* of the `Address` entity. This will set the standard address on the
@@ -164,19 +158,13 @@ StandardObject.prototype.onCommunicationUpdate = function (pMediumID) {
var mediumCategory = this._getMediumCategory(pMediumID);
- var hasStandard = this._hasStandardCommunicationByMedium(this.scopeID, mediumCategory);
+ var contactID = this._getContactIdByCommunication(this.objectID);
+
+ var hasStandard = this._hasStandardCommunicationByMedium(contactID, mediumCategory);
if (!hasStandard)
this._setStandardCommunication(this.objectID, 1);
}
-StandardObject.prototype._onAddressUpdate = function (pAddressID) {
-
-}
-
-StandardObject.prototype._onAddressDelete = function (pAddressID) {
-
-}
-
/**
* Checks if the given contact ID has any address ID set. If there is a standard
* address it will return `true`, otherwise `false`. This function asserts that
@@ -239,9 +227,7 @@ StandardObject.prototype._getCompanyStandardAddress = function (pOrganisationID)
* @return {Boolean} If the contact already has a standard addres with the given
* medium category.
*/
-StandardObject.prototype._hasStandardCommunicationByMedium = function (pContactID, pMediumCategory) {
- logging.log("Contact: " + pContactID)
-
+StandardObject.prototype._hasStandardCommunicationByMedium = function (pContactID, pMediumCategory) {
var dbResult = db.array(db.COLUMN, "select CHAR_VALUE from COMMUNICATION"
+ " left join AB_KEYWORD_ENTRY on KEYID = MEDIUM_ID"
+ " left join AB_KEYWORD_ATTRIBUTERELATION on AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID and AB_KEYWORD_ATTRIBUTE_ID = '7250ff28-1d48-41cc-bb36-8c33ace341bb'"
@@ -280,4 +266,14 @@ StandardObject.prototype._setStandardCommunication = function (pCommunicationID,
db.getColumnTypes("COMMUNICATION", ["STANDARD"]),
[pValue],
"COMMUNICATIONID = '" + pCommunicationID + "'")
+}
+
+/**
+ * Will return the Contact ID by the given communication ID.
+ *
+ * @param pCommunicationID {String} Communication ID to get the contact ID for.
+ * @return The contact ID.
+ */
+StandardObject.prototype._getContactIdByCommunication = function (pCommunicationID) {
+ return db.cell("select CONTACT_ID from COMMUNICATION where COMMUNICATIONID = '" + pCommunicationID + "'")
}
\ No newline at end of file
--
GitLab
From f1756f456bfdd82f0876c4627abac40d32f19552 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 11:06:37 +0100
Subject: [PATCH 087/250] contact: do not list private org as possible value
---
entity/Contact_entity/Contact_entity.aod | 1 -
.../organisations/children/withprivate_param/valueProcess.js | 3 ---
entity/Person_entity/Person_entity.aod | 2 --
.../organisations/children/withprivate_param/valueProcess.js | 3 ---
4 files changed, 9 deletions(-)
delete mode 100644 entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
delete mode 100644 entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 866f81d40b..90507dc0de 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -58,7 +58,6 @@
<children>
<entityParameter>
<name>WithPrivate_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
diff --git a/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js b/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
deleted file mode 100644
index 40effa0178..0000000000
--- a/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string(true);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index ae41d2378c..3871e1cc56 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -208,7 +208,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<children>
<entityParameter>
<name>WithPrivate_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -479,7 +478,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>standard address</title>
<consumer>ContactAndOrganisationAddresses</consumer>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
diff --git a/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js b/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
deleted file mode 100644
index 40effa0178..0000000000
--- a/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string(true);
\ No newline at end of file
--
GitLab
From c05fcec485e7dc8024d56f2fa41a12d617ea9ce5 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 11:20:02 +0100
Subject: [PATCH 088/250] contact: presetvalue language
---
entity/Person_entity/Person_entity.aod | 1 +
.../language/displayValueProcess.js | 10 ++++++++
.../entityfields/language/valueProcess.js | 2 +-
process/Keyword_lib/process.js | 23 +++++++++++++++++++
4 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 entity/Person_entity/entityfields/language/displayValueProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 3871e1cc56..fe8bc3b42f 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -295,6 +295,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<consumer>Languages</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/language/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/language/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
diff --git a/entity/Person_entity/entityfields/language/displayValueProcess.js b/entity/Person_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 0000000000..dae44e029a
--- /dev/null
+++ b/entity/Person_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+
+var key = vars.get("$field.LANGUAGE");
+if (key)
+{
+ var res = LanguageKeywordUtils.getViewValue(key);
+ result.string(res);
+}
diff --git a/entity/Person_entity/entityfields/language/valueProcess.js b/entity/Person_entity/entityfields/language/valueProcess.js
index 6793351846..1af70be4c9 100644
--- a/entity/Person_entity/entityfields/language/valueProcess.js
+++ b/entity/Person_entity/entityfields/language/valueProcess.js
@@ -3,5 +3,5 @@ import("system.vars");
import("system.db");
import("system.result");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.LANGUAGE") == "")
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.getString("$field.LANGUAGE") == "")
result.string("deu");
\ No newline at end of file
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 3c150d05ed..12fee921f9 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -217,6 +217,29 @@ LanguageKeywordUtils.getResolvedTitleSqlPart = function(pDbFieldName, pLocale)
return db.translateStatement(resSql);
};
+/**
+ * returns a specific name (translated) - this is normally the view-value of a language
+ *
+ * @param {String} key id value of the language where the view-value shall be searched
+ *
+ * @return {String} representation of the translated name
+ *
+ */
+LanguageKeywordUtils.getViewValue = function(key)
+{
+ if (!key)
+ return "";
+
+ var sql = SqlCondition.begin()
+ .andPrepare("AB_LANGUAGE.ISO3", key)
+ .buildSql("select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE");
+ var originalTitle = db.cell(sql);
+ if (originalTitle == "")
+ return "";
+ var translatedTitle = translate.text(originalTitle);
+ return translatedTitle;
+};
+
/**
* provides methods for interactions with legcy keywords
--
GitLab
From 42b63e7395af2e7514bc5b4df698649dace97e16 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 11:31:27 +0100
Subject: [PATCH 089/250] remove ADDRESS.STATE from views
---
neonView/AddressEdit_view/AddressEdit_view.aod | 4 ----
neonView/AddressFilter_view/AddressFilter_view.aod | 4 ----
neonView/AddressList_view/AddressList_view.aod | 4 ----
neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod | 4 ----
4 files changed, 16 deletions(-)
diff --git a/neonView/AddressEdit_view/AddressEdit_view.aod b/neonView/AddressEdit_view/AddressEdit_view.aod
index 10f2872a49..2114d1eb55 100644
--- a/neonView/AddressEdit_view/AddressEdit_view.aod
+++ b/neonView/AddressEdit_view/AddressEdit_view.aod
@@ -37,10 +37,6 @@
<name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>e7804363-405d-429d-91c9-23de9685cc9a</name>
- <entityField>STATE</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressFilter_view/AddressFilter_view.aod
index 8dca53e1da..2f07b18741 100644
--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ b/neonView/AddressFilter_view/AddressFilter_view.aod
@@ -37,10 +37,6 @@
<name>57247c5c-6498-420b-b288-68ca316cf7f2</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>9a965a25-a8aa-4777-865e-138624f2d848</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 4ea6e925cf..f022863515 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -38,10 +38,6 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>17039f2e-4253-4242-bcc4-b75483adfbd0</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
</columns>
</titledListViewTemplate>
</children>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 65f2c96188..c1be3d32a8 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -36,10 +36,6 @@
<name>fafca2d6-c2dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>945bd8e7-9d0d-4e32-8908-24d8dfb74463</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
--
GitLab
From 1ca0b1a4be4a8a527b18c1ff6891f978594d5b89 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 13:10:38 +0100
Subject: [PATCH 090/250] contact: preset language in "new contact"-action
---
entity/Contact_entity/Contact_entity.aod | 8 ++++++++
.../entityfields/language/displayValueProcess.js | 10 ++++++++++
.../entityfields/language/valueProcess.js | 5 +++++
.../entityfields/languagekey_param/valueProcess.js | 2 ++
entity/Person_entity/Person_entity.aod | 4 ++++
.../children/languagekey_param/valueProcess.js | 5 +++++
6 files changed, 34 insertions(+)
create mode 100644 entity/Contact_entity/entityfields/language/displayValueProcess.js
create mode 100644 entity/Contact_entity/entityfields/language/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/languagekey_param/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 90507dc0de..2cffc73dc9 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -127,6 +127,8 @@
<title>Language</title>
<consumer>Languages</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Languages</name>
@@ -189,6 +191,12 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>LanguageKey_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contact_entity/entityfields/language/displayValueProcess.js b/entity/Contact_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 0000000000..dae44e029a
--- /dev/null
+++ b/entity/Contact_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+
+var key = vars.get("$field.LANGUAGE");
+if (key)
+{
+ var res = LanguageKeywordUtils.getViewValue(key);
+ result.string(res);
+}
diff --git a/entity/Contact_entity/entityfields/language/valueProcess.js b/entity/Contact_entity/entityfields/language/valueProcess.js
new file mode 100644
index 0000000000..f29e2ae5d1
--- /dev/null
+++ b/entity/Contact_entity/entityfields/language/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+var key = vars.get("$param.LanguageKey_param");
+result.string(key);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js b/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js
new file mode 100644
index 0000000000..b36e49dbbe
--- /dev/null
+++ b/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("deu");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index fe8bc3b42f..b8b639094d 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -725,6 +725,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>OwnContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>LanguageKey_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js b/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js
new file mode 100644
index 0000000000..e517058dc2
--- /dev/null
+++ b/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+var res = vars.get("$field.LANGUAGE");
+result.string(res);
\ No newline at end of file
--
GitLab
From d3ff2a2b6acc43e58f98a87e821e1cb5839a9186 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Wed, 27 Mar 2019 13:30:13 +0100
Subject: [PATCH 091/250] #1035771 Standard address/communication
---
.../recordcontainers/db/onDBUpdate.js | 4 ++
process/StandardObject_lib/process.js | 40 +++++++++++++++----
2 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index c1aaada594..4e3598b753 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -2,6 +2,7 @@ import("system.vars");
import("Person_lib");
import("Communication_lib");
import("Entity_lib");
+import("StandardObject_lib");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
@@ -20,3 +21,6 @@ FieldChanges.assimilateChangeAndDispose("$field.STANDARD_EMAIL_COMMUNICATION", f
FieldChanges.assimilateChangeAndDispose("$field.STANDARD_PHONE_COMMUNICATION", function(state, value){
CommUtil.setStandardPhone(uid, value);
});
+
+new StandardObject("Address", vars.get("$field.ADDRESS_ID"), "Person", vars.get("$field.CONTACTID"))
+ .onPersonUpdate(vars.get("$field.ORGANISATION_ID"));
\ No newline at end of file
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 28c728cd76..52d5ba43de 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -2,6 +2,7 @@ import("system.logging");
import("system.db");
import("Keyword_lib");
import("KeywordRegistry_basic");
+import("Contact_lib");
function StandardObject (pObjectType, pObjectID, pScopeType, pScopeID) {
if (!this._isValidType("object", pObjectType))
@@ -114,9 +115,9 @@ StandardObject.prototype.onObjectInsert = function () {
this._assertScopeIdNotNull();
if (this.objectType === StandardObject.CONST_OBJECT_ADDRESS()) {
- this._onAddressInsert()
+ this._onAddressInsert();
} else if (this.objectType === StandardObject.CONST_OBJECT_COMMUNICATION) {
- this._onCommunicationInsert()
+ this._onCommunicationInsert();
}
}
@@ -130,7 +131,21 @@ StandardObject.prototype._onAddressInsert = function () {
this._assertObjectType(StandardObject.CONST_OBJECT_ADDRESS());
if (!this._hasContactStandardAddress(this.scopeID)) {
- this._setContactStandardAddress(this.objectID, this.scopeID)
+ this._setContactStandardAddress(this.objectID, this.scopeID);
+ }
+}
+
+StandardObject.prototype.onPersonUpdate = function (pOrganisationID) {
+ // Assert
+ this._assertScopeType(StandardObject.CONST_SCOPE_PERSON());
+
+ var isOrganisationAddress = this._isOrganisationAddress(this.scopeID);
+
+ if (isOrganisationAddress) {
+ // Update to new address of org
+ var addressID = this._getCompanyStandardAddress(pOrganisationID);
+
+ this._setContactStandardAddress(addressID, this.scopeID);
}
}
@@ -199,7 +214,7 @@ StandardObject.prototype._setContactStandardAddress = function (pAddressID, pCon
["ADDRESS_ID"],
db.getColumnTypes("CONTACT", ["ADDRESS_ID"]),
[pAddressID],
- "CONTACTID = '" + pContactID + "'")
+ "CONTACTID = '" + pContactID + "'");
}
/**
@@ -231,7 +246,7 @@ StandardObject.prototype._hasStandardCommunicationByMedium = function (pContactI
var dbResult = db.array(db.COLUMN, "select CHAR_VALUE from COMMUNICATION"
+ " left join AB_KEYWORD_ENTRY on KEYID = MEDIUM_ID"
+ " left join AB_KEYWORD_ATTRIBUTERELATION on AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID and AB_KEYWORD_ATTRIBUTE_ID = '7250ff28-1d48-41cc-bb36-8c33ace341bb'"
- + " where STANDARD = 1 and CONTACT_ID = '" + pContactID + "'")
+ + " where STANDARD = 1 and CONTACT_ID = '" + pContactID + "'");
return dbResult.indexOf(pMediumCategory) !== -1;
}
@@ -265,7 +280,7 @@ StandardObject.prototype._setStandardCommunication = function (pCommunicationID,
["STANDARD"],
db.getColumnTypes("COMMUNICATION", ["STANDARD"]),
[pValue],
- "COMMUNICATIONID = '" + pCommunicationID + "'")
+ "COMMUNICATIONID = '" + pCommunicationID + "'");
}
/**
@@ -275,5 +290,16 @@ StandardObject.prototype._setStandardCommunication = function (pCommunicationID,
* @return The contact ID.
*/
StandardObject.prototype._getContactIdByCommunication = function (pCommunicationID) {
- return db.cell("select CONTACT_ID from COMMUNICATION where COMMUNICATIONID = '" + pCommunicationID + "'")
+ return db.cell("select CONTACT_ID from COMMUNICATION where COMMUNICATIONID = '" + pCommunicationID + "'");
+}
+
+StandardObject.prototype._isOrganisationAddress = function (pAddressID) {
+ var contactID = db.cell("select CONTACTID from CONTACT where ADDRESS_ID = '" + pAddressID + "'");
+
+ if (contactID === "")
+ return false;
+
+ var contactType = ContactUtils.getContactTypeByContactId(contactID);
+
+ return contactType === 1;
}
\ No newline at end of file
--
GitLab
From 185834989045bad644235ba63a22dab5a5b71d91 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 12:33:26 +0100
Subject: [PATCH 092/250] fix object relation display value
---
process/Context_lib/process.js | 47 ++++++++++++++++++++++------------
1 file changed, 31 insertions(+), 16 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 7eee3571db..360093c033 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -108,31 +108,38 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId,
- // nameField,
- // Tablename (or from-part inc, joins),
- // IDField,
- // RelationField,
- // CreationDate override Tablename (needed if Tablename is a join clause)
-
+ // contextId: [
+ // nameField, 0
+ // Tablename, 1
+ // joins (if needed), 2
+ // IDField, 3
+ // RelationField, 4
+ // CreationDate, 5
+ // override Tablename (needed if Tablename is a join clause) 6
+ // ]
+ //
// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
"Organisation": [
"\"NAME\"",
"ORGANISATION",
+ "",
"ORGANISATIONID",
"",
""
],
"Person": [
(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()),
- "PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ",
+ "PERSON",
+ " join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ",
"CONTACTID",
"CONTACT",
- ""
+ "",
+ "CONTACT"
],
"Activity": [
"SUBJECT",
"ACTIVITY",
+ "",
"ACTIVITYID",
"",
""
@@ -146,6 +153,7 @@ ContextUtils._getSelectMap = function()
"PROJECTTITLE"
], "", false),
"SALESPROJECT",
+ "",
"SALESPROJECTID",
"CONTACT_ID",
"STARTDATE"
@@ -156,6 +164,7 @@ ContextUtils._getSelectMap = function()
maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10)
], " "),
"CONTRACT",
+ "",
"CONTRACTID",
"CONTACT_ID",
"CONTRACTSTART"
@@ -169,6 +178,7 @@ ContextUtils._getSelectMap = function()
maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
], "", false),
"OFFER",
+ "",
"OFFERID",
"CONTACT_ID",
"OFFERDATE"
@@ -182,6 +192,7 @@ ContextUtils._getSelectMap = function()
maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
], "", false),
"SALESORDER",
+ "",
"SALESORDERID",
"CONTACT_ID",
"ORDERDATE"
@@ -193,6 +204,7 @@ ContextUtils._getSelectMap = function()
"PRODUCTNAME"
], "", false),
"PRODUCT",
+ "",
"PRODUCTID",
"",
""
@@ -200,6 +212,7 @@ ContextUtils._getSelectMap = function()
"Task": [
"SUBJECT",
"TASK",
+ "",
"TASKID",
translate.text("Task"),
"",
@@ -210,8 +223,8 @@ ContextUtils._getSelectMap = function()
ContextUtils.getFieldTitle = function(pContextId, pDefault)
{
- if (ContextUtils._getSelectMap()[pContextId] != undefined && ContextUtils._getSelectMap()[pContextId].length >= 3)
- return ContextUtils._getSelectMap()[pContextId][3];
+ if (ContextUtils._getSelectMap()[pContextId] != undefined && ContextUtils._getSelectMap()[pContextId].length >= 4)
+ return ContextUtils._getSelectMap()[pContextId][4];
return pDefault;
}
@@ -227,7 +240,7 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
var selectMap = ContextUtils._getSelectMap()
for (let contextId in selectMap)
{
- select += "when '" + contextId + "' then (select " + selectMap[contextId][0] + " from " + selectMap[contextId][1] + (pRowIdDbField ? " where " + selectMap[contextId][2] + " = " + pRowIdDbField : " ") + ") ";
+ select += "when '" + contextId + "' then (select " + selectMap[contextId][0] + " from " + selectMap[contextId][1] + " " + selectMap[contextId][2] + (pRowIdDbField ? " where " + selectMap[contextId][3] + " = " + pRowIdDbField : " ") + ") ";
}
select += "else 'Not defined in ContextUtils.getNameSql()!'";
@@ -243,7 +256,9 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
{
var selectMap = ContextUtils._getSelectMap()
if (selectMap[pContextId] != undefined)
- return SqlCondition.begin().andPrepare((selectMap[pContextId][4] ? selectMap[pContextId][4] : selectMap[pContextId][1]) + "." + selectMap[pContextId][2], pRowId).buildSql("select " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=2");
+ {
+ return SqlCondition.begin().andPrepare((selectMap[pContextId][6] ? selectMap[pContextId][6] : selectMap[pContextId][1]) + "." + selectMap[pContextId][3], pRowId).buildSql("select " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1] + " " + selectMap[pContextId][2], "1=2");
+ }
else
return "select 1 from person where 1=2";
}
@@ -257,12 +272,12 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate)
var cond = SqlCondition.begin();
if (pRowId)
{
- cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][3], pRowId)
+ cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][4], pRowId)
}
var dateColumn = "";
if (pWithDate === true)
- dateColumn = ", " + selectMap[pContextId][4];
+ dateColumn = ", " + selectMap[pContextId][6];
- return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + dateColumn + " from " + selectMap[pContextId][1], "1=1");
+ return cond.buildSql("select " + selectMap[pContextId][3] + ", " + selectMap[pContextId][0] + dateColumn + " from " + selectMap[pContextId][1] + " " + selectMap[pContextId][2], "1=1");
}
--
GitLab
From 8be4178181ddd8b3dc418546578dbc26fe351764 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 13:46:15 +0100
Subject: [PATCH 093/250] Offer Currency auf mandatory setzen
---
entity/Offer_entity/Offer_entity.aod | 1 +
1 file changed, 1 insertion(+)
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index ff52a60e35..381b03b869 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -15,6 +15,7 @@
<name>CURRENCY</name>
<title>Currency</title>
<consumer>KeywordCurrencies</consumer>
+ <mandatory v="true" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
</entityField>
--
GitLab
From d495fcbcb1f70eb6d6de24abb1f439ea80c3cf57 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 27 Mar 2019 13:56:44 +0100
Subject: [PATCH 094/250] AttributeRelation Tree
---
entity/Activity_entity/Activity_entity.aod | 22 +++++
.../objectrowid_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
.../AttributeRelationTree_entity.aod | 84 +++++++++++++++++++
.../recordcontainers/jdito/contentProcess.js | 44 ++++++++++
.../AttributeRelation_entity.aod | 11 ++-
entity/Contract_entity/Contract_entity.aod | 22 +++++
.../objectrowid_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
entity/Offer_entity/Offer_entity.aod | 22 +++++
.../objectrowid_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
.../Organisation_entity.aod | 23 +++++
.../objectrowid_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
entity/Person_entity/Person_entity.aod | 22 +++++
.../objectrowid_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
entity/Product_entity/Product_entity.aod | 22 +++++
.../objectrowid_param/valueProcess.js | 5 ++
.../children/objecttype_param/valueProcess.js | 4 +
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 +
.../AttributeRelationTree.aod | 12 +++
.../ActivityMain_view/ActivityMain_view.aod | 5 ++
.../AttributeRelationFilter_view.aod | 13 +--
.../AttributeRelationTree_view.aod | 39 ++++-----
.../ContractMain_view/ContractMain_view.aod | 5 ++
neonView/OfferMain_view/OfferMain_view.aod | 5 ++
.../OrganisationMain_view.aod | 5 ++
neonView/PersonMain_view/PersonMain_view.aod | 5 ++
.../ProductMain_view/ProductMain_view.aod | 5 ++
process/Attribute_lib/process.js | 21 +++--
32 files changed, 398 insertions(+), 42 deletions(-)
create mode 100644 entity/Activity_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
create mode 100644 entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
create mode 100644 entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
create mode 100644 entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
create mode 100644 entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
create mode 100644 entity/Product_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
create mode 100644 neonContext/AttributeRelationTree/AttributeRelationTree.aod
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 3f998199e7..ce3be16107 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -391,6 +391,28 @@
<documentation>%aditoprj%/entity/Activity_entity/entityfields/presetlinks_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Activity_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..6717e012d6
--- /dev/null
+++ b/entity/Activity_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..431bcc9521
--- /dev/null
+++ b/entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
new file mode 100644
index 0000000000..12f10e91e6
--- /dev/null
+++ b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
@@ -0,0 +1,84 @@
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>AttributeRelationTree_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>PARENT_ID</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>TreeProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>PARENT_ID.value</element>
+ <element>TITLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..e6b4f8a517
--- /dev/null
+++ b/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,44 @@
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Attribute_lib");
+import("Sql_lib");
+
+var objectType = vars.get("$param.ObjectType_param");
+var rowId = vars.get("$param.ObjectRowId_param");
+var attributeObj = {};
+var allAttributes = [];
+var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_LEVEL from AB_ATTRIBUTE";
+
+var attributeValues = AttributeRelationUtils.getAllAttributes(rowId, objectType, false, true);
+
+_fetchAttributes(attributeValues.map(function (row) {return row[1]}));
+
+allAttributes = allAttributes
+ .sort(function (a, b) {return a[3] - b[3];}) //sort by level to make sure parents are added first
+ .map(function (row) {return [row[0], row[1], row[2]];}) //remove level from array
+ .concat(attributeValues);
+result.object(allAttributes);
+
+function _fetchAttributes (pAttributeIds)
+{
+ var condition = SqlCondition.begin();
+ var nextIds = [];
+ pAttributeIds.forEach(function (id)
+ {
+ if (!(id in this))
+ condition.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
+ }, attributeObj);
+ db.table(condition.buildSql(sqlSelect, "1=2"))
+ .forEach(function (row)
+ {
+ this[row[0]] = true;
+ if (row[1])
+ nextIds.push(row[1]);
+ else
+ row[1] = null;
+ allAttributes.push(row);
+ }, attributeObj);
+ if (nextIds.length)
+ _fetchAttributes(nextIds);
+}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index f4ad545d26..73827d2c93 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -11,6 +11,7 @@
</entityProvider>
<entityField>
<name>AB_ATTRIBUTERELATIONID</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -25,11 +26,13 @@
<entityField>
<name>OBJECT_ROWID</name>
<mandatory v="true" />
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
<mandatory v="true" />
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -46,6 +49,7 @@
<entityField>
<name>CHAR_VALUE</name>
<mandatory v="false" />
+ <searchable v="false" />
</entityField>
<entityProvider>
<name>RelationsForSpecificObject</name>
@@ -105,11 +109,13 @@
<entityField>
<name>DATE_VALUE</name>
<contentType>DATE</contentType>
+ <searchable v="false" />
<state>EDITABLE</state>
</entityField>
<entityField>
<name>NUMBER_VALUE</name>
<contentType>NUMBER</contentType>
+ <searchable v="false" />
<state>EDITABLE</state>
</entityField>
<entityParameter>
@@ -120,16 +126,18 @@
<entityField>
<name>BOOL_VALUE</name>
<contentType>BOOLEAN</contentType>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ID_VALUE</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>ATTRIBUTE_PARENT_ID</name>
<title>Superordinate Attribute</title>
<possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js</possibleItemsProcess>
- <groupable v="true" />
+ <searchable v="false" />
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
@@ -155,6 +163,7 @@
</entityConsumer>
<entityField>
<name>MEMO_VALUE</name>
+ <searchable v="false" />
</entityField>
<entityParameter>
<name>FilteredAttributeIds_param</name>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index f50f874903..0e8b88c748 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -300,6 +300,28 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..1dc63e18db
--- /dev/null
+++ b/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTRACTID"));
diff --git a/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..431bcc9521
--- /dev/null
+++ b/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 381b03b869..d1ed432323 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -636,6 +636,28 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..4adebe4edf
--- /dev/null
+++ b/entity/Offer_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.OFFERID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..431bcc9521
--- /dev/null
+++ b/entity/Offer_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 90e490097c..71a1654983 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -398,6 +398,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
+ <title></title>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
</entityParameter>
@@ -721,6 +722,28 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..957f645b37
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..431bcc9521
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index b8b639094d..3772446a2f 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -781,6 +781,28 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..07081dc34f
--- /dev/null
+++ b/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PERSONID"));
diff --git a/entity/Person_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Person_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..431bcc9521
--- /dev/null
+++ b/entity/Person_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index cd11c3d2bc..481c5df54c 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -404,6 +404,28 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Product_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..60b7269a1b
--- /dev/null
+++ b/entity/Product_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(vars.get("$field.PRODUCTID"));
diff --git a/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..431bcc9521
--- /dev/null
+++ b/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 7b30b805b9..4e36c06524 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -359,6 +359,10 @@
<key>Touchpoints</key>
<value>Kontaktpunkte</value>
</entry>
+ <entry>
+ <key>Attribute Tree</key>
+ <value>Eigenschaftsbaum</value>
+ </entry>
<entry>
<key>Company Addresses</key>
<value>Firmenadressen</value>
diff --git a/neonContext/AttributeRelationTree/AttributeRelationTree.aod b/neonContext/AttributeRelationTree/AttributeRelationTree.aod
new file mode 100644
index 0000000000..bcd7bec8f8
--- /dev/null
+++ b/neonContext/AttributeRelationTree/AttributeRelationTree.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>AttributeRelationTree</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>AttributeRelationTree_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>55f89863-72b0-4179-8494-b1e320d79de9</name>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index eb9974e40d..af453fbc92 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -39,5 +39,10 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>f57fb116-d356-47c7-8da6-ee64b4a01b46</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index d655cdd2da..3a0762d98f 100644
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
@@ -5,9 +5,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
- <groupLayout>
+ <boxLayout>
<name>layout</name>
- </groupLayout>
+ </boxLayout>
</layout>
<children>
<tableViewTemplate>
@@ -25,14 +25,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treetableViewTemplate>
- <name>RelationsTreetable</name>
- <titleField>valueProxy</titleField>
- <defaultGroupFields>
- <element>ATTRIBUTE_PARENT_ID</element>
- <element>AB_ATTRIBUTE_ID</element>
- </defaultGroupFields>
- <entityField>#ENTITY</entityField>
- </treetableViewTemplate>
</children>
</neonView>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index b1cd03b35f..cdb9d96720 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -1,21 +1,18 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>AttributeRelationTree_view</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <groupLayout>
- <name>layout</name>
- </groupLayout>
- </layout>
- <children>
- <treetableViewTemplate>
- <name>Treetable</name>
- <titleField>AB_ATTRIBUTE_ID</titleField>
- <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </treetableViewTemplate>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>AttributeRelationTree_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treetableViewTemplate>
+ <name>AttributeRelationTree</name>
+ <parentField>PARENT_ID</parentField>
+ <titleField>TITLE</titleField>
+ <entityField>#ENTITY</entityField>
+ </treetableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ContractMain_view/ContractMain_view.aod b/neonView/ContractMain_view/ContractMain_view.aod
index 3ceece9059..a40e7c73b8 100644
--- a/neonView/ContractMain_view/ContractMain_view.aod
+++ b/neonView/ContractMain_view/ContractMain_view.aod
@@ -29,5 +29,10 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>940f0dca-aee3-4af6-ae50-9334964ce414</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index 5acba02e0c..bd7a35f5f6 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -44,5 +44,10 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e1554e33-710f-4bb5-a345-953c15985ca4</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 3e7ccf4980..a8dde5ffe1 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -60,5 +60,10 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ba50e069-06da-440e-b04a-5a686fcf5303</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index afe8033aee..6ab7d40c76 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -49,6 +49,11 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
<neonViewReference>
<name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
<entityField>OtherContacts</entityField>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 7ac4a87c4d..28de5da816 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -49,5 +49,10 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>6ee1258f-b571-45c1-b833-f292361b5a04</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 6614f1c741..08b0fba8f9 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -199,17 +199,18 @@ AttributeRelationUtils.getAttribute = function (pAttributeId, pObjectRowId, pObj
* @param {String} pObjectRowId object rowid
* @param {String} [pObjectType=null] object-type
* @param {String} [pResolveNames=false] if true the full attribute names are used instead of the ids
+ * @param {String} [pGetUID=false] include the attributeRelation id
*
- * @return {String[][]} two-dimensional array a row is [attributeId|attributeName, value]
+ * @return {String[][]} two-dimensional array a row is [attributeId|attributeName, value] or if pGetUID is true, [attriuteRelationId, attributeId|attributeName, value]
*/
-AttributeRelationUtils.getAllAttributes = function (pObjectRowId, pObjectType, pResolveNames)
+AttributeRelationUtils.getAllAttributes = function (pObjectRowId, pObjectType, pResolveNames, pGetUID)
{
var attrCond = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId);
if (pObjectType != null)
- attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pAttributeId);
+ attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType);
- var attributeSql = attrCond.buildSql("select AB_ATTRIBUTE_ID, AB_ATTRIBUTE.ATTRIBUTE_TYPE, AB_ATTRIBUTE.KEYWORD_CONTAINER, COMBOVAL.ATTRIBUTE_NAME, "
+ var attributeSql = attrCond.buildSql("select AB_ATTRIBUTERELATIONID, AB_ATTRIBUTE_ID, AB_ATTRIBUTE.ATTRIBUTE_TYPE, AB_ATTRIBUTE.KEYWORD_CONTAINER, COMBOVAL.ATTRIBUTE_NAME, "
+ AttributeTypeUtil.getAllDatabaseFields().join(", ")
+ " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
+ " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID");
@@ -217,7 +218,7 @@ AttributeRelationUtils.getAllAttributes = function (pObjectRowId, pObjectType, p
var attributeNameMap = {};
var attributeValues = db.table(attributeSql).map(function (row)
{
- let attribute = row[0];
+ let attribute = row[1];
if (pResolveNames)
{
if (!(attribute in attributeNameMap))
@@ -225,13 +226,15 @@ AttributeRelationUtils.getAllAttributes = function (pObjectRowId, pObjectType, p
attribute = attributeNameMap[attribute];
}
let value;
- if (row[1].trim() == $AttributeTypes.COMBO)
- value = row[3];
+ if (row[2].trim() == $AttributeTypes.COMBO)
+ value = row[4];
else
{
- value = row[AttributeTypeUtil.getTypeColumnIndex(row[1]) + 4];
- value = AttributeTypeUtil.getAttributeViewValue(row[1].trim(), value, row[2]);
+ value = row[AttributeTypeUtil.getTypeColumnIndex(row[2]) + 5];
+ value = AttributeTypeUtil.getAttributeViewValue(row[2].trim(), value, row[3]);
}
+ if (pGetUID)
+ return [row[0], attribute, value];
return [attribute, value];
});
--
GitLab
From 93d6d04b7468969d391ba596d1c3210f09c62f77 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 14:05:08 +0100
Subject: [PATCH 095/250] Offer fixes
---
.../currency/displayValueProcess.js | 6 +-----
.../entityfields/currency/valueProcess.js | 17 +++++++++++------
.../entityfields/language/valueProcess.js | 17 +++++++++++------
.../entityfields/status/valueProcess.js | 2 +-
.../AditoBasic/init_SalesprojectState.xml | 10 ----------
.../AditoBasic/insert_offer_status_keyword.xml | 14 ++++++++++++++
.../data_alias/basic/2019.2/changelog.xml | 1 +
.../_____PREFERENCES_PROJECT.aod | 2 +-
8 files changed, 40 insertions(+), 29 deletions(-)
create mode 100644 others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
diff --git a/entity/Offer_entity/entityfields/currency/displayValueProcess.js b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
index c82efe1955..c82b4d7480 100644
--- a/entity/Offer_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
@@ -3,8 +3,4 @@ import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
-{
- var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$param.OfferCurrency_param"));
- result.string(currency);
-}
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
diff --git a/entity/Offer_entity/entityfields/currency/valueProcess.js b/entity/Offer_entity/entityfields/currency/valueProcess.js
index 636be1adc9..787ece941a 100644
--- a/entity/Offer_entity/entityfields/currency/valueProcess.js
+++ b/entity/Offer_entity/entityfields/currency/valueProcess.js
@@ -1,7 +1,12 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
-{
- result.string(vars.get("$param.OfferCurrency_param"));
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
+{
+ result.string(vars.get("$param.OfferCurrency_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string("EUR");
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/language/valueProcess.js b/entity/Offer_entity/entityfields/language/valueProcess.js
index 4fc924e182..826184267b 100644
--- a/entity/Offer_entity/entityfields/language/valueProcess.js
+++ b/entity/Offer_entity/entityfields/language/valueProcess.js
@@ -1,7 +1,12 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param"))
-{
- result.string(vars.get("$param.OfferLanguage_param"));
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param"))
+{
+ result.string(vars.get("$param.OfferLanguage_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string("deu");
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js
index ea5cc54c96..7d4ed678a4 100644
--- a/entity/Offer_entity/entityfields/status/valueProcess.js
+++ b/entity/Offer_entity/entityfields/status/valueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
import("system.result");
if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
- result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open
\ No newline at end of file
+ result.string("70d27a1b-7233-481d-826f-01a13a4bb0b2"); //Open
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
index ce858a70d0..19c59bfef3 100644
--- a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
@@ -1,16 +1,6 @@
<?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="033b6fcb-53d9-4e23-8c29-4e739294a704">
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="c6eeab06-cec9-42c3-8f11-468c7e602de4"/>
-
- <column name="KEYID" value="25b0ac77-ef92-4809-802e-bb9d8782f865"/>
- <column name="TITLE" value="Open"/>
- <column name="CONTAINER" value="SalesprojectState"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="115495eb-dff4-436d-8114-b9a7644586bf"/>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
new file mode 100644
index 0000000000..91ac25d68c
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
@@ -0,0 +1,14 @@
+<?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="a.veogl" id="3e9548bd-2c3e-413f-a8b0-405d926f2790">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3c734077-8677-4732-86ef-7df01d9646b3"/>
+ <column name="KEYID" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="TITLE" value="Open"/>
+ <column name="CONTAINER" value="OfferStatus"/>
+ <column name="SORTING" valueNumeric="-1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 0020833885..2101a04f63 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -110,4 +110,5 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactPosition.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_AttributeKeyword_target_group.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/insert_offer_status_keyword.xml"/>
</databaseChangeLog>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 2e627c2e51..35430f5089 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>xRM-Basic5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab
From 6aa3f3ac6244e9ff4d478580330552d3f71dd065 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 14:06:34 +0100
Subject: [PATCH 096/250] Offer fixes
---
entity/Offer_entity/Offer_entity.aod | 1 +
.../_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d1ed432323..3d97a5e318 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -78,6 +78,7 @@
<name>STATUS</name>
<title>Status</title>
<consumer>KeywordOfferStates</consumer>
+ <mandatory v="true" />
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 35430f5089..2e627c2e51 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic5</projectName>
+ <projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab
From 114c2eaaff9d9139174c9ecb2369a94e405477f8 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 13:20:47 +0100
Subject: [PATCH 097/250] "new Contact"-action: autoset
private-dummy-organisation
---
entity/Contact_entity/Contact_entity.aod | 1 +
.../entityfields/organisation_id/valueProcess.js | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 entity/Contact_entity/entityfields/organisation_id/valueProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 2cffc73dc9..2525ff9c3b 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -18,6 +18,7 @@
<title>Organisation</title>
<consumer>Organisations</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
diff --git a/entity/Contact_entity/entityfields/organisation_id/valueProcess.js b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
new file mode 100644
index 0000000000..b25ed87f45
--- /dev/null
+++ b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ if(!vars.get("$field.ORGANISATION_ID"))
+ {
+ result.string("0");
+ }
+}
\ No newline at end of file
--
GitLab
From 8a0b5fc01e16777f2f3e71a443e1a0a049aaba37 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 14:30:43 +0100
Subject: [PATCH 098/250] "new Contact" autoset private-dummy-org
---
entity/Contact_entity/Contact_entity.aod | 2 +-
.../entityfields/organisation_id/onValueChange.js | 8 +++++++-
.../entityfields/organisation_id/valueProcess.js | 7 ++-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 2525ff9c3b..1bdf891472 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -17,7 +17,7 @@
<name>ORGANISATION_ID</name>
<title>Organisation</title>
<consumer>Organisations</consumer>
- <mandatory v="true" />
+ <mandatory v="false" />
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
index 0347a3d2d5..80f1e97c87 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
@@ -1,4 +1,10 @@
import("system.vars");
+import("system.neon");
//since the standard address can be only values of org the standard address has to be reset on org change
-vars.set("$field.ADDRESS_ID", "");
\ No newline at end of file
+vars.set("$field.ADDRESS_ID", "");
+
+if(vars.exists("$local.value") && !vars.get("$local.value"))
+{
+ neon.setFieldValue("$field.ORGANISATION_ID", "0");
+}
diff --git a/entity/Contact_entity/entityfields/organisation_id/valueProcess.js b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
index b25ed87f45..008844fbe5 100644
--- a/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
+++ b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
@@ -2,10 +2,7 @@ import("system.result");
import("system.vars");
import("system.neon");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.getString("$field.ORGANISATION_ID") == "")
{
- if(!vars.get("$field.ORGANISATION_ID"))
- {
- result.string("0");
- }
+ result.string("0");
}
\ No newline at end of file
--
GitLab
From c12f13ddceb169dfda759eb2d08f337e10cc6717 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 27 Mar 2019 14:39:18 +0100
Subject: [PATCH 099/250] fix: translation error
---
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 3 +++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 2 +-
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 127eb4ad15..98c287637d 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2640,6 +2640,9 @@
<entry>
<key>Partner</key>
</entry>
+ <entry>
+ <key>Attribute Tree</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 4e36c06524..27404711b5 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -56,7 +56,7 @@
</entry>
<entry>
<key>This combination of person and organisation does already exist and can not be created once more.</key>
- <value>Diese Kombination aus Person und Organisation existiert bereits und kann daher nicht nocht ein mal angelegt werden.</value>
+ <value>Diese Kombination aus Person und Organisation existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
</entry>
<entry>
<key>Communication data</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ccf5eb9707..ecc338f3c5 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2665,6 +2665,9 @@
<entry>
<key>Partner</key>
</entry>
+ <entry>
+ <key>Attribute Tree</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From def8a060495accf67de8c737790a7198620056a2 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 14:50:13 +0100
Subject: [PATCH 100/250] Salesproject fixes
---
.../entityfields/state/valueProcess.js | 12 ++++++------
.../AditoBasic/insert_offer_status_keyword.xml | 2 +-
.../insert_salesproject_state_keyword.xml | 14 ++++++++++++++
.../SalesProjectState.xml | 4 ++--
.../data_alias/basic/2019.2/changelog.xml | 1 +
5 files changed, 24 insertions(+), 9 deletions(-)
create mode 100644 others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
diff --git a/entity/Salesproject_entity/entityfields/state/valueProcess.js b/entity/Salesproject_entity/entityfields/state/valueProcess.js
index 1ca1654d0c..1bfcc5d651 100644
--- a/entity/Salesproject_entity/entityfields/state/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/state/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
- result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open
\ No newline at end of file
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712"); //Open
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
index 91ac25d68c..4fd7389268 100644
--- a/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
@@ -1,6 +1,6 @@
<?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="a.veogl" id="3e9548bd-2c3e-413f-a8b0-405d926f2790">
+ <changeSet author="j.hoermann" id="3e9548bd-2c3e-413f-a8b0-405d926f2790">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3c734077-8677-4732-86ef-7df01d9646b3"/>
<column name="KEYID" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
new file mode 100644
index 0000000000..ba9ff8eaba
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
@@ -0,0 +1,14 @@
+<?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.hoermann" id="cfe5294c-5f89-4527-bd1d-ebe9d0597f63">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b0123a07-0d21-4365-9aa2-c8be18c56141"/>
+ <column name="KEYID" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="TITLE" value="Open"/>
+ <column name="CONTAINER" value="SalesprojectState"/>
+ <column name="SORTING" valueNumeric="-1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
index 2d71ed0384..579f8bdd2c 100644
--- a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
+++ b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
@@ -6,7 +6,7 @@
<column name="STATE" type="CHAR(36)"/>
</addColumn>
<update tableName="SALESPROJECT">
- <column name="STATE" value="25b0ac77-ef92-4809-802e-bb9d8782f865"/>
+ <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
<where>STATE_OLD = 1</where>
</update>
<update tableName="SALESPROJECT">
@@ -38,7 +38,7 @@
</addColumn>
<update tableName="SALESPROJECT">
<column name="STATE" valueNumeric="1"/>
- <where>STATE_OLD = '25b0ac77-ef92-4809-802e-bb9d8782f865'</where>
+ <where>STATE_OLD = '483bcaeb-1e5b-4772-b54e-7d7d8aa65712'</where>
</update>
<update tableName="SALESPROJECT">
<column name="STATE" valueNumeric="2"/>
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 2101a04f63..c2b63b678f 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -111,4 +111,5 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_AttributeKeyword_target_group.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/insert_offer_status_keyword.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/insert_salesproject_state_keyword.xml"/>
</databaseChangeLog>
--
GitLab
From d69ca60ff53043280251de37a9a6115490d21973 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Mar 2019 16:16:53 +0100
Subject: [PATCH 101/250] fix
---
entity/Activity_entity/Activity_entity.aod | 1 -
1 file changed, 1 deletion(-)
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index ce3be16107..14c3e72c83 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -20,7 +20,6 @@
<name>ENTRYDATE</name>
<title>Entrydate</title>
<contentType>DATE</contentType>
- <resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
--
GitLab
From 848cc08add2459fbd297e05e09643bcbeeb4aae5 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 27 Mar 2019 16:20:52 +0100
Subject: [PATCH 102/250] Vertriebsproject: REASONS / Liste
---
.../Salesproject_entity.aod | 12 +-
.../reasons/displayValueProcess.js | 6 -
.../reasons/possibleItemsProcess.js | 6 +
.../entityfields/reasons/valueProcess.js | 11 --
.../reasons.displayvalue/expression.js | 7 -
.../SalesprojectPreview_view.aod | 182 +++++++++---------
process/Keyword_lib/process.js | 23 +++
7 files changed, 125 insertions(+), 122 deletions(-)
delete mode 100644 entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js
delete mode 100644 entity/Salesproject_entity/entityfields/reasons/valueProcess.js
delete mode 100644 entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/reasons.displayvalue/expression.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 17fe6bc790..f3c63dd2c8 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -453,13 +453,15 @@
<entityField>
<name>REASONS</name>
<title>Reason</title>
- <consumer>KeywordWonLost</consumer>
<mandatoryProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/mandatoryProcess.js</mandatoryProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="true" />
<selectionMode>MULTI</selectionMode>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
</entityField>
<entityProvider>
<name>Salesprojects</name>
@@ -597,10 +599,6 @@
<name>PHASE.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REASONS.displayValue</name>
- <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/reasons.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REASONS.value</name>
<recordfield>SALESPROJECT.REASONS</recordfield>
diff --git a/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js b/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js
deleted file mode 100644
index deb08ee453..0000000000
--- a/entity/Salesproject_entity/entityfields/reasons/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectWonLost(), vars.get("$field.REASONS")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js
new file mode 100644
index 0000000000..82ceaf9374
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js
@@ -0,0 +1,6 @@
+import("system.logging");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.object(KeywordUtils.getEntryNamesAndIdsByContainer("SalesprojectWonLost"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/reasons/valueProcess.js b/entity/Salesproject_entity/entityfields/reasons/valueProcess.js
deleted file mode 100644
index 44b96c75cb..0000000000
--- a/entity/Salesproject_entity/entityfields/reasons/valueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- // IDs: SalesprojectState Order and Lost
- var state = vars.get("$field.STATE");
- if(state && (state != 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd' && state != '130bb53a-a97e-455e-8f34-8d445e985474'))
- result.string("");
-}
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/reasons.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/reasons.displayvalue/expression.js
deleted file mode 100644
index c62430bd64..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/reasons.displayvalue/expression.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-import("Sql_lib");
-
-var value = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWonLost(), "SALESPROJECT.REASONS");
-result.string(value);
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 44cadc8a7c..315544ca5c 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,91 +1,91 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>SalesprojectPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Head</name>
- <iconField>IMAGE</iconField>
- <titleField>PROJECTTITLE</titleField>
- <descriptionField>PROJECTCODE</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
- <entityField>RELATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
- <entityField>STATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
- <entityField>REASONS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
- <entityField>PHASE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
- <entityField>STARTDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
- <entityField>ENDDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
- <entityField>PROBABILITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
- <entityField>VOLUME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
- <entityField>TIMETRACKINGSUM</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Further informations</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- <scoreCardViewTemplate>
- <name>AdditionalInfo</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>79490331-6be4-422f-9450-da0db56f0654</name>
- <entityField>DAYS_NOTACTIVE</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>SalesprojectPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Head</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PROJECTTITLE</titleField>
+ <descriptionField>PROJECTCODE</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
+ <entityField>RELATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
+ <entityField>STATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
+ <entityField>REASONS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
+ <entityField>STARTDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
+ <entityField>ENDDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
+ <entityField>PROBABILITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
+ <entityField>VOLUME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
+ <entityField>TIMETRACKINGSUM</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Further informations</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <scoreCardViewTemplate>
+ <name>AdditionalInfo</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>79490331-6be4-422f-9450-da0db56f0654</name>
+ <entityField>DAYS_NOTACTIVE</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 12fee921f9..a4527c2594 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.SQLTYPES");
import("system.db");
@@ -166,6 +167,28 @@ KeywordUtils.getEntryNamesByContainer = function(pContainerName)
return list;
};
+
+/**
+* provides a translated list of keyword-entry-titles and its ids in the system filtered by a containerName;
+* usefull for lists where the key is the name which is then a editable displayValue
+*
+* @param {String} pContainerName name of the keyword container for filtering
+*
+* @return {String[]} translated titles as 1D-Array
+*/
+KeywordUtils.getEntryNamesAndIdsByContainer = function(pContainerName)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName)
+ .buildSql("select AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", null, "order by AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
+
+ var list = db.table(sql);
+ for(var i = 0; i<list.length; i = i + 1)
+ list[i][1] = translate.text(list[i][1]);
+
+ return list;
+};
+
/**
* object that provides featrues for a single keyword attribute; initalizes itself on creation with a specific keyword-attribute
*
--
GitLab
From 4fa901db94cdd02f7dbae5764785631c1fd636f9 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 27 Mar 2019 16:29:49 +0100
Subject: [PATCH 103/250] Parent attribute editable
---
.../valueproxy/possibleItemsProcess.js | 2 +-
entity/Attribute_entity/Attribute_entity.aod | 40 +++++++++++++++++--
.../attribute_parent_id/onValueChange.js | 38 ++++++++++++++++++
.../attribute_parent_id/stateProcess.js | 7 ++--
.../attrparentid_param/valueProcess.js | 4 ++
.../children/getgroups_param/valueProcess.js | 3 ++
.../children/getgroups_param/valueProcess.js | 5 ---
.../recordcontainers/db/conditionProcess.js | 4 ++
.../recordcontainers/db/orderClauseProcess.js | 5 ++-
9 files changed, 95 insertions(+), 13 deletions(-)
create mode 100644 entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js
create mode 100644 entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js
create mode 100644 entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js
delete mode 100644 entity/Attribute_entity/entityfields/attributeparent/children/getgroups_param/valueProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
index 48d4fad4dd..4a7f1e46ed 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
@@ -14,7 +14,7 @@ if (attrType == $AttributeTypes.COMBO)
.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1")
.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
- .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE");
+ .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE", "1=2", "order by ATTRIBUTE_NAME");
var valueList = db.table(valueSql);
result.object(valueList);
}
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index ead7f6425a..a658dcc50f 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -36,12 +36,17 @@
<entityField>
<name>ATTRIBUTE_PARENT_ID</name>
<title>Superordinate Attribute</title>
- <consumer>AttributeChildren</consumer>
+ <consumer>AttributeGroup</consumer>
<linkedContext>Attribute</linkedContext>
<searchable v="false" />
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
</entityField>
<entityConsumer>
<name>AttributeChildren</name>
@@ -90,8 +95,6 @@
</entityParameter>
<entityParameter>
<name>GetGroups_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeparent/children/getgroups_param/valueProcess.js</valueProcess>
- <expose v="true" />
</entityParameter>
</children>
</entityProvider>
@@ -243,6 +246,37 @@
<title>Name</title>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/name_with_type/valueProcess.js</valueProcess>
</entityField>
+ <entityProvider>
+ <name>AttributeGroups</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>GetGroups_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>AttributeGroup</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeGroups</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AttrParentId_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js b/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js
new file mode 100644
index 0000000000..06db0b11a5
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js
@@ -0,0 +1,38 @@
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var level = 0;
+ if (vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+ {
+ level = db.cell(SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$field.ATTRIBUTE_PARENT_ID"))
+ .buildSql("select ATTRIBUTE_LEVEL from AB_ATTRIBUTE"));
+ level = parseInt(level) + 1;
+ }
+ neon.setFieldValue("$field.ATTRIBUTE_LEVEL", level);
+
+ var table = "AB_ATTRIBUTE";
+ var columns = ["ATTRIBUTE_LEVEL"];
+ var types = db.getColumnTypes(table, columns);
+ var toUpdate = [];
+
+ var attributes = [vars.get("$field.AB_ATTRIBUTEID")];
+ while (attributes.length > 0)
+ {
+ var condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')");
+
+ toUpdate.push([table, columns, types, [String(++level)], condition.build()]);
+
+ attributes = db.array(db.COLUMN, SqlCondition.begin()
+ .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
+ .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
+ );
+ }
+
+ db.updates(toUpdate);
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
index 11f1cb9940..cac55643fb 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
@@ -1,11 +1,12 @@
import("system.result");
import("system.neon");
import("system.vars");
+import("Attribute_lib");
var fieldState;
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- fieldState = neon.COMPONENTSTATE_AUTO;
-else
+if(vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.COMBOVALUE)
fieldState = neon.COMPONENTSTATE_READONLY;
+else
+ fieldState = neon.COMPONENTSTATE_AUTO;
result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js
new file mode 100644
index 0000000000..033bf9a666
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.AB_ATTRIBUTEID"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js
new file mode 100644
index 0000000000..28d4124c73
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributeparent/children/getgroups_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributeparent/children/getgroups_param/valueProcess.js
deleted file mode 100644
index 289c6a9357..0000000000
--- a/entity/Attribute_entity/entityfields/attributeparent/children/getgroups_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || "");
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
index 1a30105397..ed323a5c82 100644
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
@@ -10,8 +10,12 @@ var getGroups = vars.exists("$param.GetGroups_param") && vars.get("$param.GetGro
var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
if (getGroups)
{
+ //this is for the selection of the superordinate attribute, this condition
+ //filters out the own id and the children to prevent loops
condition = db.translateCondition(SqlCondition.begin()
.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP)
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$param.AttrParentId_param", "# != ?")
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID not in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')")
.build());
}
else if (objectType) //if there's an objectType, it comes from the AttributeRelation entity
diff --git a/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js b/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js
index 4b14378884..003688a8bb 100644
--- a/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js
@@ -1,3 +1,6 @@
import("system.db");
import("system.result");
-result.object({"AB_ATTRIBUTE.ATTRIBUTE_LEVEL" : db.ASCENDING});
\ No newline at end of file
+result.object({
+ "AB_ATTRIBUTE.ATTRIBUTE_LEVEL" : db.ASCENDING,
+ "AB_ATTRIBUTE.ATTRIBUTE_NAME" : db.ASCENDING
+});
\ No newline at end of file
--
GitLab
From 3aa39a44d10c7ba846f248b945ddc37c2409fd72 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Wed, 27 Mar 2019 17:55:36 +0100
Subject: [PATCH 104/250] fix neon.refresh Error
---
entity/Offeritem_entity/afterOperatingState.js | 5 +++++
entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js | 2 --
entity/Orderitem_entity/afterOperatingState.js | 5 +++++
entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js | 2 --
entity/Salesproject_entity/Salesproject_entity.aod | 1 +
entity/Salesproject_entity/afterOperatingState.js | 6 ++++++
.../Salesproject_entity/recordcontainers/db/onDBUpdate.js | 2 --
7 files changed, 17 insertions(+), 6 deletions(-)
create mode 100644 entity/Salesproject_entity/afterOperatingState.js
diff --git a/entity/Offeritem_entity/afterOperatingState.js b/entity/Offeritem_entity/afterOperatingState.js
index 8a21849b42..7366887b46 100644
--- a/entity/Offeritem_entity/afterOperatingState.js
+++ b/entity/Offeritem_entity/afterOperatingState.js
@@ -9,4 +9,9 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
vars.set("$field.ITEMSORT", oiUtils.getNextItemSort());
vars.set("$field.ITEMPOSITION", oiUtils.getNextItemPosition(vars.get("$field.ASSIGNEDTO")));
+}
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+{
+ neon.refresh();
}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
index 8c333d3d4b..01bec1734b 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
@@ -11,6 +11,4 @@ if(oid != "")
var oiUtils = new OfferItemUtils(oid);
db.updateData("OFFER", cols, null, oiUtils.getNetAndVat(), SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
-
- neon.refresh();
}
\ No newline at end of file
diff --git a/entity/Orderitem_entity/afterOperatingState.js b/entity/Orderitem_entity/afterOperatingState.js
index 772a17c62f..2fae7948cd 100644
--- a/entity/Orderitem_entity/afterOperatingState.js
+++ b/entity/Orderitem_entity/afterOperatingState.js
@@ -11,4 +11,9 @@ if(opState == neon.OPERATINGSTATE_NEW)
vars.set("$field.ITEMSORT", oiUtils.getNextItemSort());
vars.set("$field.ITEMPOSITION", oiUtils.getNextItemPosition(vars.get("$field.ASSIGNEDTO")));
+}
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+{
+ neon.refresh();
}
\ No newline at end of file
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
index cd1ddcfae6..355f0cc560 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
@@ -12,6 +12,4 @@ if(oid != "")
var vals = oiUtils.getNetAndVat();
db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", oid, "1 = 2"));
-
- neon.refresh();
}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index f3c63dd2c8..b5e35dc2ed 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -3,6 +3,7 @@
<name>Salesproject_entity</name>
<title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
<iconId>VAADIN:BOOK_DOLLAR</iconId>
<titleProcess>%aditoprj%/entity/Salesproject_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
diff --git a/entity/Salesproject_entity/afterOperatingState.js b/entity/Salesproject_entity/afterOperatingState.js
new file mode 100644
index 0000000000..fb90fb67eb
--- /dev/null
+++ b/entity/Salesproject_entity/afterOperatingState.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.neon");
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+{
+ neon.refresh();
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index b27fe64038..2d558ee7cd 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -68,8 +68,6 @@ vars.get("$local.changed").forEach(function(fieldName) {
if (needToUpdateForecast)
Salesproject.notifyToUpdateForecast();
-neon.refresh()
-
function _updateReasons()
{
var reasons = vars.getString("field.REASONS");
--
GitLab
From 62521ecae5e59ada5ab099876ff06477654bfc72 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Wed, 27 Mar 2019 18:47:40 +0100
Subject: [PATCH 105/250] 360 degree with active filter
---
entity/360Degree_entity/360Degree_entity.aod | 9 +++
.../active/possibleItemsProcess.js | 5 ++
.../recordcontainers/jdito/contentProcess.js | 23 +++++-
.../recordcontainers/jdito/contentProcess.js | 4 +-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 ++
process/Context_lib/process.js | 79 ++++++++++++++-----
6 files changed, 107 insertions(+), 21 deletions(-)
create mode 100644 entity/360Degree_entity/entityfields/active/possibleItemsProcess.js
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 13f96a0d0a..e4fe44ea79 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -127,6 +127,14 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>ACTIVE</name>
+ <title>Active</title>
+ <contentType>TEXT</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/360Degree_entity/entityfields/active/possibleItemsProcess.js</possibleItemsProcess>
+ <searchable v="true" />
+ <groupable v="true" />
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -139,6 +147,7 @@
<element>TARGET_CONTEXT.value</element>
<element>TITLE.value</element>
<element>DATE.value</element>
+ <element>ACTIVE.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/360Degree_entity/entityfields/active/possibleItemsProcess.js b/entity/360Degree_entity/entityfields/active/possibleItemsProcess.js
new file mode 100644
index 0000000000..7eff15173e
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/active/possibleItemsProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+result.object([["true", translate.text("True")], ["false",translate.text("False")]]);
\ No newline at end of file
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index f85cd0bacf..d1f2147962 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -4,14 +4,30 @@ import("system.db");
import("system.vars");
import("system.result");
import("Context_lib");
+import("system.translate");
var resultList = [];
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
{
+
+ var active;
+ if(vars.exists("$local.filter") && vars.get("$local.filter") )
+ {
+ var filter = JSON.parse(vars.getString("$local.filter"));
+ if(filter.childs != null && filter.childs.length > 0)
+ {
+ filter.childs.forEach(function(child)
+ {
+ if(child.name === "ACTIVE")
+ active = JSON.parse(child.key);
+ });
+ }
+ }
+
var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
contextList.forEach(function (context)
{
- var data = db.table(ContextUtils.getContextDataSql(context, vars.get("$param.ObjectRowId_param"), true));
+ var data = db.table(ContextUtils.getContextDataSql(context, vars.get("$param.ObjectRowId_param"), true, active));
data.forEach(function (row)
{
var record = [];
@@ -20,6 +36,11 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
record[2] = context; // TARGET_CONTEXT
record[3] = row[1]; // TITLE
record[4] = row[2]; //DATE
+ if(active != undefined)
+ record[5] = translate.text(active); //ACTIVE
+ else
+ record[5] = ""; //ACTIVE
+
resultList.push(record);
});
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 49ee3565f7..8e68adce99 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -7,11 +7,11 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
{
if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
{
- result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"), false)));
+ result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"), false, undefined)));
}
else
{
- result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false)))
+ result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined)))
}
}
else
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 27404711b5..ababb3ad39 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1038,6 +1038,10 @@
<key>responsible</key>
<value>verantwortlich</value>
</entry>
+ <entry>
+ <key>False</key>
+ <value>Nein</value>
+ </entry>
<entry>
<key>Show all Facebook posts of a user</key>
<value>Alle Facebook Beiträge eines Benutzers anzeigen</value>
@@ -3231,6 +3235,10 @@
<entry>
<key>Bestätigt</key>
</entry>
+ <entry>
+ <key>True</key>
+ <value>Ja</value>
+ </entry>
<entry>
<key>Vorläufig</key>
</entry>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 360093c033..92e265493f 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -5,6 +5,7 @@ import("system.SQLTYPES");
import("Keyword_lib");
import("Sql_lib");
import("Contact_lib");
+import("system.logging");
/**
* Methods to manage contexts.
@@ -108,16 +109,17 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId: [
- // nameField, 0
- // Tablename, 1
+ // contextId,
+ // nameField, 0
+ // Tablename 1
// joins (if needed), 2
// IDField, 3
// RelationField, 4
- // CreationDate, 5
+ // CreationDate 5
// override Tablename (needed if Tablename is a join clause) 6
- // ]
- //
+ // StateField 7
+ // Active States 8
+
// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
"Organisation": [
"\"NAME\"",
@@ -125,7 +127,10 @@ ContextUtils._getSelectMap = function()
"",
"ORGANISATIONID",
"",
- ""
+ "",
+ "",
+ "",
+ []
],
"Person": [
(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()),
@@ -134,7 +139,9 @@ ContextUtils._getSelectMap = function()
"CONTACTID",
"CONTACT",
"",
- "CONTACT"
+ "CONTACT",
+ "",
+ []
],
"Activity": [
"SUBJECT",
@@ -142,7 +149,10 @@ ContextUtils._getSelectMap = function()
"",
"ACTIVITYID",
"",
- ""
+ "",
+ "",
+ "",
+ []
],
"Salesproject": [
maskingUtils.concat([
@@ -156,7 +166,10 @@ ContextUtils._getSelectMap = function()
"",
"SALESPROJECTID",
"CONTACT_ID",
- "STARTDATE"
+ "STARTDATE",
+ "",
+ "STATE",
+ ["25b0ac77-ef92-4809-802e-bb9d8782f865", "23d38486-4cce-41ce-a8df-164ad44df706"]
],
"Contract": [
maskingUtils.concat([
@@ -167,7 +180,10 @@ ContextUtils._getSelectMap = function()
"",
"CONTRACTID",
"CONTACT_ID",
- "CONTRACTSTART"
+ "CONTRACTSTART",
+ "",
+ "CONTRACTSTATUS",
+ ["e12d37e9-3429-40b5-973b-c1569843ca46", "3579eb0c-d8ca-4b6b-85ee-f1800a9301eb", "4c63c82d-0276-4c12-9937-13fd361ad786"]
],
"Offer": [
maskingUtils.concat([
@@ -181,7 +197,10 @@ ContextUtils._getSelectMap = function()
"",
"OFFERID",
"CONTACT_ID",
- "OFFERDATE"
+ "OFFERDATE",
+ "",
+ "STATUS",
+ ["5134153d-2e18-452f-ab35-7a52f1aee7d1", "e5d6b5a4-7576-440f-8332-bc40147c0335"]
],
"Order": [
maskingUtils.concat([
@@ -195,7 +214,10 @@ ContextUtils._getSelectMap = function()
"",
"SALESORDERID",
"CONTACT_ID",
- "ORDERDATE"
+ "ORDERDATE",
+ "",
+ "",
+ []
],
"Product": [
maskingUtils.concat([
@@ -207,7 +229,10 @@ ContextUtils._getSelectMap = function()
"",
"PRODUCTID",
"",
- ""
+ "",
+ "",
+ "",
+ []
],
"Task": [
"SUBJECT",
@@ -216,7 +241,9 @@ ContextUtils._getSelectMap = function()
"TASKID",
translate.text("Task"),
"",
- ""
+ "",
+ "",
+ []
]
}
}
@@ -266,7 +293,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
-ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate)
+ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive)
{
var selectMap = ContextUtils._getSelectMap()
var cond = SqlCondition.begin();
@@ -274,10 +301,26 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate)
{
cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][4], pRowId)
}
-
+
+ if (pActive != undefined)
+ {
+ var activeStates = selectMap[pContextId][8]
+ if(activeStates != null && activeStates.length > 0)
+ {
+ var condSub = SqlCondition.begin();
+ activeStates.forEach(function (state)
+ {
+ if(pActive)
+ condSub.orPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][7], state)
+ else
+ condSub.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][7], state, "# != ?")
+ });
+ cond.andSqlCondition(condSub);
+ }
+ }
var dateColumn = "";
if (pWithDate === true)
- dateColumn = ", " + selectMap[pContextId][6];
+ dateColumn = ", " + selectMap[pContextId][5];
return cond.buildSql("select " + selectMap[pContextId][3] + ", " + selectMap[pContextId][0] + dateColumn + " from " + selectMap[pContextId][1] + " " + selectMap[pContextId][2], "1=1");
}
--
GitLab
From 23a3e30cf69a433740135468f5fac1407b0ebae9 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 08:13:31 +0100
Subject: [PATCH 106/250] fix Productprice
---
entity/Productprice_entity/Productprice_entity.aod | 5 ++++-
entity/Productprice_entity/afterOperatingState.js | 7 +++++++
.../entityfields/currency/valueProcess.js | 8 ++++++++
.../entityfields/pricelist/valueProcess.js | 8 ++++++++
4 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 entity/Productprice_entity/afterOperatingState.js
create mode 100644 entity/Productprice_entity/entityfields/currency/valueProcess.js
create mode 100644 entity/Productprice_entity/entityfields/pricelist/valueProcess.js
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index c4538d9a76..dc37cf42d1 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -4,6 +4,7 @@
<title>Prices</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
+ <afterOperatingState>%aditoprj%/entity/Productprice_entity/afterOperatingState.js</afterOperatingState>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -18,6 +19,7 @@
<title>Currency</title>
<consumer>KeywordCurrencies</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -48,7 +50,7 @@
<consumer>Products</consumer>
<linkedContext>Product</linkedContext>
<mandatory v="true" />
- <state>AUTO</state>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
</entityField>
@@ -93,6 +95,7 @@
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/onValidation.js</onValidation>
</entityField>
diff --git a/entity/Productprice_entity/afterOperatingState.js b/entity/Productprice_entity/afterOperatingState.js
new file mode 100644
index 0000000000..5541dfea33
--- /dev/null
+++ b/entity/Productprice_entity/afterOperatingState.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+{
+ neon.refresh();
+}
diff --git a/entity/Productprice_entity/entityfields/currency/valueProcess.js b/entity/Productprice_entity/entityfields/currency/valueProcess.js
new file mode 100644
index 0000000000..081cebb3e4
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/currency/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string("EUR");
+}
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/pricelist/valueProcess.js b/entity/Productprice_entity/entityfields/pricelist/valueProcess.js
new file mode 100644
index 0000000000..f9c9524ced
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/pricelist/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string("02553fc7-4611-4914-8ff5-0b7c4e7531c9");
+}
\ No newline at end of file
--
GitLab
From b7ad6b03cf14c1211f720b47ce5057f7b4c01747 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 08:50:57 +0100
Subject: [PATCH 107/250] Offer: Attribute entfernt
---
neonView/OfferMain_view/OfferMain_view.aod | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index bd7a35f5f6..4b4735152b 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -39,15 +39,5 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>5f9f6ab2-7bc4-473f-a846-c1536a3c2b1a</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e1554e33-710f-4bb5-a345-953c15985ca4</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
</children>
</neonView>
--
GitLab
From e05a8430754f00daa929e0bfe3322638fec43fa9 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Thu, 28 Mar 2019 08:54:05 +0100
Subject: [PATCH 108/250] getContextDataSql with state
---
.../recordcontainers/jdito/contentProcess.js | 3 ++-
.../recordcontainers/jdito/contentProcess.js | 4 ++--
process/Context_lib/process.js | 8 ++++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index d1f2147962..2bb99764fd 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -5,6 +5,7 @@ import("system.vars");
import("system.result");
import("Context_lib");
import("system.translate");
+import("system.logging");
var resultList = [];
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
@@ -27,7 +28,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
contextList.forEach(function (context)
{
- var data = db.table(ContextUtils.getContextDataSql(context, vars.get("$param.ObjectRowId_param"), true, active));
+ var data = db.table(ContextUtils.getContextDataSql(context, vars.get("$param.ObjectRowId_param"), true, active, true));
data.forEach(function (row)
{
var record = [];
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 8e68adce99..4c8e5d685b 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -7,11 +7,11 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
{
if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
{
- result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"), false, undefined)));
+ result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"), false, undefined, false)));
}
else
{
- result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined)))
+ result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false)))
}
}
else
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 92e265493f..b8034c7952 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -293,7 +293,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
-ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive)
+ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive, pWithState)
{
var selectMap = ContextUtils._getSelectMap()
var cond = SqlCondition.begin();
@@ -321,6 +321,10 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive
var dateColumn = "";
if (pWithDate === true)
dateColumn = ", " + selectMap[pContextId][5];
+
+ var stateColumn = "";
+ if (pWithState === true)
+ stateColumn = ", " + selectMap[pContextId][7];
- return cond.buildSql("select " + selectMap[pContextId][3] + ", " + selectMap[pContextId][0] + dateColumn + " from " + selectMap[pContextId][1] + " " + selectMap[pContextId][2], "1=1");
+ return cond.buildSql("select " + selectMap[pContextId][3] + ", " + selectMap[pContextId][0] + dateColumn + stateColumn + " from " + selectMap[pContextId][1] + " " + selectMap[pContextId][2], "1=1");
}
--
GitLab
From 2204e41d27da2cf7e3d2fba7105de1606d04f7b6 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Thu, 28 Mar 2019 09:26:34 +0100
Subject: [PATCH 109/250] fix Reasons State
---
entity/Salesproject_entity/entityfields/reasons/stateProcess.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entity/Salesproject_entity/entityfields/reasons/stateProcess.js b/entity/Salesproject_entity/entityfields/reasons/stateProcess.js
index 871eb8d93a..5e5536334c 100644
--- a/entity/Salesproject_entity/entityfields/reasons/stateProcess.js
+++ b/entity/Salesproject_entity/entityfields/reasons/stateProcess.js
@@ -5,4 +5,4 @@ import("system.vars");
if(vars.get("$field.STATE") && (vars.get("$field.STATE") == 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd' || vars.get("$field.STATE") == '130bb53a-a97e-455e-8f34-8d445e985474'))
result.string("EDITABLE");
else
- result.string("READONLY");
+ result.string("INVISIBLE");
--
GitLab
From b2deb3156f948086f81fc7ad712b325a01af25c6 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Thu, 28 Mar 2019 09:32:32 +0100
Subject: [PATCH 110/250] Grouping with active in 360 degree
---
.../recordcontainers/jdito/contentProcess.js | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 2bb99764fd..4f6f84f1b4 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -12,6 +12,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
{
var active;
+ var selectMap = ContextUtils._getSelectMap()
if(vars.exists("$local.filter") && vars.get("$local.filter") )
{
var filter = JSON.parse(vars.getString("$local.filter"));
@@ -37,11 +38,15 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
record[2] = context; // TARGET_CONTEXT
record[3] = row[1]; // TITLE
record[4] = row[2]; //DATE
- if(active != undefined)
- record[5] = translate.text(active); //ACTIVE
+ if(active != undefined) //ACTIVE
+ record[5] = translate.text(active);
else
- record[5] = ""; //ACTIVE
-
+ {
+ if(selectMap[context][8].indexOf(row[3]) > -1)
+ record[5] = translate.text("true");
+ else
+ record[5] = translate.text("false");
+ }
resultList.push(record);
});
--
GitLab
From 2952c7d1b0a4e4dc570cc144016652b72e7e44ba Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Thu, 28 Mar 2019 09:36:31 +0100
Subject: [PATCH 111/250] TARGET_CONTEXT, TARGET_ID in PersonObjects for 360
degree
---
entity/360Degree_entity/360Degree_entity.aod | 2 ++
.../360Degree_entity/recordcontainers/jdito/contentProcess.js | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index e4fe44ea79..9a4120b092 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -68,6 +68,8 @@
<entityProvider>
<name>PersonObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>TARGET_ID</targetIdField>
<dependencies>
<entityDependency>
<name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 4f6f84f1b4..771f35a4cb 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -47,7 +47,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
else
record[5] = translate.text("false");
}
- resultList.push(record);
+ resultList.push(record);
});
});
--
GitLab
From eeec54c713eaab29fbb7f4255b798157d670a93e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 10:13:30 +0100
Subject: [PATCH 112/250] Salesproject fixes
---
.../SalesprojectSource_entity/SalesprojectSource_entity.aod | 3 +++
.../entityfields/entrydate/valueProcess.js | 6 ++++++
.../_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index c8c6e96745..41439ab453 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -40,6 +40,8 @@
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>INFO</name>
@@ -57,6 +59,7 @@
<name>SOURCE</name>
<title>Touchpoint</title>
<consumer>KeywordSources</consumer>
+ <mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
diff --git a/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js
new file mode 100644
index 0000000000..994a752c90
--- /dev/null
+++ b/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"))
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 2e627c2e51..35430f5089 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>xRM-Basic5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab
From 14a9439a0168f5330088208e2781db07f21e7ceb Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 28 Mar 2019 10:35:57 +0100
Subject: [PATCH 113/250] Indexsearch for Contract, Product and Salesproject
---
aliasDefinition/Data_alias/Data_alias.aod | 15 +++++---
.../indexsearchgroups/contract/query.js | 26 +++++++++++++
.../indexsearchgroups/organisation/query.js | 2 +-
.../indexsearchgroups/product/query.js | 24 ++++++++++++
.../indexsearchgroups/salesproject/query.js | 25 ++++++++++++
.../AttributeRelation_entity.aod | 1 +
.../afterOperatingState.js | 5 +++
entity/Attribute_entity/Attribute_entity.aod | 2 +-
.../attribute_level/valueProcess.js | 2 +-
.../attribute_parent_id/onValueChange.js | 38 -------------------
.../recordcontainers/db/onDBUpdate.js | 27 +++++++++++++
11 files changed, 120 insertions(+), 47 deletions(-)
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/product/query.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
create mode 100644 entity/AttributeRelation_entity/afterOperatingState.js
delete mode 100644 entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js
create mode 100644 entity/Attribute_entity/recordcontainers/db/onDBUpdate.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 7e3443fa75..04de1d1496 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5164,10 +5164,11 @@
<name>CONTRACT</name>
<title>Contract</title>
<icon>VAADIN:FILE_TEXT</icon>
- <active v="false" />
- <idColumn>CONTRACT</idColumn>
+ <active v="true" />
+ <idColumn>CONTRACTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js</query>
<resultContextNeon>Contract</resultContextNeon>
<affectedTables>
<element>CONTRACT</element>
@@ -5178,10 +5179,11 @@
<name>PRODUCT</name>
<title>Product</title>
<icon>VAADIN:HAMMER</icon>
- <active v="false" />
- <idColumn>PRODUCT</idColumn>
+ <active v="true" />
+ <idColumn>PRODUCTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/product/query.js</query>
<resultContextNeon>Product</resultContextNeon>
<affectedTables>
<element>PRODUCT</element>
@@ -5192,10 +5194,11 @@
<name>SALESPROJECT</name>
<title>Salesproject</title>
<icon>VAADIN:BOOK_DOLLAR</icon>
- <active v="false" />
- <idColumn>SALESPROJECT</idColumn>
+ <active v="true" />
+ <idColumn>SALESPROJECTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js</query>
<resultContextNeon>Salesproject</resultContextNeon>
<affectedTables>
<element>SALESPROJECT</element>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js b/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
new file mode 100644
index 0000000000..d10d2a6fac
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
@@ -0,0 +1,26 @@
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Keyword_lib");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
+if (vars.exists("$local.idvalue")) {
+ affectedIds = vars.get("$local.idvalue");
+ queryCondition = "where CONTRACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ //TODO: refactor this for incremental indexer (injections?)
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select CONTRACTID, "
+ + sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ")
+ + " as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGANISATION.NAME", "'| Contract Type: '", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) //TODO: translation in index?
+ + " as DESCCOLUMN, CONTRACTCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ + " from CONTRACT "
+ + " join CONTACT on CONTRACT.CONTACT_ID = CONTACTID "
+ + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
+ + queryCondition + " order by CONTRACTCODE ";
+result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
index 5778a7f9e4..1bb4c5ad46 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
@@ -12,7 +12,7 @@ if (vars.exists("$local.idvalue")) {
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select CONTACT.CONTACTID "
- + "," + sqlHelper.concat(["ORGANISATION.NAME", "ORGANISATION.CUSTOMERCODE"], " | ")
+ + "," + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/product/query.js b/aliasDefinition/Data_alias/indexsearchgroups/product/query.js
new file mode 100644
index 0000000000..9f8b8240c2
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/product/query.js
@@ -0,0 +1,24 @@
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Keyword_lib");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
+if (vars.exists("$local.idvalue")) {
+ affectedIds = vars.get("$local.idvalue");
+ queryCondition = "where PRODUCTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ //TODO: refactor this for incremental indexer (injections?)
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select PRODUCTID, "
+ + sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | ")
+ + " as TITLECOLUMN, "
+ + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID")
+ + " as DESCCOLUMN, PRODUCTCODE "
+ + " from PRODUCT "
+ + queryCondition + " order by PRODUCTCODE ";
+result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
new file mode 100644
index 0000000000..e03985eafd
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Keyword_lib");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
+if (vars.exists("$local.idvalue")) {
+ affectedIds = vars.get("$local.idvalue");
+ queryCondition = "where SALESPROJECTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ //TODO: refactor this for incremental indexer (injections?)
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select SALESPROJECTID, PROJECTTITLE as TITLECOLUMN, "
+ + sqlHelper.concat([
+ "'Status: '", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATE"),
+ "'| Phase: '", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
+ ])
+ + " as DESCCOLUMN, PROJECTCODE "
+ + " from SALESPROJECT "
+ + queryCondition + " order by PROJECTCODE ";
+result.string(sqlQuery);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 73827d2c93..cefbe0b741 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -4,6 +4,7 @@
<title>Attribute Relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
+ <afterOperatingState>%aditoprj%/entity/AttributeRelation_entity/afterOperatingState.js</afterOperatingState>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AttributeRelation_entity/afterOperatingState.js b/entity/AttributeRelation_entity/afterOperatingState.js
new file mode 100644
index 0000000000..d3061e7154
--- /dev/null
+++ b/entity/AttributeRelation_entity/afterOperatingState.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+ neon.refresh();
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index a658dcc50f..f244233174 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -42,7 +42,6 @@
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -284,6 +283,7 @@
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBUpdate>%aditoprj%/entity/Attribute_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
diff --git a/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
index 1977334cca..e91a822698 100644
--- a/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
@@ -4,7 +4,7 @@ import("system.result");
import("system.vars");
import("Sql_lib");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
if (vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
{
var level = db.cell(SqlCondition.begin()
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js b/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js
deleted file mode 100644
index 06db0b11a5..0000000000
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/onValueChange.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Attribute_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
-{
- var level = 0;
- if (vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
- {
- level = db.cell(SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$field.ATTRIBUTE_PARENT_ID"))
- .buildSql("select ATTRIBUTE_LEVEL from AB_ATTRIBUTE"));
- level = parseInt(level) + 1;
- }
- neon.setFieldValue("$field.ATTRIBUTE_LEVEL", level);
-
- var table = "AB_ATTRIBUTE";
- var columns = ["ATTRIBUTE_LEVEL"];
- var types = db.getColumnTypes(table, columns);
- var toUpdate = [];
-
- var attributes = [vars.get("$field.AB_ATTRIBUTEID")];
- while (attributes.length > 0)
- {
- var condition = SqlCondition.begin()
- .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')");
-
- toUpdate.push([table, columns, types, [String(++level)], condition.build()]);
-
- attributes = db.array(db.COLUMN, SqlCondition.begin()
- .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
- .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
- );
- }
-
- db.updates(toUpdate);
-}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/onDBUpdate.js b/entity/Attribute_entity/recordcontainers/db/onDBUpdate.js
new file mode 100644
index 0000000000..38704929f9
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/db/onDBUpdate.js
@@ -0,0 +1,27 @@
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Attribute_lib");
+
+var level = parseInt(vars.get("$field.ATTRIBUTE_LEVEL"));
+
+var table = "AB_ATTRIBUTE";
+var columns = ["ATTRIBUTE_LEVEL"];
+var types = db.getColumnTypes(table, columns);
+var toUpdate = [];
+
+var attributes = [vars.get("$field.AB_ATTRIBUTEID")];
+while (attributes.length > 0)
+{
+ var condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')");
+
+ toUpdate.push([table, columns, types, [String(++level)], condition.build()]);
+
+ attributes = db.array(db.COLUMN, SqlCondition.begin()
+ .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
+ .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
+ );
+}
+
+db.updates(toUpdate);
--
GitLab
From aa9b1627f368249e51b835058e45ee20484490da Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 28 Mar 2019 10:52:00 +0100
Subject: [PATCH 114/250] liquibase: fix salutation typo
---
.../data_alias/basic/2019.2/create_salutation.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/others/db_changes/data_alias/basic/2019.2/create_salutation.xml b/others/db_changes/data_alias/basic/2019.2/create_salutation.xml
index 7e3a196121..70b4f1edcd 100644
--- a/others/db_changes/data_alias/basic/2019.2/create_salutation.xml
+++ b/others/db_changes/data_alias/basic/2019.2/create_salutation.xml
@@ -145,10 +145,10 @@
<column name="SALUTATIONID" value="76fe57c0-cf68-4240-ba6d-eb7d52f46317"/>
</insert>
<insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Präsidengt {fn} {ln}"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Präsidengt"/>
+ <column name="HEADLINE" value="Herr Präsident {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Präsident"/>
<column name="SEX" value="m"/>
- <column name="TITLE" value="Präsidengt"/>
+ <column name="TITLE" value="Präsident"/>
<column name="SALUTATION" value="Herr"/>
<column name="LANGUAGE" value="deu"/>
<column name="SORT" valueNumeric="14"/>
--
GitLab
From 5cf0d514453316208b85667ee0d4221bad3463c7 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 28 Mar 2019 10:52:18 +0100
Subject: [PATCH 115/250] organisation: changed main view tab order
---
.../OrganisationMain_view.aod | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index a8dde5ffe1..2dd5871774 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -20,26 +20,26 @@
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>ae34787c-dcaf-4fe2-a4e2-35219f138b03</name>
- <entityField>360DegreeObjects</entityField>
- <view>360DegreeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>55e04574-bc55-4c9a-a4c4-9ebd287f8ae6</name>
- <entityField>Tasks</entityField>
- <view>TaskFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>c10533a6-d185-4b13-84ee-53a468544c03</name>
<entityField>Contact</entityField>
<view>PersonSimpleList_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ae34787c-dcaf-4fe2-a4e2-35219f138b03</name>
+ <entityField>360DegreeObjects</entityField>
+ <view>360DegreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>78aee175-d3ac-4378-8b3b-27f44a529aa5</name>
<entityField>Productprices</entityField>
<view>ProductpriceRelation_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>55e04574-bc55-4c9a-a4c4-9ebd287f8ae6</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
<entityField>Documents</entityField>
--
GitLab
From 3e070f88cab6d7969a76facee38f63c19179e794 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 28 Mar 2019 10:55:09 +0100
Subject: [PATCH 116/250] translation task: privte -> protected
---
entity/Task_entity/Task_entity.aod | 2 +-
.../_____LANGUAGE_EXTRA.aod | 18 +++++++++++++++---
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 18 ++++++++++++------
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 18 +++++++++++++++---
4 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 1bd9acec26..3111fd2565 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -93,7 +93,7 @@
</entityField>
<entityField>
<name>PROTECTIONLEVEL</name>
- <title>private</title>
+ <title>Protected</title>
<contentType>BOOLEAN</contentType>
<contentTypeProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/contentTypeProcess.js</contentTypeProcess>
<possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/possibleItemsProcess.js</possibleItemsProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 98c287637d..b9304b3e3d 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1038,9 +1038,6 @@
<entry>
<key>Betreff</key>
</entry>
- <entry>
- <key>private</key>
- </entry>
<entry>
<key>title</key>
</entry>
@@ -2643,6 +2640,21 @@
<entry>
<key>Attribute Tree</key>
</entry>
+ <entry>
+ <key>True</key>
+ </entry>
+ <entry>
+ <key>False</key>
+ </entry>
+ <entry>
+ <key>protected</key>
+ </entry>
+ <entry>
+ <key>false</key>
+ </entry>
+ <entry>
+ <key>true</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 ababb3ad39..ea1f024278 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1501,10 +1501,6 @@
<entry>
<key>Betreff</key>
</entry>
- <entry>
- <key>private</key>
- <value>privat</value>
- </entry>
<entry>
<key>title</key>
<value>Titel</value>
@@ -2970,14 +2966,14 @@
</entry>
<entry>
<key>Keyword Attribute</key>
- <value>Schlüsselwort-Attribut</value>
+ <value>Schlüsselwort-Eigenschaft</value>
</entry>
<entry>
<key>in</key>
</entry>
<entry>
<key>Keyword Attribute Values</key>
- <value>Schlüsselwort-Attribut-Werte</value>
+ <value>Schlüsselwort-Eigenschaft-Werte</value>
</entry>
<entry>
<key>Boolean value</key>
@@ -3410,6 +3406,16 @@
<key>Partner</key>
<value>Partner</value>
</entry>
+ <entry>
+ <key>Protected</key>
+ <value>Geschützt</value>
+ </entry>
+ <entry>
+ <key>false</key>
+ </entry>
+ <entry>
+ <key>true</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 ecc338f3c5..eb9613d23d 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1056,9 +1056,6 @@
<entry>
<key>Betreff</key>
</entry>
- <entry>
- <key>private</key>
- </entry>
<entry>
<key>title</key>
</entry>
@@ -2668,6 +2665,21 @@
<entry>
<key>Attribute Tree</key>
</entry>
+ <entry>
+ <key>True</key>
+ </entry>
+ <entry>
+ <key>False</key>
+ </entry>
+ <entry>
+ <key>protected</key>
+ </entry>
+ <entry>
+ <key>false</key>
+ </entry>
+ <entry>
+ <key>true</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 49feab26bba54df9978d6e51ce6b2d067bb7f18e Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 28 Mar 2019 11:55:28 +0100
Subject: [PATCH 117/250] =?UTF-8?q?#1035423=20-=20Es=20wurde=20f=C3=BCr=20?=
=?UTF-8?q?die=20Tabellen=20und=20Entites:=20-=20ORGANISATION=20-=20PERSON?=
=?UTF-8?q?=20-=20ADDRESS=20-=20COMMUNICATION=20-=20CONTACT=20-=20ACTIVITY?=
=?UTF-8?q?=20-=20ACTIVITY=5FLINK=20-=20PRODUCT=20-=20OFFER=20-=20AB=5FATT?=
=?UTF-8?q?RIBUTERELATION?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
die Felder:
USER_NEW
USER_EDIT
DATE_NEW
DATE_EDIT
angelegt. Dieser werden analog zum Swing-Client befüllt.
Das ganze wurde als Liquibase ChangeSet realisiert
---
aliasDefinition/Data_alias/Data_alias.aod | 970 ++++++++++++++++--
.../ActivityLink_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 4 +-
.../entityfields/date_new/valueProcess.js | 4 +-
.../entityfields/user_edit/valueProcess.js | 4 +-
.../entityfields/user_new/valueProcess.js | 4 +-
entity/Activity_entity/Activity_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 4 +-
.../entityfields/date_new/valueProcess.js | 4 +-
.../entityfields/user_edit/valueProcess.js | 4 +-
.../entityfields/user_new/valueProcess.js | 4 +-
entity/Address_entity/Address_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 7 +
.../entityfields/date_new/valueProcess.js | 6 +-
.../entityfields/user_edit/valueProcess.js | 7 +
.../entityfields/user_new/valueProcess.js | 5 +-
.../AttributeRelation_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 6 +
.../entityfields/date_new/valueProcess.js | 4 +-
.../entityfields/user_edit/valueProcess.js | 6 +
.../entityfields/user_new/valueProcess.js | 4 +-
.../Communication_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 6 +
.../entityfields/date_new/valueProcess.js | 5 +-
.../entityfields/user_edit/valueProcess.js | 6 +
.../entityfields/user_new/valueProcess.js | 5 +-
entity/Contact_entity/Contact_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 6 +
.../entityfields/date_new/valueProcess.js | 6 +
.../entityfields/user_edit/valueProcess.js | 6 +
.../entityfields/user_new/valueProcess.js | 6 +
entity/Offer_entity/Offer_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 4 +-
.../entityfields/date_new/valueProcess.js | 4 +-
.../entityfields/user_edit/valueProcess.js | 4 +-
.../entityfields/user_new/valueProcess.js | 4 +-
.../Organisation_entity.aod | 48 +
.../entityfields/date_edit/valueProcess.js | 7 +
.../entityfields/date_new/valueProcess.js | 7 +
.../date_new_contact/valueProcess.js | 6 +
.../entityfields/user_edit/valueProcess.js | 7 +
.../entityfields/user_new/valueProcess.js | 7 +
.../user_new_contact/valueProcess.js | 6 +
entity/Person_entity/Person_entity.aod | 48 +
.../entityfields/date_edit/valueProcess.js | 7 +
.../entityfields/date_new/valueProcess.js | 7 +
.../date_new_contact/valueProcess.js | 6 +
.../entityfields/user_edit/valueProcess.js | 7 +
.../entityfields/user_new/valueProcess.js | 7 +
.../user_new_contact/valueProcess.js | 7 +
entity/Product_entity/Product_entity.aod | 32 +
.../entityfields/date_edit/valueProcess.js | 4 +-
.../entityfields/date_new/valueProcess.js | 5 +-
.../entityfields/user_edit/valueProcess.js | 4 +-
.../entityfields/user_new/valueProcess.js | 4 +-
...activity_add_date_editnew_user_editnew.xml | 28 +
...vitylink_add_date_editnew_user_editnew.xml | 29 +
.../address_add_date_editnew_user_editnew.xml | 29 +
...relation_add_date_editnew_user_editnew.xml | 29 +
.../data_alias/basic/2019.2/changelog.xml | 15 +-
...nication_add_date_editnew_user_editnew.xml | 28 +
.../contact_add_date_editnew_user_editnew.xml | 29 +
.../offer_add_date_editnew_user_editnew.xml | 29 +
...nisation_add_date_editnew_user_editnew.xml | 29 +
.../person_add_date_editnew_user_editnew.xml | 29 +
.../product_add_date_editnew_user_editnew.xml | 29 +
66 files changed, 1755 insertions(+), 107 deletions(-)
create mode 100644 entity/Address_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/Address_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/Communication_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/Communication_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/date_new/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/Contact_entity/entityfields/user_new/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/date_new/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/user_new/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/date_new/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/date_new_contact/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/user_new/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/user_new_contact/valueProcess.js
create mode 100644 others/db_changes/data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
create mode 100644 others/db_changes/data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 04de1d1496..1a1bee31dd 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -104,6 +104,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -257,6 +313,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -400,6 +512,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -595,6 +763,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -686,27 +910,8 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>CONTRACT</name>
- <dbName></dbName>
- <idColumn>CONTRACTID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>CONTRACTDUE</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
@@ -715,49 +920,124 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
+ <documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>PAYMENT</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
+ <documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CONTRACTSTATUS</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
+ <documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CONTRACTEND</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
+ <documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CONTRACT</name>
+ <dbName></dbName>
+ <idColumn>CONTRACTID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>CONTRACTDUE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PAYMENT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CONTRACTSTATUS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CONTRACTEND</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
<name>CONTRACTCODE</name>
<dbName></dbName>
<primaryKey v="false" />
@@ -1013,6 +1293,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -1798,6 +2134,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -3071,6 +3463,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4254,33 +4702,14 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ACTIVITYLINK</name>
- <dbName></dbName>
- <idColumn>ACTIVITYLINKID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>OBJECT_ROWID</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="91" />
+ <size v="10" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -4288,9 +4717,84 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ACTIVITYLINKID</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>ACTIVITYLINK</name>
+ <dbName></dbName>
+ <idColumn>ACTIVITYLINKID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>OBJECT_ROWID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ACTIVITYLINKID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
@@ -4329,6 +4833,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="91" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -5088,6 +5648,298 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>DATABASECHANGELOG</name>
+ <dbName></dbName>
+ <idColumn></idColumn>
+ <idGeneratorType v="1" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>EXECTYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATEEXECUTED</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ORDEREXECUTED</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>COMMENTS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>AUTHOR</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CONTEXTS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>MD5SUM</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="35" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LIQUIBASE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="20" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DEPLOYMENT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TAG</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LABELS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>FILENAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>DATABASECHANGELOGLOCK</name>
+ <dbName></dbName>
+ <idColumn>ID</idColumn>
+ <idGeneratorType v="1" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>LOCKGRANTED</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LOCKED</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="16" />
+ <size v="1" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LOCKEDBY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 38ceb851f5..f717d43107 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -81,6 +81,22 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -117,6 +133,22 @@
<name>OBJECT_ROWID.displayValue</name>
<expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>ACTIVITYLINK.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>ACTIVITYLINK.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>ACTIVITYLINK.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js b/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js
index 710ac8a06a..8d41a64d69 100644
--- a/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js b/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js
index 3a0d59096c..8ee28e84ed 100644
--- a/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js b/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js
index 1581e18d97..90383c0713 100644
--- a/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js b/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js
index 7c566863b4..dda83cfd00 100644
--- a/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 14c3e72c83..3dff2ecaf5 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -412,6 +412,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -478,6 +494,22 @@
<name>CREATOR.displayValue</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>ACTIVITY.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>ACTIVITY.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>ACTIVITY.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>ACTIVITY.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/date_edit/valueProcess.js b/entity/Activity_entity/entityfields/date_edit/valueProcess.js
index 710ac8a06a..8d41a64d69 100644
--- a/entity/Activity_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/Activity_entity/entityfields/date_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/date_new/valueProcess.js b/entity/Activity_entity/entityfields/date_new/valueProcess.js
index 3a0d59096c..8ee28e84ed 100644
--- a/entity/Activity_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Activity_entity/entityfields/date_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/user_edit/valueProcess.js b/entity/Activity_entity/entityfields/user_edit/valueProcess.js
index 1581e18d97..90383c0713 100644
--- a/entity/Activity_entity/entityfields/user_edit/valueProcess.js
+++ b/entity/Activity_entity/entityfields/user_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/user_new/valueProcess.js b/entity/Activity_entity/entityfields/user_new/valueProcess.js
index 7c566863b4..dda83cfd00 100644
--- a/entity/Activity_entity/entityfields/user_new/valueProcess.js
+++ b/entity/Activity_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 05fa30709b..f3dd9484a1 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -250,6 +250,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -322,6 +338,22 @@
<name>ADDR_TYPE.displayValue</name>
<expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>ADDRESS.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>ADDRESS.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>ADDRESS.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>ADDRESS.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Address_entity/entityfields/date_edit/valueProcess.js b/entity/Address_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..5e6ef05973
--- /dev/null
+++ b/entity/Address_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/date_new/valueProcess.js b/entity/Address_entity/entityfields/date_new/valueProcess.js
index 408c498a4c..a72892783b 100644
--- a/entity/Address_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Address_entity/entityfields/date_new/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.vars");
+import("system.util");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
-
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/user_edit/valueProcess.js b/entity/Address_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..6af880ae3e
--- /dev/null
+++ b/entity/Address_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/user_new/valueProcess.js b/entity/Address_entity/entityfields/user_new/valueProcess.js
index 7c566863b4..e518bc75a9 100644
--- a/entity/Address_entity/entityfields/user_new/valueProcess.js
+++ b/entity/Address_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,7 @@
-import("system.vars");
+import("system.util");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index cefbe0b741..2821c0bf01 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -202,6 +202,22 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -271,6 +287,22 @@
<name>MEMO_VALUE.value</name>
<recordfield>AB_ATTRIBUTERELATION.MEMO_VALUE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>AB_ATTRIBUTERELATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>AB_ATTRIBUTERELATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>AB_ATTRIBUTERELATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>AB_ATTRIBUTERELATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js b/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..8d41a64d69
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js b/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js
index 7acb3c8084..9477aae864 100644
--- a/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js b/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..90383c0713
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js b/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js
index a8a5e28793..ad6636be18 100644
--- a/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index e6c42a3ec7..b5de14e234 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -199,6 +199,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -242,6 +258,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>MEDIUM_ID.displayValue</name>
<expression>%aditoprj%/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>COMMUNICATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>COMMUNICATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>COMMUNICATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>COMMUNICATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Communication_entity/entityfields/date_edit/valueProcess.js b/entity/Communication_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..8d41a64d69
--- /dev/null
+++ b/entity/Communication_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/date_new/valueProcess.js b/entity/Communication_entity/entityfields/date_new/valueProcess.js
index 408c498a4c..8ee28e84ed 100644
--- a/entity/Communication_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Communication_entity/entityfields/date_new/valueProcess.js
@@ -1,7 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
-
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/user_edit/valueProcess.js b/entity/Communication_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..90383c0713
--- /dev/null
+++ b/entity/Communication_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/user_new/valueProcess.js b/entity/Communication_entity/entityfields/user_new/valueProcess.js
index 7c566863b4..e518bc75a9 100644
--- a/entity/Communication_entity/entityfields/user_new/valueProcess.js
+++ b/entity/Communication_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,7 @@
-import("system.vars");
+import("system.util");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 1bdf891472..a98e4ccf61 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -198,6 +198,22 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -250,6 +266,22 @@
<name>STATUS.value</name>
<recordfield>CONTACT.STATUS</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>CONTACT.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>CONTACT.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>CONTACT.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>CONTACT.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Contact_entity/entityfields/date_edit/valueProcess.js b/entity/Contact_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..8d41a64d69
--- /dev/null
+++ b/entity/Contact_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/date_new/valueProcess.js b/entity/Contact_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000..8ee28e84ed
--- /dev/null
+++ b/entity/Contact_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/user_edit/valueProcess.js b/entity/Contact_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..90383c0713
--- /dev/null
+++ b/entity/Contact_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/user_new/valueProcess.js b/entity/Contact_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000..dda83cfd00
--- /dev/null
+++ b/entity/Contact_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 3d97a5e318..a5e72ce894 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -659,6 +659,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -800,6 +816,22 @@
<name>INFO.value</name>
<recordfield>OFFER.INFO</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>OFFER.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>OFFER.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>OFFER.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>OFFER.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Offer_entity/entityfields/date_edit/valueProcess.js b/entity/Offer_entity/entityfields/date_edit/valueProcess.js
index 710ac8a06a..8d41a64d69 100644
--- a/entity/Offer_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/Offer_entity/entityfields/date_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/date_new/valueProcess.js b/entity/Offer_entity/entityfields/date_new/valueProcess.js
index 3a0d59096c..8ee28e84ed 100644
--- a/entity/Offer_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Offer_entity/entityfields/date_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/user_edit/valueProcess.js b/entity/Offer_entity/entityfields/user_edit/valueProcess.js
index 1581e18d97..90383c0713 100644
--- a/entity/Offer_entity/entityfields/user_edit/valueProcess.js
+++ b/entity/Offer_entity/entityfields/user_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/user_new/valueProcess.js b/entity/Offer_entity/entityfields/user_new/valueProcess.js
index 7c566863b4..dda83cfd00 100644
--- a/entity/Offer_entity/entityfields/user_new/valueProcess.js
+++ b/entity/Offer_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 71a1654983..b343b850c0 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -744,6 +744,30 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW_CONTACT</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW_CONTACT</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -832,6 +856,30 @@
<name>LANGUAGE.displayValue</name>
<expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>ORGANISATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>ORGANISATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>ORGANISATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>ORGANISATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW_CONTACT.value</name>
+ <recordfield>CONTACT.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW_CONTACT.value</name>
+ <recordfield>CONTACT.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Organisation_entity/entityfields/date_edit/valueProcess.js b/entity/Organisation_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..5e6ef05973
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/date_new/valueProcess.js b/entity/Organisation_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000..a72892783b
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js b/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js
new file mode 100644
index 0000000000..a273b1ea4c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/user_edit/valueProcess.js b/entity/Organisation_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..6af880ae3e
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/user_new/valueProcess.js b/entity/Organisation_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000..e518bc75a9
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js b/entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js
new file mode 100644
index 0000000000..b619fead9d
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 3772446a2f..1cee641431 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -803,6 +803,30 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW_CONTACT</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW_CONTACT</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -945,6 +969,30 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ORGANISATION_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>PERSON.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>PERSON.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>PERSON.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>PERSON.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW_CONTACT.value</name>
+ <recordfield>CONTACT.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW_CONTACT.value</name>
+ <recordfield>CONTACT.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Person_entity/entityfields/date_edit/valueProcess.js b/entity/Person_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..5e6ef05973
--- /dev/null
+++ b/entity/Person_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/date_new/valueProcess.js b/entity/Person_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000..a72892783b
--- /dev/null
+++ b/entity/Person_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/date_new_contact/valueProcess.js b/entity/Person_entity/entityfields/date_new_contact/valueProcess.js
new file mode 100644
index 0000000000..8ee28e84ed
--- /dev/null
+++ b/entity/Person_entity/entityfields/date_new_contact/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/user_edit/valueProcess.js b/entity/Person_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..6af880ae3e
--- /dev/null
+++ b/entity/Person_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/user_new/valueProcess.js b/entity/Person_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000..e518bc75a9
--- /dev/null
+++ b/entity/Person_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/user_new_contact/valueProcess.js b/entity/Person_entity/entityfields/user_new_contact/valueProcess.js
new file mode 100644
index 0000000000..e518bc75a9
--- /dev/null
+++ b/entity/Person_entity/entityfields/user_new_contact/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 481c5df54c..8939a51225 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -426,6 +426,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -506,6 +522,22 @@
<name>LANGUAGE.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>PRODUCT.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>PRODUCT.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>PRODUCT.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>PRODUCT.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Product_entity/entityfields/date_edit/valueProcess.js b/entity/Product_entity/entityfields/date_edit/valueProcess.js
index 710ac8a06a..8d41a64d69 100644
--- a/entity/Product_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/Product_entity/entityfields/date_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/date_new/valueProcess.js b/entity/Product_entity/entityfields/date_new/valueProcess.js
index 408c498a4c..8ee28e84ed 100644
--- a/entity/Product_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Product_entity/entityfields/date_new/valueProcess.js
@@ -1,7 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
-
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/user_edit/valueProcess.js b/entity/Product_entity/entityfields/user_edit/valueProcess.js
index 1581e18d97..90383c0713 100644
--- a/entity/Product_entity/entityfields/user_edit/valueProcess.js
+++ b/entity/Product_entity/entityfields/user_edit/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/user_new/valueProcess.js b/entity/Product_entity/entityfields/user_new/valueProcess.js
index 7c566863b4..dda83cfd00 100644
--- a/entity/Product_entity/entityfields/user_new/valueProcess.js
+++ b/entity/Product_entity/entityfields/user_new/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..2dc4d279cf
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
@@ -0,0 +1,28 @@
+<?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="d.buechler" id="12efe6d0-710d-4db2-beba-adef412a641e">
+ <addColumn tableName="ACTIVITY">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update tableName="ACTIVITY">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="ACTIVITY"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="ACTIVITY"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..8fadb2fd79
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="4974c7ff-9b83-488e-b2d8-4d3d3fbfa13b">
+ <addColumn tableName="ACTIVITYLINK">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="ACTIVITYLINK">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="ACTIVITYLINK"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="ACTIVITYLINK"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..1f1c3fb988
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="5de48032-5931-4d48-ac9d-fca8da4cef93">
+ <addColumn tableName="ADDRESS">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="ADDRESS">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="ADDRESS"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="ADDRESS"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..be425b6822
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="7e51f1e1-2eeb-4334-9c4b-09519681bb8f">
+ <addColumn tableName="AB_ATTRIBUTERELATION">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="AB_ATTRIBUTERELATION">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="AB_ATTRIBUTERELATION"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="AB_ATTRIBUTERELATION"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index c2b63b678f..1c4c46577a 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -108,8 +108,21 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactDepartment.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactContactrole.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactPosition.xml"/>
-
+
<include relativeToChangelogFile="true" file="AditoBasic/init_AttributeKeyword_target_group.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/insert_offer_status_keyword.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/insert_salesproject_state_keyword.xml"/>
+
+
+ <include relativeToChangelogFile="true" file="organisation_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="person_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="address_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="contact_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="activity_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="activitylink_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="product_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="offer_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="attributerelation_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="communication_add_date_editnew_user_editnew.xml"/>
+
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..bcc8c48b77
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
@@ -0,0 +1,28 @@
+<?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="d.buechler" id="1ae11ac7-b51f-4286-a6d6-fd3e17353d01">
+ <addColumn tableName="COMMUNICATION">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update tableName="COMMUNICATION">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="COMMUNICATION"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="COMMUNICATION"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..95c4a880cd
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="4628bfa2-db32-4f70-a18c-051ba688db15">
+ <addColumn tableName="CONTACT">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="CONTACT">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="CONTACT"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="CONTACT"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..a55fa56091
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="c7c98743-8939-4b32-b04d-b587ede752dd">
+ <addColumn tableName="OFFER">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="OFFER">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="OFFER"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="OFFER"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..7a9b29f0e0
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="6a32f69d-9100-4657-8380-575c9dbe41ff">
+ <addColumn tableName="ORGANISATION">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="ORGANISATION">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="ORGANISATION"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="ORGANISATION"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..52d41d55eb
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="02de3b65-44a3-4dbf-ace6-33dfef0b998c">
+ <addColumn tableName="PERSON">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="PERSON">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="PERSON"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="PERSON"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml b/others/db_changes/data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
new file mode 100644
index 0000000000..6b7003875f
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
@@ -0,0 +1,29 @@
+<?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="d.buechler" id="7f4376c0-2ee1-444d-9101-57b6e851b0ba">
+ <addColumn tableName="PRODUCT">
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+ </addColumn>
+
+ <update
+ tableName="PRODUCT">
+ <column name="USER_NEW" type="NVARCHAR(50)" value="Admin"/>
+ <column name="DATE_NEW" type="DATETIME" valueComputed="current_datetime"/>
+ </update>
+
+ <addNotNullConstraint
+ columnDataType="NVARCHAR(50)"
+ columnName="USER_NEW"
+ tableName="PRODUCT"/>
+
+ <addNotNullConstraint
+ columnDataType="DATETIME"
+ columnName="DATE_NEW"
+ tableName="PRODUCT"/>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--
GitLab
From f17c8921756d693978d51d6c3b5591f30f27bb92 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 13:03:44 +0100
Subject: [PATCH 118/250] Salesproject fixes
---
.../entityfields/deliveryterms/valueProcess.js | 14 ++++++++------
.../newofferversion/onActionProcess.js | 4 +++-
.../SalesprojectSource_entity.aod | 1 +
neonContext/Salesproject/Salesproject.aod | 1 +
.../SalesprojectSourceFilter_view.aod | 1 +
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
index c1fc17cc44..2e15600563 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -1,7 +1,9 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
-{
- result.string(vars.get("$param.OfferDeliveryTerm_param"));
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+logging.log(vars.get("$param.OfferDeliveryTerm_param"))
+if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
+{
+ result.string(vars.get("$param.OfferDeliveryTerm_param"));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index add48fbf11..be8fa6eecb 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -11,6 +11,8 @@ var params = {
"OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
"OfferCurrency_param" : vars.get("$field.CURRENCY"),
"OfferAddress_param" : vars.get("$field.ADDRESS"),
- "OfferHeader_param" : vars.get("$field.HEADER")
+ "OfferHeader_param" : vars.get("$field.HEADER"),
+ "OfferDeliveryTerm_param" : vars.get("$field.DELIVERYTERMS"),
+ "OfferPaymentTerm_param" : vars.get("$field.PAYMENTTERMS")
}
neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 41439ab453..7f5a87461d 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -46,6 +46,7 @@
<entityField>
<name>INFO</name>
<title>Info</title>
+ <contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 49cf110412..feef456053 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -7,6 +7,7 @@
<filterview>SalesprojectFilter_view</filterview>
<editview>SalesprojectEdit_view</editview>
<preview>SalesprojectPreview_view</preview>
+ <lookupview>SalesprojectFilter_view</lookupview>
<entity>Salesproject_entity</entity>
<references>
<neonViewReference>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 09dda8d565..a5549a7bf9 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -11,6 +11,7 @@
<children>
<tableViewTemplate>
<name>Entries</name>
+ <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
--
GitLab
From 988fe88d42a9119e34fe9c4461058f956ff6e301 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 13:08:47 +0100
Subject: [PATCH 119/250] Angebot kopieren / neue Version: Felder werden nicht
mit vorbelegt
---
.../entityfields/copyoffer/onActionProcess.js | 4 +++-
process/Offer_lib/process.js | 20 ++++++++++---------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
index accad62bfb..3165252cb4 100644
--- a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
@@ -9,6 +9,8 @@ var header = vars.getString("$field.HEADER");
var offerId = vars.getString("$field.OFFERID");
var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
var paymentTerm = vars.getString("$field.PAYMENTTERMS");
+var salesprojectId = vars.getString("$field.SALESPROJECT_ID");
-OfferUtils.copyOffer(offerId, contactId, language, currency, header, deliveryTerm, paymentTerm);
+
+OfferUtils.copyOffer(offerId, contactId, language, currency, header, deliveryTerm, paymentTerm, salesprojectId);
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index b4c8bea33f..74283a23c2 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -283,15 +283,16 @@ OfferUtils.openOfferReport = function (pOfferID)
/**
* opens an offer in NEW mode with values from an offer
*
- * @param pOfferId {String} id of the offer
- * @param pContactId {String} contact id
- * @param pLanguage {String} language
- * @param pCurrency {String} [currency=""]
- * @param pHeader {String} [header=""]
- * @param pDeliveryTerm {String} [deliveryTerm=""]
- * @param pPaymentTerm {String} [paymentTerm=""]
+ * @param {String} pOfferId of the offer
+ * @param {String} pContactId
+ * @param {String} pLanguage
+ * @param {String} [pCurrency=""]
+ * @param {String} [pHeader=""]
+ * @param {String} [pDeliveryTerm=""]
+ * @param {String} [pPaymentTerm=""]
+ * @param {String} [pSalesprojectId=""]
*/
-OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader, pDeliveryTerm, pPaymentTerm)
+OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader, pDeliveryTerm, pPaymentTerm, pSalesprojectId)
{
var params = {
"ContactId_param" : pContactId,
@@ -300,7 +301,8 @@ OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHe
"OfferCurrency_param" : pCurrency || "",
"OfferHeader_param" : pHeader || "",
"OfferDeliveryTerm_param" : pDeliveryTerm || "",
- "OfferPaymentTerm_param" : pPaymentTerm || ""
+ "OfferPaymentTerm_param" : pPaymentTerm || "",
+ "SalesprojectId_param" : pSalesprojectId || ""
};
neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
}
--
GitLab
From dbbc2f90ced1bb59b92add61eac0d2bb9c537264 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 13:29:03 +0100
Subject: [PATCH 120/250] OfferItem edit view
---
neonContext/Offeritem/Offeritem.aod | 5 ++
.../OfferitemEdit_view/OfferitemEdit_view.aod | 51 +++++++++++++++++++
.../OfferitemFilter_view.aod | 1 -
3 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 neonView/OfferitemEdit_view/OfferitemEdit_view.aod
diff --git a/neonContext/Offeritem/Offeritem.aod b/neonContext/Offeritem/Offeritem.aod
index b028ec42f1..6a8a4c7a18 100644
--- a/neonContext/Offeritem/Offeritem.aod
+++ b/neonContext/Offeritem/Offeritem.aod
@@ -4,6 +4,7 @@
<title>Offeritem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>OfferitemFilter_view</filterview>
+ <editview>OfferitemEdit_view</editview>
<preview>OfferitemPreview_view</preview>
<entity>Offeritem_entity</entity>
<references>
@@ -19,5 +20,9 @@
<name>440a19f2-4893-47b9-b10c-864540b6287f</name>
<view>OfferitemMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>9571eef4-1b84-4f4f-9109-7c5f63571a93</name>
+ <view>OfferitemEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
new file mode 100644
index 0000000000..0286bfb270
--- /dev/null
+++ b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
@@ -0,0 +1,51 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>OfferitemEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>a1d02350-10ed-4189-ab65-e750121a7efd</name>
+ <entityField>ITEMPOSITION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>18f778d3-5672-48c5-b0f7-2c062662f9d1</name>
+ <entityField>PRODUCT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e280db0c-0ac2-40d4-95c2-b59268c4f663</name>
+ <entityField>QUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f7bb223a-ab77-45b5-b6c0-9c8f4d478999</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
+ <entityField>PRICE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c0a22aa4-b09d-4d8b-8d24-1750eb7ba5ca</name>
+ <entityField>VAT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e40aa70c-2a6a-4ff4-818f-0a56bc4c63f4</name>
+ <entityField>OPTIONAL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8df0d334-f0d8-4905-a7b1-e71576f3b24f</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index bcd71df78a..9a10ee740c 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -11,7 +11,6 @@
<children>
<tableViewTemplate>
<name>Offeritems</name>
- <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
--
GitLab
From 1cd272c341379e99c761c9716ade5c7becf39cfe Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 28 Mar 2019 13:53:00 +0100
Subject: [PATCH 121/250] add read-only KeywordAttributeRelations in
KeywordEntry for better clarity.
---
.../KeywordAttributeRelation_entity.aod | 6 +++
.../KeywordEntry_entity.aod | 18 +++++++++
.../keywordentryid_param/valueProcess.js | 4 ++
.../documentation.adoc | 2 +
.../KeywordAttributeRelation.aod | 4 ++
neonContext/KeywordEntry/KeywordEntry.aod | 4 ++
.../KeywordAttriubteRelationTitled_view.aod | 26 +++++++++++++
.../KeywordEntryMainSide_view.aod | 37 +++++++++++++++++++
.../KeywordEntryMain_view.aod | 6 +--
.../KeywordEntryPreview_view.aod | 5 +++
report/Offer_report/reportData.jrxml | 2 +-
11 files changed, 110 insertions(+), 4 deletions(-)
create mode 100644 entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js
create mode 100644 entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc
create mode 100644 neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
create mode 100644 neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 5a7e7aea17..2930020424 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -51,6 +51,12 @@
<fieldName>KeywordAttributeRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>53b35858-7c81-429c-9e06-0362f567ad42</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>KeywordAttributeRelationsReadOnly</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index abec1dc43c..71b9ee7e29 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -409,6 +409,24 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordAttributeRelationsReadOnly</name>
+ <title>Keyword Attribute Values</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
+ <state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttributeRelation_entity</entityName>
+ <fieldName>AttributesForKeywordEntry</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js b/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js
new file mode 100644
index 0000000000..53afbdfbbf
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.AB_KEYWORD_ENTRYID"));
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc b/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc
new file mode 100644
index 0000000000..99874edc30
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc
@@ -0,0 +1,2 @@
+Since it's not possible to limit the keywordAttributeRelation to a distinctive list (use a KeywordAttributeRelation "category" only once per keyowrd-entry) within the generic-multiple-template / titledList-template use this readonly consumer there.
+For editing use the not-read-only consumer in a list-template. In a list-template only one row can be changed (and stored) which means we can exlucde already stored entries.
\ No newline at end of file
diff --git a/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod b/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
index d0d5276671..0270a99f81 100644
--- a/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
+++ b/neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
@@ -9,5 +9,9 @@
<name>4340ec15-39bd-4c0c-a7b9-c03829f9ff78</name>
<view>KeywordAttributeRelationRows_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>c27dbf5c-1a3d-4256-9103-bbf5256b005b</name>
+ <view>KeywordAttriubteRelationTitled_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/KeywordEntry/KeywordEntry.aod b/neonContext/KeywordEntry/KeywordEntry.aod
index 6b52464295..7a7310575c 100644
--- a/neonContext/KeywordEntry/KeywordEntry.aod
+++ b/neonContext/KeywordEntry/KeywordEntry.aod
@@ -26,5 +26,9 @@
<name>bba3520e-3e12-44e9-89dc-b42183e332ec</name>
<view>KeywordEntryMain_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>fb697cca-5e7d-4814-a6ed-09f32f9f60fd</name>
+ <view>KeywordEntryMainSide_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod b/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
new file mode 100644
index 0000000000..396943e647
--- /dev/null
+++ b/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
@@ -0,0 +1,26 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>KeywordAttriubteRelationTitled_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>mainList</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>9426ded9-a818-424e-8dd6-397dc439fffc</name>
+ <entityField>AB_KEYWORD_ATTRIBUTE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>35d71c73-cd55-4f45-8a22-22ac6ae7049d</name>
+ <entityField>valueProxy</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod b/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
new file mode 100644
index 0000000000..853a9789c4
--- /dev/null
+++ b/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
@@ -0,0 +1,37 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>KeywordEntryMainSide_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <titleField>TITLE</titleField>
+ <subtitleField>CONTAINER</subtitleField>
+ <descriptionField>KEYID</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>12e16874-32ee-47d7-b9d7-acaa32ca0402</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>74f8f491-43e2-4de5-b1c6-c83055b4ffa1</name>
+ <entityField>ISESSENTIAL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5608493f-90b5-4baf-9114-63cb6a2e85bf</name>
+ <entityField>SORTING</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod b/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
index c65f5e238e..0eeea0860f 100644
--- a/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
+++ b/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
@@ -5,14 +5,14 @@
<layout>
<masterSlaveLayout>
<name>layout</name>
- <master>19d059ec-7b77-4662-ad0b-14f43c76272e</master>
+ <master>267eb426-08d6-4699-9b9f-743c9c071463</master>
</masterSlaveLayout>
</layout>
<children>
<neonViewReference>
- <name>19d059ec-7b77-4662-ad0b-14f43c76272e</name>
+ <name>267eb426-08d6-4699-9b9f-743c9c071463</name>
<entityField>#ENTITY</entityField>
- <view>KeywordEntryPreview_view</view>
+ <view>KeywordEntryMainSide_view</view>
</neonViewReference>
<neonViewReference>
<name>e722eb4b-5737-4801-b6e4-550fca43963a</name>
diff --git a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
index 497dbe3837..9956bc5eab 100644
--- a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
+++ b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
@@ -35,5 +35,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>31f3e341-19b3-452e-a381-942c9860f696</name>
+ <entityField>KeywordAttributeRelationsReadOnly</entityField>
+ <view>KeywordAttriubteRelationTitled_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index 655c1c8169..621f6a5eed 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -24,7 +24,7 @@
<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
<parameter name="responsible" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic5.1\\report\\Offer_report\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\adito\\0.0\\project\\basic 2019\\report\\Offer_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
--
GitLab
From 619e790da5a9ecf873c9f57a2e16f519690f8b12 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 28 Mar 2019 14:03:57 +0100
Subject: [PATCH 122/250] refactor: liquibase: system-alias
---
.../init}/data/defaultBlob/_____configuration.xml | 0
.../data/defaultBlob/_____system_sysdb_version.xml | 0
.../basic/init}/data/defaultBlob/data_alias.xml | 0
.../example_asys_binaries/Birgit_Leicht_Image.xml | 0
.../example_asys_binaries/Harold_Smith_Image.xml | 0
.../Herbert_Obermeier_Image.xml | 0
.../example_asys_binaries/Lisa_Sommer_Image.xml | 0
.../example_asys_binaries/Susanne_Lustig_Image.xml | 0
.../example_asys_binaries/blob/Birgit_Leicht.png | Bin
.../blob/Birgit_Leicht_preview.jpeg | Bin
.../example_asys_binaries/blob/Harold_Smith.png | Bin
.../blob/Harold_Smith_preview.jpeg | Bin
.../blob/Herbert_Obermeier.png | Bin
.../blob/Herbert_Obermeier_preview.jpeg | Bin
.../data/example_asys_binaries/blob/Lisa_Sommer.png | Bin
.../blob/Lisa_Sommer_preview.jpeg | Bin
.../example_asys_binaries/blob/Susanne_Lustig.png | Bin
.../blob/Susanne_Lustig_preview.jpeg | Bin
.../init}/data/example_asys_users/Birgit_Leicht.xml | 0
.../init}/data/example_asys_users/Harold_Smith.xml | 0
.../data/example_asys_users/Herbert_Obermeier.xml | 0
.../init}/data/example_asys_users/Lisa_Sommer.xml | 0
.../data/example_asys_users/Susanne_Lustig.xml | 0
.../basic/init}/data/insert_asys_aliasconfig.xml | 0
.../basic/init}/data/insert_asys_system.xml | 0
.../basic/init}/data/insert_asys_users-admin.xml | 0
.../basic/init/init.xml} | 0
.../basic/init}/struct/create_asys_aliasconfig.xml | 0
.../basic/init}/struct/create_asys_binaries.xml | 0
.../init}/struct/create_asys_calendarbackend.xml | 0
.../basic/init}/struct/create_asys_calendarlink.xml | 0
.../struct/create_asys_dashletconfigurations.xml | 0
.../basic/init}/struct/create_asys_dashlets.xml | 0
.../init}/struct/create_asys_notifications.xml | 0
.../basic/init}/struct/create_asys_sequences.xml | 0
.../basic/init}/struct/create_asys_system.xml | 0
.../basic/init}/struct/create_asys_timer.xml | 0
.../basic/init}/struct/create_asys_users.xml | 0
.../basic/init}/system_aliasTestdata.xml | 0
others/db_changes/_____SYSTEMALIAS/changelog.xml | 4 ++++
40 files changed, 4 insertions(+)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/defaultBlob/_____configuration.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/defaultBlob/_____system_sysdb_version.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/defaultBlob/data_alias.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/Birgit_Leicht_Image.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/Harold_Smith_Image.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/Herbert_Obermeier_Image.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/Lisa_Sommer_Image.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/Susanne_Lustig_Image.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Birgit_Leicht.png (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Harold_Smith.png (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Herbert_Obermeier.png (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Lisa_Sommer.png (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Susanne_Lustig.png (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_users/Birgit_Leicht.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_users/Harold_Smith.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_users/Herbert_Obermeier.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_users/Lisa_Sommer.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/example_asys_users/Susanne_Lustig.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/insert_asys_aliasconfig.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/insert_asys_system.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/data/insert_asys_users-admin.xml (100%)
rename others/db_changes/{system_alias/EXPERIMENTAL_system_aliasDefault.xml => _____SYSTEMALIAS/basic/init/init.xml} (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_aliasconfig.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_binaries.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_calendarbackend.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_calendarlink.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_dashletconfigurations.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_dashlets.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_notifications.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_sequences.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_system.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_timer.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/struct/create_asys_users.xml (100%)
rename others/db_changes/{system_alias => _____SYSTEMALIAS/basic/init}/system_aliasTestdata.xml (100%)
create mode 100644 others/db_changes/_____SYSTEMALIAS/changelog.xml
diff --git a/others/db_changes/system_alias/data/defaultBlob/_____configuration.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
similarity index 100%
rename from others/db_changes/system_alias/data/defaultBlob/_____configuration.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
diff --git a/others/db_changes/system_alias/data/defaultBlob/_____system_sysdb_version.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
similarity index 100%
rename from others/db_changes/system_alias/data/defaultBlob/_____system_sysdb_version.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
diff --git a/others/db_changes/system_alias/data/defaultBlob/data_alias.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
similarity index 100%
rename from others/db_changes/system_alias/data/defaultBlob/data_alias.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Harold_Smith_Image.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/Harold_Smith_Image.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Birgit_Leicht.png b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Birgit_Leicht.png
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Harold_Smith.png b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Harold_Smith.png
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Herbert_Obermeier.png b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Herbert_Obermeier.png
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Lisa_Sommer.png b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Lisa_Sommer.png
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Susanne_Lustig.png b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Susanne_Lustig.png
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
diff --git a/others/db_changes/system_alias/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
diff --git a/others/db_changes/system_alias/data/example_asys_users/Birgit_Leicht.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_users/Birgit_Leicht.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
diff --git a/others/db_changes/system_alias/data/example_asys_users/Harold_Smith.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_users/Harold_Smith.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
diff --git a/others/db_changes/system_alias/data/example_asys_users/Herbert_Obermeier.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_users/Herbert_Obermeier.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
diff --git a/others/db_changes/system_alias/data/example_asys_users/Lisa_Sommer.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_users/Lisa_Sommer.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
diff --git a/others/db_changes/system_alias/data/example_asys_users/Susanne_Lustig.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
similarity index 100%
rename from others/db_changes/system_alias/data/example_asys_users/Susanne_Lustig.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
diff --git a/others/db_changes/system_alias/data/insert_asys_aliasconfig.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
similarity index 100%
rename from others/db_changes/system_alias/data/insert_asys_aliasconfig.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
diff --git a/others/db_changes/system_alias/data/insert_asys_system.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
similarity index 100%
rename from others/db_changes/system_alias/data/insert_asys_system.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
diff --git a/others/db_changes/system_alias/data/insert_asys_users-admin.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
similarity index 100%
rename from others/db_changes/system_alias/data/insert_asys_users-admin.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
diff --git a/others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/init.xml
similarity index 100%
rename from others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/init.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_aliasconfig.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_aliasconfig.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_binaries.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_binaries.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_calendarbackend.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_calendarbackend.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_calendarlink.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_calendarlink.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_dashletconfigurations.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_dashletconfigurations.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_dashlets.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_dashlets.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_notifications.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_notifications.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_sequences.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_sequences.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_system.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_system.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_timer.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_timer.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
diff --git a/others/db_changes/system_alias/struct/create_asys_users.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
similarity index 100%
rename from others/db_changes/system_alias/struct/create_asys_users.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
diff --git a/others/db_changes/system_alias/system_aliasTestdata.xml b/others/db_changes/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
similarity index 100%
rename from others/db_changes/system_alias/system_aliasTestdata.xml
rename to others/db_changes/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/changelog.xml b/others/db_changes/_____SYSTEMALIAS/changelog.xml
new file mode 100644
index 0000000000..5fea0f98a1
--- /dev/null
+++ b/others/db_changes/_____SYSTEMALIAS/changelog.xml
@@ -0,0 +1,4 @@
+<?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 file="basic/init/init.xml"/>
+</databaseChangeLog>
--
GitLab
From 699353b97b3123d12fb0fdc406bda7d1d4f1e560 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 28 Mar 2019 14:04:57 +0100
Subject: [PATCH 123/250] data_alias -> Data_alias
---
.../basic/2019.2/AditoBasic/init_ActivityCategory.xml | 0
.../basic/2019.2/AditoBasic/init_AddressType.xml | 0
.../2019.2/AditoBasic/init_AttributeKeyword_target_group.xml | 0
.../basic/2019.2/AditoBasic/init_AttributeType.xml | 0
.../basic/2019.2/AditoBasic/init_CommunicationMedium.xml | 0
.../basic/2019.2/AditoBasic/init_ContactContactrole.xml | 0
.../basic/2019.2/AditoBasic/init_ContactDepartment.xml | 0
.../basic/2019.2/AditoBasic/init_ContactPosition.xml | 0
.../basic/2019.2/AditoBasic/init_DeliveryTerm.xml | 0
.../basic/2019.2/AditoBasic/init_OfferProbability.xml | 0
.../basic/2019.2/AditoBasic/init_PaymentTerm.xml | 0
.../basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml | 0
.../basic/2019.2/AditoBasic/init_SalesprojectPhase.xml | 0
.../basic/2019.2/AditoBasic/init_SalesprojectState.xml | 0
.../basic/2019.2/AditoBasic/init_TaskPriority.xml | 0
.../basic/2019.2/AditoBasic/init_TaskProgress.xml | 0
.../basic/2019.2/AditoBasic/insert_offer_status_keyword.xml | 0
.../basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml | 0
.../basic/2019.2/AditoBasic/update_Strength_Weakness.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/AttributeKeyword.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/ChangeNotes.txt | 0
.../basic/2019.2/Contact_add_columns.xml | 0
.../2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml | 0
.../basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml | 0
.../2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml | 0
.../2019.2/KeywordRelatedStructureChanges/OfferProbability.xml | 0
.../SalesProjectCompetitionPhase.xml | 0
.../2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml | 0
.../KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml | 0
.../2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml | 0
.../KeywordRelatedStructureChanges/SalesProjectStrength.xml | 0
.../KeywordRelatedStructureChanges/SalesProjectWeakness.xml | 0
.../SalesprojectCompetitionState.xml | 0
.../basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/Offer_terms.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/Product_remove_fk.xml | 0
.../basic/2019.2/SalesOrder_source_offer.xml | 0
.../basic/2019.2/Salesproject_add_column.xml | 0
.../basic/2019.2/activity_add_date_editnew_user_editnew.xml | 0
.../basic/2019.2/activity_add_parent.xml | 0
.../basic/2019.2/activitylink_add_date_editnew_user_editnew.xml | 0
.../basic/2019.2/add_ObjectRelation_type.xml | 0
.../basic/2019.2/address_add_date_editnew_user_editnew.xml | 0
.../2019.2/attributerelation_add_date_editnew_user_editnew.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/changelog.xml | 0
.../basic/2019.2/communication_add_date_editnew_user_editnew.xml | 0
.../basic/2019.2/contact_add_date_editnew_user_editnew.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/create_salutation.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/create_taskLink.xml | 0
.../basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml | 0
.../basic/2019.2/data/ORGANISATION_private.xml | 0
.../basic/2019.2/data/example_activity/ACTIVITY_gfk.xml | 0
.../2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt | 0
.../2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt | 0
.../basic/2019.2/data/example_attribute/Attribute.xml | 0
.../basic/2019.2/data/example_attribute/AttributeUsage.xml | 0
.../basic/2019.2/data/example_contract/CONTRACT_1000.xml | 0
.../basic/2019.2/data/example_contract/CONTRACT_1001.xml | 0
.../basic/2019.2/data/example_contract/CONTRACT_1002.xml | 0
.../basic/2019.2/data/example_contract/CONTRACT_1003.xml | 0
.../basic/2019.2/data/example_contract/CONTRACT_1004.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1000.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1001.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1002.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1003.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1004.xml | 0
.../basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml | 0
.../data/example_organisation/ORGANISATION_kaeltetechnik.xml | 0
.../data/example_organisation/ORGANISATION_lichtenstein.xml | 0
.../basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml | 0
.../2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml | 0
.../basic/2019.2/data/example_person/PERSON_gruener.xml | 0
.../basic/2019.2/data/example_person/PERSON_kanzler.xml | 0
.../basic/2019.2/data/example_person/PERSON_leicht.xml | 0
.../basic/2019.2/data/example_person/PERSON_lustig.xml | 0
.../basic/2019.2/data/example_person/PERSON_muller.xml | 0
.../basic/2019.2/data/example_person/PERSON_obermeier.xml | 0
.../basic/2019.2/data/example_person/PERSON_pfiffig.xml | 0
.../basic/2019.2/data/example_person/PERSON_smith.xml | 0
.../basic/2019.2/data/example_person/PERSON_sommer.xml | 0
.../basic/2019.2/data/example_product/PRODUCT_42154311.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1000.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1001.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1002.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1003.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1004.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1005.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1006.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1007.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1008.xml | 0
.../basic/2019.2/data/example_salesorder/SALESORDER_1009.xml | 0
.../basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml | 0
.../basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml | 0
.../basic/2019.2/data/example_task/base.xml | 0
.../basic/2019.2/drop_contact_id_sp_forecast.xml | 0
.../basic/2019.2/drop_estimation_salesproject.xml | 0
.../basic/2019.2/drop_pricePolitics-weakness-strength.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/fix_sp_phases.xml | 0
.../basic/2019.2/offer_add_date_editnew_user_editnew.xml | 0
.../basic/2019.2/organisation_add_date_editnew_user_editnew.xml | 0
.../basic/2019.2/person_add_date_editnew_user_editnew.xml | 0
.../basic/2019.2/product_add_date_editnew_user_editnew.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/removeTaskCode.xml | 0
.../{data_alias => Data_alias}/basic/2019.2/task_add_parent.xml | 0
.../basic/2019.2/update_TaskType_Task.xml | 0
.../basic/2019.2/update_pricelist_keyword.xml | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg | 0
.../data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg | 0
.../init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml | 0
.../basic/init/data/AditoBasic/ab_keyword_attribute.xml | 0
.../init_SalesprojectProbability_percentValue.xml | 0
.../basic/init/data/AditoBasic/ab_keyword_entry.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml | 0
.../basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml | 0
.../AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml | 0
.../AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml | 0
.../ab_keyword_entry/init_SalesprojectPricePolitics.xml | 0
.../AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml | 0
.../AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml | 0
.../AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml | 0
.../data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml | 0
.../init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml | 0
.../basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml | 0
.../basic/init/data/AditoBasic/init_ab_language.xml | 0
others/db_changes/{data_alias => Data_alias}/basic/init/init.xml | 0
.../basic/init/struct/AditoBasic/create_ab_attribute.xml | 0
.../basic/init/struct/AditoBasic/create_ab_attributerelation.xml | 0
.../basic/init/struct/AditoBasic/create_ab_attributeusage.xml | 0
.../basic/init/struct/AditoBasic/create_ab_countryinfo.xml | 0
.../basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml | 0
.../struct/AditoBasic/create_ab_keyword_attributerelation.xml | 0
.../basic/init/struct/AditoBasic/create_ab_keyword_entry.xml | 0
.../basic/init/struct/AditoBasic/create_ab_language.xml | 0
.../basic/init/struct/AditoBasic/create_ab_objectrelation.xml | 0
.../basic/init/struct/create_activity.xml | 0
.../basic/init/struct/create_activitylink.xml | 0
.../basic/init/struct/create_address.xml | 0
.../basic/init/struct/create_appointmentlink.xml | 0
.../basic/init/struct/create_communication.xml | 0
.../basic/init/struct/create_contact.xml | 0
.../basic/init/struct/create_contract.xml | 0
.../{data_alias => Data_alias}/basic/init/struct/create_offer.xml | 0
.../basic/init/struct/create_offeritem.xml | 0
.../basic/init/struct/create_organisation.xml | 0
.../basic/init/struct/create_person.xml | 0
.../basic/init/struct/create_prod2prod.xml | 0
.../basic/init/struct/create_product.xml | 0
.../basic/init/struct/create_productprice.xml | 0
.../basic/init/struct/create_salesorder.xml | 0
.../basic/init/struct/create_salesorderitem.xml | 0
.../basic/init/struct/create_salesproject.xml | 0
.../basic/init/struct/create_salesproject_classification.xml | 0
.../basic/init/struct/create_salesproject_competition.xml | 0
.../basic/init/struct/create_salesproject_cycle.xml | 0
.../basic/init/struct/create_salesproject_forecast.xml | 0
.../basic/init/struct/create_salesproject_member.xml | 0
.../basic/init/struct/create_salesproject_source.xml | 0
.../{data_alias => Data_alias}/basic/init/struct/create_stock.xml | 0
.../{data_alias => Data_alias}/basic/init/struct/create_task.xml | 0
.../basic/init/struct/create_timetracking.xml | 0
others/db_changes/{data_alias => Data_alias}/changelog.xml | 0
423 files changed, 0 insertions(+), 0 deletions(-)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_ActivityCategory.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_AddressType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_AttributeType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_CommunicationMedium.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_ContactContactrole.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_ContactDepartment.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_ContactPosition.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_DeliveryTerm.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_OfferProbability.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_PaymentTerm.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_SalesprojectState.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_TaskPriority.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/init_TaskProgress.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AditoBasic/update_Strength_Weakness.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/AttributeKeyword.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/ChangeNotes.txt (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/Contact_add_columns.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/Offer_terms.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/Product_remove_fk.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/SalesOrder_source_offer.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/Salesproject_add_column.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/activity_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/activity_add_parent.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/add_ObjectRelation_type.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/address_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/changelog.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/communication_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/contact_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/create_salutation.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/create_taskLink.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/ORGANISATION_private.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_attribute/Attribute.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_attribute/AttributeUsage.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_contract/CONTRACT_1000.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_contract/CONTRACT_1001.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_contract/CONTRACT_1002.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_contract/CONTRACT_1003.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_contract/CONTRACT_1004.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_offer/OFFER_1000.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_offer/OFFER_1001.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_offer/OFFER_1002.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_offer/OFFER_1003.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_offer/OFFER_1004.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_gruener.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_kanzler.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_leicht.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_lustig.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_muller.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_obermeier.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_pfiffig.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_smith.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_person/PERSON_sommer.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_product/PRODUCT_42154311.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/data/example_task/base.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/drop_contact_id_sp_forecast.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/drop_estimation_salesproject.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/drop_pricePolitics-weakness-strength.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/fix_sp_phases.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/offer_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/organisation_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/person_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/product_add_date_editnew_user_editnew.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/removeTaskCode.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/task_add_parent.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/update_TaskType_Task.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/2019.2/update_pricelist_keyword.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_attribute.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/data/AditoBasic/init_ab_language.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/init.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_attribute.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_attributerelation.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_attributeusage.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_countryinfo.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_language.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/AditoBasic/create_ab_objectrelation.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_activity.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_activitylink.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_address.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_appointmentlink.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_communication.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_contact.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_contract.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_offer.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_offeritem.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_organisation.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_person.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_prod2prod.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_product.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_productprice.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesorder.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesorderitem.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesproject.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesproject_classification.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesproject_competition.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesproject_cycle.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesproject_forecast.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesproject_member.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_salesproject_source.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_stock.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_task.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/basic/init/struct/create_timetracking.xml (100%)
rename others/db_changes/{data_alias => Data_alias}/changelog.xml (100%)
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AddressType.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
rename to others/db_changes/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml b/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml
rename to others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt b/others/db_changes/Data_alias/basic/2019.2/ChangeNotes.txt
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
rename to others/db_changes/Data_alias/basic/2019.2/ChangeNotes.txt
diff --git a/others/db_changes/data_alias/basic/2019.2/Contact_add_columns.xml b/others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/Contact_add_columns.xml
rename to others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml b/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
rename to others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/Offer_terms.xml b/others/db_changes/Data_alias/basic/2019.2/Offer_terms.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/Offer_terms.xml
rename to others/db_changes/Data_alias/basic/2019.2/Offer_terms.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/Product_remove_fk.xml b/others/db_changes/Data_alias/basic/2019.2/Product_remove_fk.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/Product_remove_fk.xml
rename to others/db_changes/Data_alias/basic/2019.2/Product_remove_fk.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesOrder_source_offer.xml b/others/db_changes/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesOrder_source_offer.xml
rename to others/db_changes/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/Salesproject_add_column.xml b/others/db_changes/Data_alias/basic/2019.2/Salesproject_add_column.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/Salesproject_add_column.xml
rename to others/db_changes/Data_alias/basic/2019.2/Salesproject_add_column.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml b/others/db_changes/Data_alias/basic/2019.2/activity_add_parent.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml
rename to others/db_changes/Data_alias/basic/2019.2/activity_add_parent.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml b/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml
rename to others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/changelog.xml
rename to others/db_changes/Data_alias/basic/2019.2/changelog.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/create_salutation.xml b/others/db_changes/Data_alias/basic/2019.2/create_salutation.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/create_salutation.xml
rename to others/db_changes/Data_alias/basic/2019.2/create_salutation.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/create_taskLink.xml b/others/db_changes/Data_alias/basic/2019.2/create_taskLink.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/create_taskLink.xml
rename to others/db_changes/Data_alias/basic/2019.2/create_taskLink.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/ORGANISATION_private.xml b/others/db_changes/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/ORGANISATION_private.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt b/others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
rename to others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt b/others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
rename to others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_smith.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_task/base.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
rename to others/db_changes/Data_alias/basic/2019.2/data/example_task/base.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml b/others/db_changes/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
rename to others/db_changes/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml b/others/db_changes/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml
rename to others/db_changes/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml b/others/db_changes/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
rename to others/db_changes/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/fix_sp_phases.xml b/others/db_changes/Data_alias/basic/2019.2/fix_sp_phases.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/fix_sp_phases.xml
rename to others/db_changes/Data_alias/basic/2019.2/fix_sp_phases.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml b/others/db_changes/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
rename to others/db_changes/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml b/others/db_changes/Data_alias/basic/2019.2/removeTaskCode.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
rename to others/db_changes/Data_alias/basic/2019.2/removeTaskCode.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/task_add_parent.xml b/others/db_changes/Data_alias/basic/2019.2/task_add_parent.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/task_add_parent.xml
rename to others/db_changes/Data_alias/basic/2019.2/task_add_parent.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml b/others/db_changes/Data_alias/basic/2019.2/update_TaskType_Task.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml
rename to others/db_changes/Data_alias/basic/2019.2/update_TaskType_Task.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/update_pricelist_keyword.xml b/others/db_changes/Data_alias/basic/2019.2/update_pricelist_keyword.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/update_pricelist_keyword.xml
rename to others/db_changes/Data_alias/basic/2019.2/update_pricelist_keyword.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
diff --git a/others/db_changes/data_alias/basic/init/data/AditoBasic/init_ab_language.xml b/others/db_changes/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/data/AditoBasic/init_ab_language.xml
rename to others/db_changes/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
diff --git a/others/db_changes/data_alias/basic/init/init.xml b/others/db_changes/Data_alias/basic/init/init.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/init.xml
rename to others/db_changes/Data_alias/basic/init/init.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_language.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml b/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
rename to others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_activity.xml b/others/db_changes/Data_alias/basic/init/struct/create_activity.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_activity.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_activity.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_activitylink.xml b/others/db_changes/Data_alias/basic/init/struct/create_activitylink.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_activitylink.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_activitylink.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_address.xml b/others/db_changes/Data_alias/basic/init/struct/create_address.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_address.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_address.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_appointmentlink.xml b/others/db_changes/Data_alias/basic/init/struct/create_appointmentlink.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_appointmentlink.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_appointmentlink.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_communication.xml b/others/db_changes/Data_alias/basic/init/struct/create_communication.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_communication.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_communication.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_contact.xml b/others/db_changes/Data_alias/basic/init/struct/create_contact.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_contact.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_contact.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_contract.xml b/others/db_changes/Data_alias/basic/init/struct/create_contract.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_contract.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_contract.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_offer.xml b/others/db_changes/Data_alias/basic/init/struct/create_offer.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_offer.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_offer.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_offeritem.xml b/others/db_changes/Data_alias/basic/init/struct/create_offeritem.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_offeritem.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_offeritem.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_organisation.xml b/others/db_changes/Data_alias/basic/init/struct/create_organisation.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_organisation.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_organisation.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_person.xml b/others/db_changes/Data_alias/basic/init/struct/create_person.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_person.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_person.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_prod2prod.xml b/others/db_changes/Data_alias/basic/init/struct/create_prod2prod.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_prod2prod.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_prod2prod.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_product.xml b/others/db_changes/Data_alias/basic/init/struct/create_product.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_product.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_product.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_productprice.xml b/others/db_changes/Data_alias/basic/init/struct/create_productprice.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_productprice.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_productprice.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesorder.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesorder.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesorder.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesorder.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesorderitem.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesorderitem.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesorderitem.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesorderitem.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesproject.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesproject.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesproject.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesproject.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesproject_classification.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesproject_classification.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesproject_classification.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesproject_classification.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesproject_competition.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesproject_competition.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesproject_competition.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesproject_competition.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesproject_cycle.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesproject_cycle.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesproject_cycle.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesproject_cycle.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesproject_forecast.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesproject_forecast.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesproject_forecast.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesproject_forecast.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesproject_member.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesproject_member.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesproject_member.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesproject_member.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_salesproject_source.xml b/others/db_changes/Data_alias/basic/init/struct/create_salesproject_source.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_salesproject_source.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_salesproject_source.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_stock.xml b/others/db_changes/Data_alias/basic/init/struct/create_stock.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_stock.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_stock.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_task.xml b/others/db_changes/Data_alias/basic/init/struct/create_task.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_task.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_task.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/create_timetracking.xml b/others/db_changes/Data_alias/basic/init/struct/create_timetracking.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/create_timetracking.xml
rename to others/db_changes/Data_alias/basic/init/struct/create_timetracking.xml
diff --git a/others/db_changes/data_alias/changelog.xml b/others/db_changes/Data_alias/changelog.xml
similarity index 100%
rename from others/db_changes/data_alias/changelog.xml
rename to others/db_changes/Data_alias/changelog.xml
--
GitLab
From 38772a3a03743164a8d85e80a584684745f36556 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Thu, 28 Mar 2019 14:09:27 +0100
Subject: [PATCH 124/250] ActivityFilter: Timeline: Set hideTime to true
---
neonView/ActivityFilter_view/ActivityFilter_view.aod | 1 +
1 file changed, 1 insertion(+)
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index cc9515e573..655915a687 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -61,6 +61,7 @@
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>INFO</descriptionField>
<iconIdField>DIRECTION_ICON</iconIdField>
+ <hideTime v="true" />
<entityField>#ENTITY</entityField>
</timelineViewTemplate>
<tableViewTemplate>
--
GitLab
From 66f97427e5dd01a48b2940d3b4d0924e745e40b5 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Thu, 28 Mar 2019 14:46:50 +0100
Subject: [PATCH 125/250] Organisation_report: Only show attributes when any
are available
---
report/Organisation_report/reportData.jrxml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/report/Organisation_report/reportData.jrxml b/report/Organisation_report/reportData.jrxml
index 77d145f5a1..b0c34aca47 100644
--- a/report/Organisation_report/reportData.jrxml
+++ b/report/Organisation_report/reportData.jrxml
@@ -210,7 +210,9 @@
</band>
<band height="19">
<textField>
- <reportElement x="0" y="2" width="100" height="15" forecolor="#0033FF" uuid="4b8833cc-3fda-4a75-ae61-83fbfe995f72"/>
+ <reportElement x="0" y="2" width="100" height="15" forecolor="#0033FF" uuid="4b8833cc-3fda-4a75-ae61-83fbfe995f72">
+ <printWhenExpression><![CDATA[$P{ORGAttr} != null && !$P{ORGAttr}.equals("")]]></printWhenExpression>
+ </reportElement>
<textElement>
<font fontName="Segoe UI" size="8" isUnderline="true"/>
</textElement>
@@ -226,7 +228,9 @@
<textFieldExpression><![CDATA[$P{ORGAttr}]]></textFieldExpression>
</textField>
<frame>
- <reportElement stretchType="RelativeToBandHeight" x="0" y="2" width="555" height="16" uuid="62244829-371e-4972-b91d-cca3c857b15e"/>
+ <reportElement stretchType="RelativeToBandHeight" x="0" y="2" width="555" height="16" isPrintInFirstWholeBand="true" uuid="62244829-371e-4972-b91d-cca3c857b15e">
+ <printWhenExpression><![CDATA[$P{ORGAttr} != null && !$P{ORGAttr}.equals("")]]></printWhenExpression>
+ </reportElement>
<box>
<pen lineWidth="1.0"/>
<topPen lineWidth="1.0"/>
--
GitLab
From 3cd938e99c8704ddc62a52d12af3e4158b2d7e40 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 15:18:51 +0100
Subject: [PATCH 126/250] Offer fixes
---
entity/Offeritem_entity/Offeritem_entity.aod | 3 +
.../entityfields/discount/onValidation.js | 13 ++++
.../entityfields/quantity/onValidation.js | 28 ++++----
.../entityfields/quantity/onValueChange.js | 71 +++++++++----------
.../entityfields/vat/onValidation.js | 13 ++++
.../_____LANGUAGE_EXTRA.aod | 6 ++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 7 ++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 9 +++
.../OfferitemEdit_view/OfferitemEdit_view.aod | 15 ++++
.../OfferitemFilter_view.aod | 5 ++
process/Util_lib/process.js | 59 +++++++++++++++
11 files changed, 177 insertions(+), 52 deletions(-)
create mode 100644 entity/Offeritem_entity/entityfields/discount/onValidation.js
create mode 100644 entity/Productprice_entity/entityfields/vat/onValidation.js
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 236c205986..ec65a90423 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -18,6 +18,7 @@
<title>Discount %</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0</outputFormat>
+ <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
<name>GROUPCODEID</name>
@@ -68,6 +69,7 @@
<title>Article</title>
<consumer>Products</consumer>
<linkedContext>Product</linkedContext>
+ <mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -80,6 +82,7 @@
<title>Quantity</title>
<contentType>NUMBER</contentType>
<outputFormat>#</outputFormat>
+ <mandatory v="true" />
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
diff --git a/entity/Offeritem_entity/entityfields/discount/onValidation.js b/entity/Offeritem_entity/entityfields/discount/onValidation.js
new file mode 100644
index 0000000000..18bd49fe0d
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/discount/onValidation.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.vars");
+import("Util_lib");
+import("Entity_lib");
+
+var value = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DISCOUNT"));
+
+var validationResult = NumberUtils.validateIsInside("Discount", value, 0, 100);
+
+if (validationResult)
+{
+ result.string(validationResult);
+}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValidation.js b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
index aa24a80d84..a7fe04aaf5 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValidation.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValidation.js
@@ -1,16 +1,12 @@
-import("system.logging");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Entity_lib");
-
-logging.log("valid test 1: " + vars.get("$field.QUANTITY"));
-
-var quatity = vars.exists("$field.QUANTITY") ? vars.get("$field.QUANTITY") : "";
-quatity = ProcessHandlingUtils.getOnValidationValue(quatity);
-
-if (parseInt(quatity) <= 0)
-{
- logging("valid test 2: " + vars.get("$field.QUANTITY"));
- result.string(translate.text("${QUANTITY_LOWER_THAN_1}"));
-}
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Entity_lib");
+
+var quatity = vars.exists("$field.QUANTITY") ? vars.get("$field.QUANTITY") : "";
+quatity = ProcessHandlingUtils.getOnValidationValue(quatity);
+
+if (parseInt(quatity) <= 0)
+{
+ result.string(translate.text("${QUANTITY_LOWER_THAN_1}"));
+}
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index dea8c2c669..5076a25842 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -1,37 +1,36 @@
-import("system.logging");
-import("system.vars");
-import("system.neon");
-import("Product_lib");
-import("Util_lib");
-import("Entity_lib");
-import("Attribute_lib");
-
-var pid = vars.get("$field.PRODUCT_ID");
-var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUANTITY"));
-if(pid != "" && newQuantity != "")
-{
- var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
- var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
-
- var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid, priceList: pricelist };
-
- var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
-
- if(ProductDetails.productId != undefined && ProductDetails.PriceListToUse != null)
- {
- vars.set("$field.PRICE", ProductDetails.PriceListToUse.price);
- vars.set("$field.VAT", ProductDetails.PriceListToUse.vat);
- }
-}
-
-
-//checks if the value is <= 0, if so fallback to 1
-var quatity = vars.exists("$field.QUANTITY") ? vars.get("$field.QUANTITY") : "";
-quatity = ProcessHandlingUtils.getOnValidationValue(quatity);
-
-if (parseInt(quatity) <= 0)
-{
- neon.setFieldValue("$field.QUANTITY", "1");
-}
+import("system.vars");
+import("system.neon");
+import("Product_lib");
+import("Util_lib");
+import("Entity_lib");
+import("Attribute_lib");
+
+var pid = vars.get("$field.PRODUCT_ID");
+var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUANTITY"));
+if(pid != "" && newQuantity != "")
+{
+ var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
+
+ var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid, priceList: pricelist };
+
+ var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
+
+ if(ProductDetails.productId != undefined && ProductDetails.PriceListToUse != null)
+ {
+ vars.set("$field.PRICE", ProductDetails.PriceListToUse.price);
+ vars.set("$field.VAT", ProductDetails.PriceListToUse.vat);
+ }
+}
+
+
+//checks if the value is <= 0, if so fallback to 1
+var quatity = vars.exists("$field.QUANTITY") ? vars.get("$field.QUANTITY") : "";
+quatity = ProcessHandlingUtils.getOnValidationValue(quatity);
+
+if (parseInt(quatity) <= 0)
+{
+ neon.setFieldValue("$field.QUANTITY", "1");
+}
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/vat/onValidation.js b/entity/Productprice_entity/entityfields/vat/onValidation.js
new file mode 100644
index 0000000000..974d4c311f
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/vat/onValidation.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.vars");
+import("Util_lib");
+import("Entity_lib");
+
+var value = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.VAT"));
+
+var validationResult = NumberUtils.validateIsInside("VAT", value, 0, 100);
+
+if (validationResult)
+{
+ result.string(validationResult);
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index b9304b3e3d..2e47678c93 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2655,6 +2655,12 @@
<entry>
<key>true</key>
</entry>
+ <entry>
+ <key>Protected</key>
+ </entry>
+ <entry>
+ <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</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 ea1f024278..355302ddf9 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3416,6 +3416,13 @@
<entry>
<key>true</key>
</entry>
+ <entry>
+ <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
+ <value>%0 muss zwischen %2 und %3 sein.</value>
+ </entry>
+ <entry>
+ <key>protected</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 eb9613d23d..f9ebdddbda 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1390,6 +1390,7 @@
</entry>
<entry>
<key>${ORGTYPE_OTHER}</key>
+ <value>Other</value>
</entry>
<entry>
<key>Haiti</key>
@@ -2185,6 +2186,7 @@
</entry>
<entry>
<key>${NUMBER}</key>
+ <value>Number</value>
</entry>
<entry>
<key>Name \"%0\" already used for container \"%1\"</key>
@@ -2680,6 +2682,13 @@
<entry>
<key>true</key>
</entry>
+ <entry>
+ <key>Protected</key>
+ </entry>
+ <entry>
+ <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
+ <value>%0 has to be between %2 and %3.</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
index 0286bfb270..ff753701e6 100644
--- a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
+++ b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
@@ -33,6 +33,10 @@
<name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
<entityField>PRICE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>4f339738-6358-463e-b941-3b2693ab115a</name>
+ <entityField>DISCOUNT</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>c0a22aa4-b09d-4d8b-8d24-1750eb7ba5ca</name>
<entityField>VAT</entityField>
@@ -47,5 +51,16 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <genericViewTemplate>
+ <name>Price</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9200df17-11e2-4a1a-babb-ea48c6f88a93</name>
+ <entityField>TotalPrice</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
</children>
</neonView>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 9a10ee740c..5ec130f3ba 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -11,6 +11,7 @@
<children>
<tableViewTemplate>
<name>Offeritems</name>
+ <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
@@ -49,6 +50,10 @@
<name>a31fd16c-4237-4cd9-a9de-2267f186d342</name>
<entityField>INFO</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>60a36c38-103f-4fdb-9e8a-b8fd6d441f14</name>
+ <entityField>TotalPrice</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index bc9a4fe69f..82af36de2b 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -38,6 +38,65 @@ StringUtils.concat = function(pSeparator, pElements)
return res;
};
+/**
+ * Class containing static utility functions for numbers
+ * Do not create an instance of this
+ *
+ * @class
+ */
+function NumberUtils(){}
+
+/**
+ * Check iv the value is inside of the min / max values.
+ * INCLUDING min / max
+ *
+ * @param {Number} pValue value to check
+ * @param {Number} pMin min value INCLUSIVE
+ * @param {Number} pMax max value INCLUSIVE
+ * @param {Boolean} [pIgnoreNull=true] return True if pValue is null
+ *
+ * @return {Boolean}
+ */
+NumberUtils.isInside = function(pValue, pMin, pMax, pIgnoreNull)
+{
+ if (pIgnoreNull == undefined)
+ pIgnoreNull = true;
+
+ return pValue >= pMin && pValue <= pMax || pIgnoreNull && (pValue == null || isNaN(pValue));
+};
+
+/**
+ * For use in validationProcess. Calls result.string(...) with error message, if number is not inside of the given values
+ * INCLUDING min / max.
+ *
+ * @param {Number} pTitle title to display in error message. Should be the name of the field and it will be translated.
+ * @param {Number} pValue value to check
+ * @param {Number} pMin min value INCLUSIVE
+ * @param {Number} pMax max value INCLUSIVE
+ * @param {Boolean} [pIgnoreNull=true] return True if pValue is null
+ *
+ * @return {String|False} returns the error message or false
+ *
+ * @example
+ * var value = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DISCOUNT")); <br>
+ * <br>
+ * var validationResult = NumberUtils.validateIsInside("Discount", value, 0, 100); <br>
+ * <br>
+ * if (validationResult) <br>
+ * { <br>
+ * result.string(validationResult); <br>
+ * } <br>
+ */
+NumberUtils.validateIsInside = function(pTitle, pValue, pMin, pMax, pIgnoreNull)
+{
+ var discount = parseInt(pValue);
+ if (!NumberUtils.isInside(discount, 0, 100, pIgnoreNull))
+ {
+ return (translate.withArguments("${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3", [translate.text(pTitle), discount, pMin, pMax]));
+ }
+ return false;
+}
+
/**
* Class containing static utility functions for use with arrays
* Do not create an instance of this!
--
GitLab
From 75fefaafc63b36d1c9d53cf284fe8075b3abe503 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 15:52:05 +0100
Subject: [PATCH 127/250] =?UTF-8?q?Salesproject-module=20mit=20l=C3=B6sche?=
=?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Salesproject_entity.aod | 1 +
.../recordcontainers/db/onDBDelete.js | 27 +++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b5e35dc2ed..d292e27ad9 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -523,6 +523,7 @@
<conditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>02eb2f4c-3b85-409f-ac13-c8b26804da44</name>
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000..6d045ce911
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,27 @@
+import("system.db");
+import("system.logging");
+import("system.vars");
+import("Sql_lib");
+
+var currentId = vars.getString("$field.SALESPROJECTID");
+
+if (currentId)
+{
+ var toDelete = [
+ "SALESPROJECT_COMPETITION",
+ "SALESPROJECT_CLASSIFICATION",
+ "SALESPROJECT_CYCLE",
+ "SALESPROJECT_FORECAST",
+ "SALESPROJECT_MEMBER",
+ "SALESPROJECT_SOURCE"
+ ];
+
+ toDelete = toDelete.map(function(pTable)
+ {
+ return [pTable, SqlCondition.equals(pTable + ".SALESPROJECT_ID", currentId, "1=2")]
+ });
+
+ db.deletes(toDelete);
+
+ // TODO: auch Dokumente, Aktivitäten, Aufgaben, Zeiterfassungen löschen?
+}
\ No newline at end of file
--
GitLab
From 502eec38a793b1b301343c1ccffe808c7220f44c Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 16:07:55 +0100
Subject: [PATCH 128/250] =?UTF-8?q?product:=20nur=20Standartpreisliste=20f?=
=?UTF-8?q?=C3=BCr=20aktuellen=20Preis=20verwenden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../currentpurchaseprice/valueProcess.js | 2 +-
.../currentsalesprice/valueProcess.js | 2 +-
.../Productprice_entity.aod | 1 +
.../recordcontainers/db/onDBDelete.js | 3 +
process/Product_lib/process.js | 1219 +++++++++--------
5 files changed, 619 insertions(+), 608 deletions(-)
create mode 100644 entity/Productprice_entity/recordcontainers/db/onDBDelete.js
diff --git a/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js b/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
index e9ef972e43..48d5a48dba 100644
--- a/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
+++ b/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
@@ -4,6 +4,6 @@ import("system.result");
import("system.vars");
import("Product_lib");
-var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP");
+var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP", true);
if (price.length > 0)
result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js b/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
index 50bd311361..6981610dc3 100644
--- a/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
+++ b/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
@@ -4,6 +4,6 @@ import("system.result");
import("system.vars");
import("Product_lib");
-var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "SP");
+var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "SP", true);
if (price.length > 0)
result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index dc37cf42d1..4d059131a9 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -205,6 +205,7 @@
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBDelete>%aditoprj%/entity/Productprice_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
diff --git a/entity/Productprice_entity/recordcontainers/db/onDBDelete.js b/entity/Productprice_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000..3e8d3f97bb
--- /dev/null
+++ b/entity/Productprice_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,3 @@
+import("system.neon");
+
+neon.refresh();
\ No newline at end of file
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 2b863fc27e..4780833eed 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,607 +1,614 @@
-import("system.logging");
-import("system.util");
-import("system.SQLTYPES");
-import("system.datetime");
-import("system.db");
-import("system.vars");
-import("system.translate");
-import("KeywordRegistry_basic");
-import("Util_lib");
-import("Binary_lib");
-import("Sql_lib");
-import("Keyword_lib");
-import("Data_lib");
-
-/**
- * utility functions for products
- * Do not create an instance of this!
- *
- * @class
- */
-function ProductUtils() {}
-
-/**
- * Delivers the currently valid product price
- *
- * @param {String} pid ProductID
- * @param {String} buySell possible values: PP, SP
- *
- * @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
- *
- * @return {Array[]} currently valid product price with currency: [price, "CURRENCY"] or [] if no price found
- */
-ProductUtils.getCurrentProductPrice = function(pid, buySell) {
- if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
- {
- var today = datetime.clearTime(vars.get("sys.date"), "utc");
- var actualPriceCondition = SqlCondition.begin()
- .andPrepare("PRODUCTPRICE.BUYSELL", buySell)
- .andPrepare("PRODUCTPRICE.PRODUCT_ID", pid)
- .andPrepare("PRODUCTPRICE.VALID_FROM", today, "# <= ?")
- .andSqlCondition(SqlCondition.begin()
- .orPrepare("PRODUCTPRICE.VALID_TO", today, "# >= ?")
- .or("PRODUCTPRICE.VALID_TO is null"), "1 = 2");
-
- var productPriceData = db.array(db.ROW, actualPriceCondition.buildSql("select PRICE, CURRENCY from PRODUCTPRICE", "1 = 2", "order by VALID_FROM desc"));
-
- if (productPriceData[0] && productPriceData[1])
- return [productPriceData[0], KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1])];
- else
- return [];
- } else {
- return [];
- }
-}
-
-/**
- * Delivers the stock
- *
- * @param {String} pid ProductID
- *
- * @example productUtils.getStockCount(vars.get("$field.PRODUCTID"))
- *
- * @return {String} stock count
- */
-ProductUtils.getStockCount = function(pid) {
- if (pid != undefined && pid != "")
- {
- var sum = db.cell(SqlCondition.begin()
- .andPrepare("STOCK.PRODUCT_ID", pid)
- .buildSql("select sum(QUANTITY * case IN_OUT when 0 then -1 else 1)"
- + " from STOCK"));
-
- if (sum == "")
- sum = "0";
-
- return sum;
- }
- else
- {
- throw new Error(translate.withArguments("${PRODUCT_LIB_NO_PRODUCT_ID} function: %0", ["ProductUtils.getStockCount"]));
- }
-}
-
-/**
- * Delivers metadata and price lists of the passed product.
- * If parameter "priceListFilter" is passed valid price lists and the
- * current price list to use for offer/order are delivered.
- *
- * @param {String} pid req ProductID
- * @param {Object} priceListFilter opt { currency: "currencyValue", quantity: "quantityValue", relationId: "relationIdValue (for custom price lists)" }
- * @param {String[]} additionalProductInfoFields additional fields from Product
- * They are added to the result with the Fieldname as key. e.g. if the array is ["INFO"] the result will contain the key "INFO"
- *
- * @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
- * var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
- * var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- * var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
- * var pUtils = new ProductUtils();
- * var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
- * var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
- *
- * @return {Object} { <br>
- * productId: "productid" <br>
- * , productName: "product name" <br>
- * , groupCode: "keyvalue of keyword 'GROUPCODE'" <br>
- * , unit: "keyvalue of keyword 'UNIT'" <br>
- * , PriceLists: {$pricelistid$ { <br>
- * priceListId: "pricelistid" <br>
- * , relationId: "contactid" when filled -> custom price list <br>
- * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , price: "price" <br>
- * , vat: "vat" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * } } <br>
- * , CurrentValidPriceLists: {$pricelistid$ { <br>
- * priceListId: "pricelistid" <br>
- * , relationId: "contactid" when filled -> custom price list <br>
- * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , price: "price" <br>
- * , vat: "vat" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * } } <br>
- * , PriceListToUse: {$pricelistid$ { <br>
- * priceListId: "pricelistid" <br>
- * , relationId: "contactid" when filled -> custom price list <br>
- * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , price: "price" <br>
- * , vat: "vat" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * } }, <br>
- * INFO: "the productinfo"
- * }
- */
-ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoFields)
-{
- if (additionalProductInfoFields == undefined) {additionalProductInfoFields = []}
- var ProductDetails = {};
-
- var cols = [];
- var colsProduct = ["PRODUCT.PRODUCTID", "PRODUCT.PRODUCTNAME", "PRODUCT.GROUPCODEID", "PRODUCT.UNIT"];
- var defaultProductFieldCount = colsProduct.length;
- colsProduct = colsProduct.concat(additionalProductInfoFields.map(function(item) {return "PRODUCT." + item}));
-
- cols = cols.concat(colsProduct);
-
- var joins = [];
- var orderby = ["PRODUCTID"];
-
- //PriceList (all)
- var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
- , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
-
- cols = cols.concat(colsPricelistAll);
- joins.push(" left join PRODUCTPRICE allPP on allPP.PRODUCT_ID = PRODUCTID ");
-
- //PriceList (currently valid)
- var validPriceLists = false;
- if (priceListFilter != undefined
- && priceListFilter.currency != undefined && priceListFilter.currency != ""
- && priceListFilter.quantity != undefined && priceListFilter.quantity != "")
- {
- validPriceLists = true;
- var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
- , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
- orderby = orderby.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
-
- cols = cols.concat(colsPricelistValid);
- joins.push("left join PRODUCTPRICE validPP on "
- + db.translateCondition(SqlCondition.begin()
- .and("validPP.PRODUCT_ID = PRODUCTID")
- .andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
- .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
- .andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
- .andSqlCondition(SqlCondition.begin()
- .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
- .orSqlCondition(SqlCondition.begin()
- .and("validPP.CONTACT_ID is null")
- .andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'),
- "1 = 2"),
- "1 = 2")
- .build("1 = 2")))
- }
-
- var ProductDataSql = SqlCondition.begin()
- .andPrepare("PRODUCT.PRODUCTID", pid)
- .buildSql("select " + cols.join(", ") + " from PRODUCT " + joins.join(" "),
- "1 = 2",
- "order by " + orderby.join(", "))
-
- var ProductData = db.table(ProductDataSql);
-
- for (var i = 0; i < ProductData.length; i++)
- {
- //Product
- if (ProductDetails.productId == undefined)
- {
- ProductDetails = {
- productId: ProductData[i][0]
- , productName: ProductData[i][1]
- , groupCode: ProductData[i][2]
- , unit: ProductData[i][3]
- , PriceLists: {}
- , CurrentValidPriceLists: {}
- , PriceListToUse: null
- };
-
- // add additional fields to the details
- var countPos = defaultProductFieldCount;
- additionalProductInfoFields.forEach(function(productField)
- {
- this[productField] = ProductData[i][countPos];
- countPos++;
- }, ProductDetails);
- }
- //Pricelist (all)
- var colIdx = colsProduct.length;
- if (ProductData[i][colIdx] != "" && ProductDetails.PriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
- {
- ProductDetails.PriceLists[ProductData[i][colIdx]] = _getPriceListObject();
- }
-
- //Pricelist (currently valid)
- colIdx = colsProduct.length + colsPricelistAll.length;
- if (validPriceLists)
- {
- if (ProductData[i][colIdx] != "" && ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
- {
- ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] = _getPriceListObject();
- }
- }
- }
-
- if (validPriceLists)
- ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
-
- return ProductDetails;
-
- function _getPriceListObject() {
- return {
- priceListId: ProductData[i][colIdx++]
- , relationId: ProductData[i][colIdx++]
- , priceList: ProductData[i][colIdx++]
- , price: ProductData[i][colIdx++]
- , vat: ProductData[i][colIdx++]
- , validFrom: ProductData[i][colIdx++]
- , validTo: ProductData[i][colIdx++]
- , buySell: ProductData[i][colIdx++]
- , fromQuantity: ProductData[i][colIdx++]
- , currency: ProductData[i][colIdx++]
- };
- }
-
- //price list to use for offer/order
- function _getPriceListToUse(priceLists, priceListFilter) {
- for (var list in priceLists) {
- //custom price (defined in Org -> Conditions)
- if (priceListFilter.relationId != "" && priceListFilter.relationId == priceLists[list].relationId) {
- return priceLists[list];
- }
- //customer deposited price list (defined by Attribute)
- if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
- return priceLists[list];
- }
- //default price list
- if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
- return priceLists[list];
- }
- }
-
- //no valid price list found
- return null;
- }
-}
-
-/**
- * Checks if there is already an existing price list identical to the passed price list
- *
- * @param {String} pid ProductID
- * @param {Object} priceList { <br>
- * priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
- * }
- *
- * @example //Productprice_entity, Field: PRICELIST, Process: onValidation
- * var pUtils = new ProductUtils();
- * var priceList = {
- * priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
- * , fromQuantity: vars.get("$field.FROMQUANTITY")
- * , buySell: vars.get("$field.BUYSELL")
- * , currency: vars.get("$field.CURRENCY")
- * , validFrom: vars.get("$field.VALID_FROM")
- * , validTo: vars.get("$field.VALID_TO")
- * };
- *
- * var identicalPriceList = pUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
- * if (identicalPriceList != null)
- * {
- * result.string(translate.text("Identical price list found!"));
- * }
- *
- * @return {Object | null} null if no identical price list was found, otherwise the found price list
- */
-ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
- var PriceLists = this.getProductDetails(pid).PriceLists;
-
- for (var pricelist in PriceLists) {
- //different pricelist id
- //equal price list
- //equal fromquantity
- //equal currency
- //equal pp/sp
- if (priceList.priceListId != PriceLists[pricelist].priceListId
- && priceList.priceList == PriceLists[pricelist].priceList
- && parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity)
- && priceList.buySell == PriceLists[pricelist].buySell
- && priceList.currency == PriceLists[pricelist].currency) {
-
- //identical validFrom & validTo
- // OR NOT [ validFrom_new <= validFrom & validTo_new <= validTo
- // OR validFrom_new >= validFrom & validTo_new >= validTo
- // OR validFrom_new < validFrom & validTo_new > validTo
- // ]
- if (priceList.validFrom == PriceLists[pricelist].validFrom && priceList.validTo == PriceLists[pricelist].validTo
- || ! (priceList.validFrom <= PriceLists[pricelist].validFrom && priceList.validTo <= PriceLists[pricelist].validTo
- || priceList.validFrom >= PriceLists[pricelist].validFrom && priceList.validTo >= PriceLists[pricelist].validTo
- || priceList.validFrom < PriceLists[pricelist].validFrom && priceList.validTo > PriceLists[pricelist].validTo)) {
- //identical price list found
- return PriceLists[pricelist];
- }
- }
- }
-
- //no identical price list found
- return null;
-}
-
-/**
- * returns the image for a product
- *
- * @param {String} pProductId the id of the product.
- * @param {String} pDefaultText the text, to use for default image generation.
- * @return {String} base64 coded String of the image. If none existed, the given String is used to create an image.
- */
-ProductUtils.getImage = function(pProductId, pDefaultText)
-{
- return ImageUtils.get("PRODUCT", "IMAGE", pProductId, pDefaultText);
-}
-
-/**
- * sets the image of a product
- *
- * @param {String} pProductId the id of the product.
- * @param {String} pImageDateBase64 base64 coded String of the image.
- * @return {Boolean} if image could be set
- */
-ProductUtils.setImage = function(pProductId, pImageDateBase64)
-{
- return ImageUtils.set("PRODUCT", "IMAGE", pProductId, pImageDateBase64, "ProductImage", "Image of the product");
-}
-
-/**
- * deletes the image of a product
- *
- * @param {String} pProductId the id of the product.
- * @return {Boolean} if image could be removed
- */
-ProductUtils.removeImage = function(pProductId)
-{
- return ImageUtils.remove("PRODUCT", "IMAGE", pProductId);
-}
-
-/**
- * Class containing utility functions for Prod2Prod (Parts list)
- *
- * @param {String} productId req ProductID
- *
- * @class
- *
- */
-function Prod2ProdUtils(productId)
-{
- this.productId = productId;
- this.data = undefined;
-}
-
-/**
- * Delivers an Object containing parts list structure for passed product "pProductId" (Constructor parameter)
- *
- * @return {Object} { $prod2prodid$ { <br>
- * ids: [ Array containing child Prod2ProdIds for passed product "pProductId" (Constructor parameter) ] <br>
- * , rowdata: [ "PROD2PRODID", "DEST_ID", "SOURCE_ID", "QUANTITY", "OPTIONAL", "TAKEPRICE" ] from DB-Table PROD2PROD <br>
- * , destid: "Parent ProductID" <br>
- * , sourceid: "Child ProductID" <br>
- * , quantity: "Quantity" <br>
- * , optional: "0" = not optional, "1" = optional <br>
- * , takeprice: "0" = no price, "1" = price <br>
- * , productcode: "Productcode" <br>
- * , productid: "Productid" <br>
- * } }
- */
-Prod2ProdUtils.prototype.getPartsListObject = function()
-{
- return this._relateChilds();
-}
-
-/**
- * Delivers a 2D-Array for RecordContainer of Entity "Prod2prod_entity"
- * containing parts list for passed product "productId" (Constructor parameter).
- *
- * It is necessary to generate a specifically UID for the RecordContainer because
- * the same data record can be listed several times. Therefore the primary key "PROD2PRODID"
- * can not be used for UID because this must be unique.
- *
- * @return {String[][]} [ ["UID"
- * , "PARENTID" (equals "DEST_ID")
- * , "PROD2PRODID"
- * , "DEST_ID"
- * , "SOURCE_ID"
- * , "QUANTITY"
- * , "OPTIONAL"
- * , "TAKEPRICE"
- * , "PRODUCTCODE"
- * , "PRODUCTID"] ]
- */
-Prod2ProdUtils.prototype.getPartsListForRecordContainer = function()
-{
- var ret = [];
- var childs = this._relateChilds();
-
- __push(childs.root);
-
- function __push(pObj)
- {
- for(var i = 0; i < pObj.ids.length; i++)
- {
- var rowdata = childs[pObj.ids[i]].rowdata;
- var UID = util.getNewUUID();
- var PARENTID = childs[pObj.ids[i]].destid;
-
- rowdata = [UID, PARENTID].concat(rowdata);
- ret.push(rowdata);
- __push( childs[pObj.ids[i]] );
- }
- }
- return ret;
-}
-
-/**
-* Delivers an Array containing productids of the parts list
-* for passed product "productId" (Constructor parameter).
-*
-*
-* @return {String[]} [ "SOURCE_ID" ]
-*/
-Prod2ProdUtils.prototype.getPartsListProdIds = function()
-{
- var ret = [];
- var childs = this._relateChilds();
-
- __push(childs.root);
-
- return ret;
-
- function __push(pObj)
- {
- for(var i = 0; i < pObj.ids.length; i++)
- {
- ret.push(childs[pObj.ids[i]].sourceid);
- __push( childs[pObj.ids[i]] );
- }
- }
-}
-
-/**
-* Delivers an Array containing productids of the parent list
-* for passed product "productId" (Constructor parameter).
-*
-*
-* @return {String[]} [ "DEST_ID" ]
-*/
-Prod2ProdUtils.prototype.getParentProdIds = function()
-{
- var ret = [];
- var parents = this._relateParents();
-
- __push(parents.root);
-
- return ret;
-
- function __push(pObj)
- {
- for(var i = 0; i < pObj.ids.length; i++)
- {
- ret.push(parents[pObj.ids[i]].destid);
- __push( parents[pObj.ids[i]] );
- }
- }
-}
-
-/**
-* Function to initalize class variable "data" containing complete Prod2Prod-Data.<br>
-* It guarantees a unique load of data per instance.
-*
-* @ignore
-*/
-Prod2ProdUtils.prototype._initProd2ProdData = function()
-{
- if (this.data == undefined) {
- this.data = db.table("select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID "
- + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
- + "order by PRODUCTCODE ");
- }
-}
-
-/**
- * object tree to relate products by DEST_ID / SOURCE_ID.
- **/
-Prod2ProdUtils.prototype._buildTree = function(pSupervised)
-{
- this._initProd2ProdData();
-
- var tree = { root: {ids: [], sourceid: this.productId } };
-
- if(pSupervised)
- tree = { root: {ids: [], destid: this.productId } };
-
- for (var i = 0; i < this.data.length; i++)
- {
- var prod2prodid = this.data[i][0];
- if ( tree[prod2prodid] == undefined )
- {
- tree[prod2prodid] = {
- ids: []
- , rowdata: this.data[i].slice(0)//copy to get NativeArray for concatenation
- , destid: this.data[i][1]
- , sourceid: this.data[i][2]
- , quantity: this.data[i][3]
- , optional: this.data[i][4]
- , takeprice: this.data[i][5]
- , productcode: this.data[i][6]
- , productid: this.data[i][7]
- };
- }
- }
-
- return tree;
-
-}
-
-Prod2ProdUtils.prototype._relateChilds = function()
-{
- var tree = this._buildTree(false);
-
- __relate("root");
-
- return tree;
-
- function __relate(pID)
- {
- for ( var id in tree )
- {
- if ( tree[id].destid == tree[pID].sourceid && tree[pID].ids.indexOf(id) == -1 )
- {
- tree[pID].ids.push(id);
- __relate(id);
- }
- }
- }
-}
-
-Prod2ProdUtils.prototype._relateParents = function()
-{
- var tree = this._buildTree(true);
-
- __relate("root");
-
- return tree;
-
-
- function __relate(pID)
- {
- for ( var id in tree )
- {
- if ( tree[id].sourceid == tree[pID].destid && tree[pID].ids.indexOf(id) == -1 )
- {
- tree[pID].ids.push(id);
- __relate(id);
- }
- }
- }
+import("system.logging");
+import("system.util");
+import("system.SQLTYPES");
+import("system.datetime");
+import("system.db");
+import("system.vars");
+import("system.translate");
+import("KeywordRegistry_basic");
+import("Util_lib");
+import("Binary_lib");
+import("Sql_lib");
+import("Keyword_lib");
+import("Data_lib");
+
+/**
+ * utility functions for products
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ProductUtils() {}
+
+/**
+ * Delivers the currently valid product price
+ *
+ * @param {String} pid ProductID
+ * @param {String} buySell possible values: PP, SP
+ * @param {String} [onlyStandard=false] if true, only standard price lists are selected.
+ *
+ * @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
+ *
+ * @return {Array[]} currently valid product price with currency: [price, "CURRENCY"] or [] if no price found
+ */
+ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard) {
+ if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
+ {
+ var today = datetime.clearTime(vars.get("sys.date"), "utc");
+ var actualPriceCondition = SqlCondition.begin();
+
+ if (onlyStandard != undefined && onlyStandard)
+ {
+ actualPriceCondition.andPrepare("PRODUCTPRICE.PRICELIST", "02553fc7-4611-4914-8ff5-0b7c4e7531c9");
+ }
+
+ actualPriceCondition.andPrepare("PRODUCTPRICE.BUYSELL", buySell)
+ .andPrepare("PRODUCTPRICE.PRODUCT_ID", pid)
+ .andPrepare("PRODUCTPRICE.VALID_FROM", today, "# <= ?")
+ .andSqlCondition(SqlCondition.begin()
+ .orPrepare("PRODUCTPRICE.VALID_TO", today, "# >= ?")
+ .or("PRODUCTPRICE.VALID_TO is null"), "1 = 2");
+
+ var productPriceData = db.array(db.ROW, actualPriceCondition.buildSql("select PRICE, CURRENCY from PRODUCTPRICE", "1 = 2", "order by VALID_FROM desc"));
+
+ if (productPriceData[0] && productPriceData[1])
+ return [productPriceData[0], KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1])];
+ else
+ return [];
+ } else {
+ return [];
+ }
+}
+
+/**
+ * Delivers the stock
+ *
+ * @param {String} pid ProductID
+ *
+ * @example productUtils.getStockCount(vars.get("$field.PRODUCTID"))
+ *
+ * @return {String} stock count
+ */
+ProductUtils.getStockCount = function(pid) {
+ if (pid != undefined && pid != "")
+ {
+ var sum = db.cell(SqlCondition.begin()
+ .andPrepare("STOCK.PRODUCT_ID", pid)
+ .buildSql("select sum(QUANTITY * case IN_OUT when 0 then -1 else 1)"
+ + " from STOCK"));
+
+ if (sum == "")
+ sum = "0";
+
+ return sum;
+ }
+ else
+ {
+ throw new Error(translate.withArguments("${PRODUCT_LIB_NO_PRODUCT_ID} function: %0", ["ProductUtils.getStockCount"]));
+ }
+}
+
+/**
+ * Delivers metadata and price lists of the passed product.
+ * If parameter "priceListFilter" is passed valid price lists and the
+ * current price list to use for offer/order are delivered.
+ *
+ * @param {String} pid req ProductID
+ * @param {Object} priceListFilter opt { currency: "currencyValue", quantity: "quantityValue", relationId: "relationIdValue (for custom price lists)" }
+ * @param {String[]} additionalProductInfoFields additional fields from Product
+ * They are added to the result with the Fieldname as key. e.g. if the array is ["INFO"] the result will contain the key "INFO"
+ *
+ * @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
+ * var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
+ * var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ * var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ * var pUtils = new ProductUtils();
+ * var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
+ * var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
+ *
+ * @return {Object} { <br>
+ * productId: "productid" <br>
+ * , productName: "product name" <br>
+ * , groupCode: "keyvalue of keyword 'GROUPCODE'" <br>
+ * , unit: "keyvalue of keyword 'UNIT'" <br>
+ * , PriceLists: {$pricelistid$ { <br>
+ * priceListId: "pricelistid" <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
+ * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , price: "price" <br>
+ * , vat: "vat" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * } } <br>
+ * , CurrentValidPriceLists: {$pricelistid$ { <br>
+ * priceListId: "pricelistid" <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
+ * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , price: "price" <br>
+ * , vat: "vat" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * } } <br>
+ * , PriceListToUse: {$pricelistid$ { <br>
+ * priceListId: "pricelistid" <br>
+ * , relationId: "contactid" when filled -> custom price list <br>
+ * , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , price: "price" <br>
+ * , vat: "vat" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * } }, <br>
+ * INFO: "the productinfo"
+ * }
+ */
+ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoFields)
+{
+ if (additionalProductInfoFields == undefined) {additionalProductInfoFields = []}
+ var ProductDetails = {};
+
+ var cols = [];
+ var colsProduct = ["PRODUCT.PRODUCTID", "PRODUCT.PRODUCTNAME", "PRODUCT.GROUPCODEID", "PRODUCT.UNIT"];
+ var defaultProductFieldCount = colsProduct.length;
+ colsProduct = colsProduct.concat(additionalProductInfoFields.map(function(item) {return "PRODUCT." + item}));
+
+ cols = cols.concat(colsProduct);
+
+ var joins = [];
+ var orderby = ["PRODUCTID"];
+
+ //PriceList (all)
+ var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
+ , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
+
+ cols = cols.concat(colsPricelistAll);
+ joins.push(" left join PRODUCTPRICE allPP on allPP.PRODUCT_ID = PRODUCTID ");
+
+ //PriceList (currently valid)
+ var validPriceLists = false;
+ if (priceListFilter != undefined
+ && priceListFilter.currency != undefined && priceListFilter.currency != ""
+ && priceListFilter.quantity != undefined && priceListFilter.quantity != "")
+ {
+ validPriceLists = true;
+ var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
+ , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
+ orderby = orderby.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
+
+ cols = cols.concat(colsPricelistValid);
+ joins.push("left join PRODUCTPRICE validPP on "
+ + db.translateCondition(SqlCondition.begin()
+ .and("validPP.PRODUCT_ID = PRODUCTID")
+ .andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
+ .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
+ .andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
+ .andSqlCondition(SqlCondition.begin()
+ .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
+ .orSqlCondition(SqlCondition.begin()
+ .and("validPP.CONTACT_ID is null")
+ .andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'),
+ "1 = 2"),
+ "1 = 2")
+ .build("1 = 2")))
+ }
+
+ var ProductDataSql = SqlCondition.begin()
+ .andPrepare("PRODUCT.PRODUCTID", pid)
+ .buildSql("select " + cols.join(", ") + " from PRODUCT " + joins.join(" "),
+ "1 = 2",
+ "order by " + orderby.join(", "))
+
+ var ProductData = db.table(ProductDataSql);
+
+ for (var i = 0; i < ProductData.length; i++)
+ {
+ //Product
+ if (ProductDetails.productId == undefined)
+ {
+ ProductDetails = {
+ productId: ProductData[i][0]
+ , productName: ProductData[i][1]
+ , groupCode: ProductData[i][2]
+ , unit: ProductData[i][3]
+ , PriceLists: {}
+ , CurrentValidPriceLists: {}
+ , PriceListToUse: null
+ };
+
+ // add additional fields to the details
+ var countPos = defaultProductFieldCount;
+ additionalProductInfoFields.forEach(function(productField)
+ {
+ this[productField] = ProductData[i][countPos];
+ countPos++;
+ }, ProductDetails);
+ }
+ //Pricelist (all)
+ var colIdx = colsProduct.length;
+ if (ProductData[i][colIdx] != "" && ProductDetails.PriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
+ {
+ ProductDetails.PriceLists[ProductData[i][colIdx]] = _getPriceListObject();
+ }
+
+ //Pricelist (currently valid)
+ colIdx = colsProduct.length + colsPricelistAll.length;
+ if (validPriceLists)
+ {
+ if (ProductData[i][colIdx] != "" && ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
+ {
+ ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] = _getPriceListObject();
+ }
+ }
+ }
+
+ if (validPriceLists)
+ ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
+
+ return ProductDetails;
+
+ function _getPriceListObject() {
+ return {
+ priceListId: ProductData[i][colIdx++]
+ , relationId: ProductData[i][colIdx++]
+ , priceList: ProductData[i][colIdx++]
+ , price: ProductData[i][colIdx++]
+ , vat: ProductData[i][colIdx++]
+ , validFrom: ProductData[i][colIdx++]
+ , validTo: ProductData[i][colIdx++]
+ , buySell: ProductData[i][colIdx++]
+ , fromQuantity: ProductData[i][colIdx++]
+ , currency: ProductData[i][colIdx++]
+ };
+ }
+
+ //price list to use for offer/order
+ function _getPriceListToUse(priceLists, priceListFilter) {
+ for (var list in priceLists) {
+ //custom price (defined in Org -> Conditions)
+ if (priceListFilter.relationId != "" && priceListFilter.relationId == priceLists[list].relationId) {
+ return priceLists[list];
+ }
+ //customer deposited price list (defined by Attribute)
+ if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
+ return priceLists[list];
+ }
+ //default price list
+ if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
+ return priceLists[list];
+ }
+ }
+
+ //no valid price list found
+ return null;
+ }
+}
+
+/**
+ * Checks if there is already an existing price list identical to the passed price list
+ *
+ * @param {String} pid ProductID
+ * @param {Object} priceList { <br>
+ * priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ * , validFrom: TIMESTAMP <br>
+ * , validTo: TIMESTAMP <br>
+ * , buySell: "SP" / "PP" <br>
+ * , fromQuantity: "fromquantity" <br>
+ * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * }
+ *
+ * @example //Productprice_entity, Field: PRICELIST, Process: onValidation
+ * var pUtils = new ProductUtils();
+ * var priceList = {
+ * priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
+ * , fromQuantity: vars.get("$field.FROMQUANTITY")
+ * , buySell: vars.get("$field.BUYSELL")
+ * , currency: vars.get("$field.CURRENCY")
+ * , validFrom: vars.get("$field.VALID_FROM")
+ * , validTo: vars.get("$field.VALID_TO")
+ * };
+ *
+ * var identicalPriceList = pUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
+ * if (identicalPriceList != null)
+ * {
+ * result.string(translate.text("Identical price list found!"));
+ * }
+ *
+ * @return {Object | null} null if no identical price list was found, otherwise the found price list
+ */
+ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
+ var PriceLists = this.getProductDetails(pid).PriceLists;
+
+ for (var pricelist in PriceLists) {
+ //different pricelist id
+ //equal price list
+ //equal fromquantity
+ //equal currency
+ //equal pp/sp
+ if (priceList.priceListId != PriceLists[pricelist].priceListId
+ && priceList.priceList == PriceLists[pricelist].priceList
+ && parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity)
+ && priceList.buySell == PriceLists[pricelist].buySell
+ && priceList.currency == PriceLists[pricelist].currency) {
+
+ //identical validFrom & validTo
+ // OR NOT [ validFrom_new <= validFrom & validTo_new <= validTo
+ // OR validFrom_new >= validFrom & validTo_new >= validTo
+ // OR validFrom_new < validFrom & validTo_new > validTo
+ // ]
+ if (priceList.validFrom == PriceLists[pricelist].validFrom && priceList.validTo == PriceLists[pricelist].validTo
+ || ! (priceList.validFrom <= PriceLists[pricelist].validFrom && priceList.validTo <= PriceLists[pricelist].validTo
+ || priceList.validFrom >= PriceLists[pricelist].validFrom && priceList.validTo >= PriceLists[pricelist].validTo
+ || priceList.validFrom < PriceLists[pricelist].validFrom && priceList.validTo > PriceLists[pricelist].validTo)) {
+ //identical price list found
+ return PriceLists[pricelist];
+ }
+ }
+ }
+
+ //no identical price list found
+ return null;
+}
+
+/**
+ * returns the image for a product
+ *
+ * @param {String} pProductId the id of the product.
+ * @param {String} pDefaultText the text, to use for default image generation.
+ * @return {String} base64 coded String of the image. If none existed, the given String is used to create an image.
+ */
+ProductUtils.getImage = function(pProductId, pDefaultText)
+{
+ return ImageUtils.get("PRODUCT", "IMAGE", pProductId, pDefaultText);
+}
+
+/**
+ * sets the image of a product
+ *
+ * @param {String} pProductId the id of the product.
+ * @param {String} pImageDateBase64 base64 coded String of the image.
+ * @return {Boolean} if image could be set
+ */
+ProductUtils.setImage = function(pProductId, pImageDateBase64)
+{
+ return ImageUtils.set("PRODUCT", "IMAGE", pProductId, pImageDateBase64, "ProductImage", "Image of the product");
+}
+
+/**
+ * deletes the image of a product
+ *
+ * @param {String} pProductId the id of the product.
+ * @return {Boolean} if image could be removed
+ */
+ProductUtils.removeImage = function(pProductId)
+{
+ return ImageUtils.remove("PRODUCT", "IMAGE", pProductId);
+}
+
+/**
+ * Class containing utility functions for Prod2Prod (Parts list)
+ *
+ * @param {String} productId req ProductID
+ *
+ * @class
+ *
+ */
+function Prod2ProdUtils(productId)
+{
+ this.productId = productId;
+ this.data = undefined;
+}
+
+/**
+ * Delivers an Object containing parts list structure for passed product "pProductId" (Constructor parameter)
+ *
+ * @return {Object} { $prod2prodid$ { <br>
+ * ids: [ Array containing child Prod2ProdIds for passed product "pProductId" (Constructor parameter) ] <br>
+ * , rowdata: [ "PROD2PRODID", "DEST_ID", "SOURCE_ID", "QUANTITY", "OPTIONAL", "TAKEPRICE" ] from DB-Table PROD2PROD <br>
+ * , destid: "Parent ProductID" <br>
+ * , sourceid: "Child ProductID" <br>
+ * , quantity: "Quantity" <br>
+ * , optional: "0" = not optional, "1" = optional <br>
+ * , takeprice: "0" = no price, "1" = price <br>
+ * , productcode: "Productcode" <br>
+ * , productid: "Productid" <br>
+ * } }
+ */
+Prod2ProdUtils.prototype.getPartsListObject = function()
+{
+ return this._relateChilds();
+}
+
+/**
+ * Delivers a 2D-Array for RecordContainer of Entity "Prod2prod_entity"
+ * containing parts list for passed product "productId" (Constructor parameter).
+ *
+ * It is necessary to generate a specifically UID for the RecordContainer because
+ * the same data record can be listed several times. Therefore the primary key "PROD2PRODID"
+ * can not be used for UID because this must be unique.
+ *
+ * @return {String[][]} [ ["UID"
+ * , "PARENTID" (equals "DEST_ID")
+ * , "PROD2PRODID"
+ * , "DEST_ID"
+ * , "SOURCE_ID"
+ * , "QUANTITY"
+ * , "OPTIONAL"
+ * , "TAKEPRICE"
+ * , "PRODUCTCODE"
+ * , "PRODUCTID"] ]
+ */
+Prod2ProdUtils.prototype.getPartsListForRecordContainer = function()
+{
+ var ret = [];
+ var childs = this._relateChilds();
+
+ __push(childs.root);
+
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
+ var rowdata = childs[pObj.ids[i]].rowdata;
+ var UID = util.getNewUUID();
+ var PARENTID = childs[pObj.ids[i]].destid;
+
+ rowdata = [UID, PARENTID].concat(rowdata);
+ ret.push(rowdata);
+ __push( childs[pObj.ids[i]] );
+ }
+ }
+ return ret;
+}
+
+/**
+* Delivers an Array containing productids of the parts list
+* for passed product "productId" (Constructor parameter).
+*
+*
+* @return {String[]} [ "SOURCE_ID" ]
+*/
+Prod2ProdUtils.prototype.getPartsListProdIds = function()
+{
+ var ret = [];
+ var childs = this._relateChilds();
+
+ __push(childs.root);
+
+ return ret;
+
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
+ ret.push(childs[pObj.ids[i]].sourceid);
+ __push( childs[pObj.ids[i]] );
+ }
+ }
+}
+
+/**
+* Delivers an Array containing productids of the parent list
+* for passed product "productId" (Constructor parameter).
+*
+*
+* @return {String[]} [ "DEST_ID" ]
+*/
+Prod2ProdUtils.prototype.getParentProdIds = function()
+{
+ var ret = [];
+ var parents = this._relateParents();
+
+ __push(parents.root);
+
+ return ret;
+
+ function __push(pObj)
+ {
+ for(var i = 0; i < pObj.ids.length; i++)
+ {
+ ret.push(parents[pObj.ids[i]].destid);
+ __push( parents[pObj.ids[i]] );
+ }
+ }
+}
+
+/**
+* Function to initalize class variable "data" containing complete Prod2Prod-Data.<br>
+* It guarantees a unique load of data per instance.
+*
+* @ignore
+*/
+Prod2ProdUtils.prototype._initProd2ProdData = function()
+{
+ if (this.data == undefined) {
+ this.data = db.table("select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID "
+ + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
+ + "order by PRODUCTCODE ");
+ }
+}
+
+/**
+ * object tree to relate products by DEST_ID / SOURCE_ID.
+ **/
+Prod2ProdUtils.prototype._buildTree = function(pSupervised)
+{
+ this._initProd2ProdData();
+
+ var tree = { root: {ids: [], sourceid: this.productId } };
+
+ if(pSupervised)
+ tree = { root: {ids: [], destid: this.productId } };
+
+ for (var i = 0; i < this.data.length; i++)
+ {
+ var prod2prodid = this.data[i][0];
+ if ( tree[prod2prodid] == undefined )
+ {
+ tree[prod2prodid] = {
+ ids: []
+ , rowdata: this.data[i].slice(0)//copy to get NativeArray for concatenation
+ , destid: this.data[i][1]
+ , sourceid: this.data[i][2]
+ , quantity: this.data[i][3]
+ , optional: this.data[i][4]
+ , takeprice: this.data[i][5]
+ , productcode: this.data[i][6]
+ , productid: this.data[i][7]
+ };
+ }
+ }
+
+ return tree;
+
+}
+
+Prod2ProdUtils.prototype._relateChilds = function()
+{
+ var tree = this._buildTree(false);
+
+ __relate("root");
+
+ return tree;
+
+ function __relate(pID)
+ {
+ for ( var id in tree )
+ {
+ if ( tree[id].destid == tree[pID].sourceid && tree[pID].ids.indexOf(id) == -1 )
+ {
+ tree[pID].ids.push(id);
+ __relate(id);
+ }
+ }
+ }
+}
+
+Prod2ProdUtils.prototype._relateParents = function()
+{
+ var tree = this._buildTree(true);
+
+ __relate("root");
+
+ return tree;
+
+
+ function __relate(pID)
+ {
+ for ( var id in tree )
+ {
+ if ( tree[id].sourceid == tree[pID].destid && tree[pID].ids.indexOf(id) == -1 )
+ {
+ tree[pID].ids.push(id);
+ __relate(id);
+ }
+ }
+ }
}
\ No newline at end of file
--
GitLab
From 558cfdea02974c6fb6ea47631c9dd91fc1722169 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 29 Mar 2019 09:48:29 +0100
Subject: [PATCH 129/250] fix offer index sql
---
.../indexsearchgroups/offer/query.js | 50 +++++++++----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
index 1ad88702c6..1244f85e0f 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
@@ -1,26 +1,26 @@
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Keyword_lib");
-import("Sql_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
- affectedIds = vars.get("$local.idvalue");
- queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
- //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select OFFERID, "
- + sqlHelper.concat(["OFFERCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ")
- + " as TITLECOLUMN, "
- + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
- + " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE "
- + " from OFFER "
- + " join CONTACT on OFFER.CONTACT_ID = CONTACTID "
- + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
- + queryCondition + " order by OFFERCODE ";
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Keyword_lib");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
+if (vars.exists("$local.idvalue")) {
+ affectedIds = vars.get("$local.idvalue");
+ queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ //TODO: refactor this for incremental indexer (injections?)
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select OFFERID, "
+ + sqlHelper.concat(["cast(OFFERCODE as CHAR(10)) ", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ")
+ + " as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
+ + " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ + " from OFFER "
+ + " join CONTACT on OFFER.CONTACT_ID = CONTACTID "
+ + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
+ + queryCondition + " order by OFFERCODE ";
result.string(sqlQuery);
\ No newline at end of file
--
GitLab
From 2955202aea59d932b6446d764b7db3521d9e2742 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 29 Mar 2019 09:54:21 +0100
Subject: [PATCH 130/250] delete old files
---
entity/Offeritem_entity/conditionProcess.js | 7 -----
entity/Offeritem_entity/onDBDelete.js | 21 ---------------
entity/Offeritem_entity/onDBInsert.js | 26 -------------------
entity/Offeritem_entity/onDBUpdate.js | 16 ------------
entity/Offeritem_entity/orderClauseProcess.js | 3 ---
5 files changed, 73 deletions(-)
delete mode 100644 entity/Offeritem_entity/conditionProcess.js
delete mode 100644 entity/Offeritem_entity/onDBDelete.js
delete mode 100644 entity/Offeritem_entity/onDBInsert.js
delete mode 100644 entity/Offeritem_entity/onDBUpdate.js
delete mode 100644 entity/Offeritem_entity/orderClauseProcess.js
diff --git a/entity/Offeritem_entity/conditionProcess.js b/entity/Offeritem_entity/conditionProcess.js
deleted file mode 100644
index 810d73b911..0000000000
--- a/entity/Offeritem_entity/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if(vars.exists("$param.OfferId_param") && vars.get("$param.OfferId_param") != "")
- result.string("OFFERITEM.OFFER_ID = ('" + vars.get("$param.OfferId_param") + "')");
-else
- result.string("");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/onDBDelete.js b/entity/Offeritem_entity/onDBDelete.js
deleted file mode 100644
index 2acb846c67..0000000000
--- a/entity/Offeritem_entity/onDBDelete.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("Offer_lib");
-
-var oid = vars.get("$field.OFFER_ID");
-if(oid != "")
-{
- var oiid = vars.get("$field.OFFERITEMID");
- var oiUtils = new OfferItemUtils(oid);
- var deletedIds = oiUtils.deletePartsList(oiid);
- oiUtils.reOrgItems();
-
- deletedIds.push(oiid);
- var cols = ["NET", "VAT"];
- var vals = oiUtils.getNetAndVat(deletedIds);
-
- db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
-
- neon.refresh();
-}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/onDBInsert.js b/entity/Offeritem_entity/onDBInsert.js
deleted file mode 100644
index 38707c33d4..0000000000
--- a/entity/Offeritem_entity/onDBInsert.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("system.datetime");
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("system.util");
-import("Offer_lib");
-import("Product_lib");
-
-var oid = vars.get("$field.OFFER_ID");
-if(oid != "")
-{
- var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
-
- var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
- oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, contactid);
- oiUtils.reOrgItems();
-
- //update offer price
- var cols = ["NET", "VAT"];
- var vals = oiUtils.getNetAndVat();
-
- db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
-
- neon.refresh();
-}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/onDBUpdate.js b/entity/Offeritem_entity/onDBUpdate.js
deleted file mode 100644
index 7441937d9e..0000000000
--- a/entity/Offeritem_entity/onDBUpdate.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.neon");
-import("Offer_lib");
-
-var oid = vars.get("$field.OFFER_ID");
-if(oid != "")
-{
- var cols = ["NET", "VAT"];
- var oiUtils = new OfferItemUtils(oid);
- var vals = oiUtils.getNetAndVat();
-
- db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
-
- neon.refresh();
-}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/orderClauseProcess.js b/entity/Offeritem_entity/orderClauseProcess.js
deleted file mode 100644
index 8eebb296c7..0000000000
--- a/entity/Offeritem_entity/orderClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object( {"OFFERITEM.ITEMSORT": "up"} );
\ No newline at end of file
--
GitLab
From 0fe7a724b0604a3ca03654e76ef5978aba31c877 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 29 Mar 2019 10:53:01 +0100
Subject: [PATCH 131/250] Rabatt und UmsSt auf 2 Kommastellen erweitert
---
entity/Offeritem_entity/Offeritem_entity.aod | 2 +-
.../entityfields/discount/onValidation.js | 8 +++-----
.../entityfields/vat/onValidation.js | 2 +-
process/Util_lib/process.js | 14 +++++++++++---
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index ec65a90423..0185cc75e4 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -17,7 +17,7 @@
<name>DISCOUNT</name>
<title>Discount %</title>
<contentType>NUMBER</contentType>
- <outputFormat>#,##0</outputFormat>
+ <outputFormat>#,##0.00</outputFormat>
<onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/Offeritem_entity/entityfields/discount/onValidation.js b/entity/Offeritem_entity/entityfields/discount/onValidation.js
index 18bd49fe0d..a929b1d08a 100644
--- a/entity/Offeritem_entity/entityfields/discount/onValidation.js
+++ b/entity/Offeritem_entity/entityfields/discount/onValidation.js
@@ -1,13 +1,11 @@
+import("system.logging");
import("system.result");
import("system.vars");
import("Util_lib");
import("Entity_lib");
var value = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DISCOUNT"));
-
-var validationResult = NumberUtils.validateIsInside("Discount", value, 0, 100);
+var validationResult = NumberUtils.validateIsBetweenFloat("Discount", value, 0, 100);
if (validationResult)
-{
- result.string(validationResult);
-}
\ No newline at end of file
+ result.string(validationResult);
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/vat/onValidation.js b/entity/Productprice_entity/entityfields/vat/onValidation.js
index 974d4c311f..463ab50e20 100644
--- a/entity/Productprice_entity/entityfields/vat/onValidation.js
+++ b/entity/Productprice_entity/entityfields/vat/onValidation.js
@@ -5,7 +5,7 @@ import("Entity_lib");
var value = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.VAT"));
-var validationResult = NumberUtils.validateIsInside("VAT", value, 0, 100);
+var validationResult = NumberUtils.validateIsBetweenFloat("VAT", value, 0, 100);
if (validationResult)
{
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 82af36de2b..d6cde464c4 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.neon");
import("system.project");
import("system.process");
@@ -80,16 +81,23 @@ NumberUtils.isInside = function(pValue, pMin, pMax, pIgnoreNull)
* @example
* var value = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DISCOUNT")); <br>
* <br>
- * var validationResult = NumberUtils.validateIsInside("Discount", value, 0, 100); <br>
+ * var validationResult = NumberUtils.validateIsBetweenFloat("Discount", value, 0, 100); <br>
* <br>
* if (validationResult) <br>
* { <br>
* result.string(validationResult); <br>
* } <br>
*/
-NumberUtils.validateIsInside = function(pTitle, pValue, pMin, pMax, pIgnoreNull)
+NumberUtils.validateIsBetweenFloat = function(pTitle, pValue, pMin, pMax, pIgnoreNull)
{
- var discount = parseInt(pValue);
+ if(pValue.includes(","))
+ pValue = pValue.replace(",", ".");
+
+ var discount = parseFloat(pValue);
+
+ if(isNaN(discount))
+ return false;
+
if (!NumberUtils.isInside(discount, 0, 100, pIgnoreNull))
{
return (translate.withArguments("${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3", [translate.text(pTitle), discount, pMin, pMax]));
--
GitLab
From bc32ba465a6d241ff1dd9a4902132ef7e51b921e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 10:10:03 +0100
Subject: [PATCH 132/250] added several database-indices for contact
management, keywords, activity and task
---
.../Data_alias/basic/2019.2/changelog.xml | 6 ++++-
.../basic/2019.2/indicesRefactor/Activity.xml | 14 +++++++++++
.../indicesRefactor/ContactManagement.xml | 23 +++++++++++++++++++
.../basic/2019.2/indicesRefactor/Keyword.xml | 18 +++++++++++++++
.../basic/2019.2/indicesRefactor/Task.xml | 20 ++++++++++++++++
5 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
create mode 100644 others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
create mode 100644 others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
create mode 100644 others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
index 1c4c46577a..4c52dd94a3 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
@@ -124,5 +124,9 @@
<include relativeToChangelogFile="true" file="offer_add_date_editnew_user_editnew.xml"/>
<include relativeToChangelogFile="true" file="attributerelation_add_date_editnew_user_editnew.xml"/>
<include relativeToChangelogFile="true" file="communication_add_date_editnew_user_editnew.xml"/>
-
+
+ <include relativeToChangelogFile="true" file="indicesRefactor/ContactManagement.xml"/>
+ <include relativeToChangelogFile="true" file="indicesRefactor/Keyword.xml"/>
+ <include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
+ <include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
new file mode 100644
index 0000000000..c25802bbc3
--- /dev/null
+++ b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
@@ -0,0 +1,14 @@
+<?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="9b4644f6-3060-4791-b9f5-684939b78dcb">
+ <createIndex indexName="IDX_ACTIVITY_PARENT" tableName="ACTIVITY">
+ <column name="PARENT_CONTEXT"/>
+ <column name="PARENT_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_ACTIVITYLINK_ACTIVITY_ID" tableName="ACTIVITYLINK">
+ <column name="ACTIVITY_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
new file mode 100644
index 0000000000..d5febea39b
--- /dev/null
+++ b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
@@ -0,0 +1,23 @@
+<?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="0f2ec94d-75d0-42d9-8026-d70197f0ded4">
+ <createIndex indexName="IDX_ADDRESS_CONTACT_ID" tableName="ADDRESS">
+ <column name="CONTACT_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_CONTACT_ANY_CONTACT" tableName="CONTACT">
+ <column name="PERSON_ID"/>
+ <column name="ORGANISATION_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_CONTACT_ADDRESS_ID" tableName="CONTACT">
+ <column name="ADDRESS_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_COMMUNICATION_CONTACT_ID" tableName="COMMUNICATION">
+ <column name="CONTACT_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION">
+ <column name="MEDIUM_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
new file mode 100644
index 0000000000..6bda5489c9
--- /dev/null
+++ b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
@@ -0,0 +1,18 @@
+<?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="95a53a6c-6157-4fc8-a4cb-501da22ad326">
+ <!-- the database will propably never use these indices since there are too less entries within the tables
+ but IF there should be a lot of entries (thanks to imports or else) there are at least indices -->
+ <createIndex indexName="IDX_KWD_ENTRY_CONTAINER" tableName="AB_KEYWORD_ENTRY">
+ <column name="CONTAINER"/>
+ </createIndex>
+ <createIndex indexName="IDX_KWD_ATTR_CONTAINER" tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="CONTAINER"/>
+ </createIndex>
+ <createIndex indexName="IDX_KWD_ATTRREL_KWD_ENTRY_ID" tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ENTRY_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml
new file mode 100644
index 0000000000..a6b5f7c38c
--- /dev/null
+++ b/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml
@@ -0,0 +1,20 @@
+<?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="038575fd-cbf2-452a-8eae-0b594779cd1b">
+ <createIndex indexName="IDX_TASK_REQUESTOR_CONTACT_ID" tableName="TASK">
+ <column name="REQUESTOR_CONTACT_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_TASK_EDITOR_CONTACT_ID" tableName="TASK">
+ <column name="EDITOR_CONTACT_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_TASK_PARENT" tableName="TASK">
+ <column name="PARENT_CONTEXT"/>
+ <column name="PARENT_ID"/>
+ </createIndex>
+ <createIndex indexName="IDX_TASKLINK_TASK_ID" tableName="TASKLINK">
+ <column name="TASK_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--
GitLab
From 0d45e1e095243b6383514794b2fec59fdcb3ad4c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 13:52:38 +0100
Subject: [PATCH 133/250] contactmgmt: display standard address of org in bold
---
entity/Person_entity/Person_entity.aod | 4 ++++
.../children/defaultaddressid_param/valueProcess.js | 4 ++++
2 files changed, 8 insertions(+)
create mode 100644 entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 1cee641431..7317e6217b 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -397,6 +397,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js b/entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js
new file mode 100644
index 0000000000..ebdb44bcc7
--- /dev/null
+++ b/entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.ADDRESS_ID"));
\ No newline at end of file
--
GitLab
From 6c22a7cc7ff789b2e6fa675b83cc5ebe7379346d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 14:05:13 +0100
Subject: [PATCH 134/250] contactmgmt: identifiers
---
.../Organisation_entity.aod | 6 +++---
entity/Person_entity/Person_entity.aod | 2 +-
.../_____LANGUAGE_EXTRA.aod | 18 ++++++++++++------
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 16 +++++++++++-----
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 18 ++++++++++++------
5 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index b343b850c0..4ed4e284f1 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -187,7 +187,7 @@
</entityConsumer>
<entityField>
<name>ADDRESS_ID</name>
- <title>standard address</title>
+ <title>Address</title>
<consumer>Addresses</consumer>
<searchable v="false" />
<state>AUTO</state>
@@ -312,7 +312,7 @@
</entityActionField>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
- <title>standard email</title>
+ <title>Email</title>
<consumer>EmailCommunications</consumer>
<onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -323,7 +323,7 @@
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
- <title>standard phone</title>
+ <title>Phone</title>
<consumer>PhoneCommunications</consumer>
<onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
</entityField>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 7317e6217b..242a346917 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -480,7 +480,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityField>
<name>ADDRESS_ID</name>
- <title>standard address</title>
+ <title>Address</title>
<consumer>ContactAndOrganisationAddresses</consumer>
<searchable v="false" />
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 2e47678c93..359b4928d6 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -705,9 +705,6 @@
<entry>
<key>standard email</key>
</entry>
- <entry>
- <key>standard phone</key>
- </entry>
<entry>
<key>Creator</key>
</entry>
@@ -2646,9 +2643,6 @@
<entry>
<key>False</key>
</entry>
- <entry>
- <key>protected</key>
- </entry>
<entry>
<key>false</key>
</entry>
@@ -2661,6 +2655,18 @@
<entry>
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
</entry>
+ <entry>
+ <key>Email</key>
+ </entry>
+ <entry>
+ <key>Test</key>
+ </entry>
+ <entry>
+ <key>testV</key>
+ </entry>
+ <entry>
+ <key>test</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 355302ddf9..117cb1cda8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1276,10 +1276,6 @@
<key>standard email</key>
<value>Standard-Email</value>
</entry>
- <entry>
- <key>standard phone</key>
- <value>Standard-Telefon</value>
- </entry>
<entry>
<key>Creator</key>
<value>Ersteller</value>
@@ -3421,7 +3417,17 @@
<value>%0 muss zwischen %2 und %3 sein.</value>
</entry>
<entry>
- <key>protected</key>
+ <key>Email</key>
+ <value>E-Mail</value>
+ </entry>
+ <entry>
+ <key>Test</key>
+ </entry>
+ <entry>
+ <key>testV</key>
+ </entry>
+ <entry>
+ <key>test</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f9ebdddbda..bde30ca07a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -713,9 +713,6 @@
<entry>
<key>Connection</key>
</entry>
- <entry>
- <key>standard phone</key>
- </entry>
<entry>
<key>standard email</key>
</entry>
@@ -2673,9 +2670,6 @@
<entry>
<key>False</key>
</entry>
- <entry>
- <key>protected</key>
- </entry>
<entry>
<key>false</key>
</entry>
@@ -2689,6 +2683,18 @@
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
<value>%0 has to be between %2 and %3.</value>
</entry>
+ <entry>
+ <key>Email</key>
+ </entry>
+ <entry>
+ <key>Test</key>
+ </entry>
+ <entry>
+ <key>testV</key>
+ </entry>
+ <entry>
+ <key>test</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 3b967b5d82916cd4974a5e42942f347ae4d9342d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 14:10:05 +0100
Subject: [PATCH 135/250] contactmgmt: icon changed
---
.../_____SYSTEM_APPLICATION_NEON.aod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 4e90b5b470..daae7fbe27 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -4,7 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200">
<node name="CONTACTS" kind="123" title="Contactmanagement">
- <icon>VAADIN:STAR</icon>
+ <icon>VAADIN:CONNECT</icon>
<node name="Group1" kind="123" title="">
<node name="Person" kind="10077" />
<node name="Organisation" kind="10077" />
--
GitLab
From ead7e6dc3d31491629c36be50a6415c1f63dd32a Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 14:20:30 +0100
Subject: [PATCH 136/250] several titles changed
---
.../ActivityLink_entity.aod | 4 +-
.../AppointmentLink_entity.aod | 266 +++++++++---------
entity/TaskLink_entity/TaskLink_entity.aod | 4 +-
.../_____LANGUAGE_EXTRA.aod | 6 +
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 9 +
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 8 +
6 files changed, 161 insertions(+), 136 deletions(-)
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index f717d43107..be69dcabe1 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -14,13 +14,13 @@
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
- <title>Object type</title>
+ <title>{$OBJECTLINK_TYPE}</title>
<consumer>Context</consumer>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
- <title>Relation</title>
+ <title>{$OBJECTLINK_OBJECT}</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 85253e1444..3aa241d80f 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,132 +1,134 @@
-<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>AppointmentLink_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityField>
- <name>AB_APPOINTMENTLINKID</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>APPOINTMENT_ID</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECTID</name>
- <consumer>Objects</consumer>
- <linkedContext>Object</linkedContext>
- <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>OBJECTTYPE</name>
- <consumer>Context</consumer>
- <linkedContext>Context</linkedContext>
- <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Links</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <targetContextField>OBJECTTYPE</targetContextField>
- <targetIdField>OBJECTID</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3dde1745-18a1-4499-83d0-61e414086997</name>
- <entityName>Appointment_entity</entityName>
- <fieldName>AppointmentLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Context</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Objects</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>opencontext</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
- </entityActionField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
- <tableName>AB_APPOINTMENTLINK</tableName>
- <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>APPOINTMENT_ID.value</name>
- <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTID.value</name>
- <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTTYPE.value</name>
- <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTID.displayValue</name>
- <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_APPOINTMENTLINKID.value</name>
- <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>AppointmentLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>AB_APPOINTMENTLINKID</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>APPOINTMENT_ID</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECTID</name>
+ <title>{$OBJECTLINK_OBJECT}</title>
+ <consumer>Objects</consumer>
+ <linkedContext>Object</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>OBJECTTYPE</name>
+ <title>{$OBJECTLINK_TYPE}</title>
+ <consumer>Context</consumer>
+ <linkedContext>Context</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Links</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>OBJECTTYPE</targetContextField>
+ <targetIdField>OBJECTID</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>3dde1745-18a1-4499-83d0-61e414086997</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>AppointmentLinks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Context</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Objects</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>opencontext</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
+ </entityActionField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
+ <tableName>AB_APPOINTMENTLINK</tableName>
+ <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>APPOINTMENT_ID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTTYPE.value</name>
+ <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTID.displayValue</name>
+ <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_APPOINTMENTLINKID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 2ed05178f4..8074c19d87 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -17,13 +17,13 @@
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
- <title>Object type</title>
+ <title>{$OBJECTLINK_TYPE}</title>
<consumer>Contexts</consumer>
<displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
- <title>Relation</title>
+ <title>{$OBJECTLINK_OBJECT}</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 359b4928d6..a0f27879af 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2667,6 +2667,12 @@
<entry>
<key>test</key>
</entry>
+ <entry>
+ <key>{$OBJECTLINK_TYPE}</key>
+ </entry>
+ <entry>
+ <key>{$OBJECTLINK_OBJECT}</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 117cb1cda8..3644aa55f8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -168,6 +168,7 @@
</entry>
<entry>
<key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
+ <value></value>
</entry>
<entry>
<key>360 Degree</key>
@@ -3429,6 +3430,14 @@
<entry>
<key>test</key>
</entry>
+ <entry>
+ <key>{$OBJECTLINK_TYPE}</key>
+ <value>Art</value>
+ </entry>
+ <entry>
+ <key>{$OBJECTLINK_OBJECT}</key>
+ <value>Objekt</value>
+ </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 bde30ca07a..4c8ee3cf90 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2695,6 +2695,14 @@
<entry>
<key>test</key>
</entry>
+ <entry>
+ <key>{$OBJECTLINK_TYPE}</key>
+ <value>Type</value>
+ </entry>
+ <entry>
+ <key>{$OBJECTLINK_OBJECT}</key>
+ <value>Object</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 7f8b3186b0134a1bd95635bacb80a521caff2fce Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 14:33:26 +0100
Subject: [PATCH 137/250] Organisation to LONG_TEXT
---
entity/Organisation_entity/Organisation_entity.aod | 1 +
1 file changed, 1 insertion(+)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 4ed4e284f1..766b3a4856 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -23,6 +23,7 @@
<entityField>
<name>NAME</name>
<title>Name</title>
+ <contentType>LONG_TEXT</contentType>
<mandatory v="true" />
</entityField>
<entityField>
--
GitLab
From 20106971a22ff65a708faccbfbbbb4dffa5e9b66 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 28 Mar 2019 16:25:47 +0100
Subject: [PATCH 138/250] Employee_entity
---
entity/Employee_entity/Employee_entity.aod | 80 +++++++++++++++++++
.../confirm_password/onValidation.js | 6 ++
.../isactive/possibleItemsProcess.js | 7 ++
.../entityfields/isactive/valueProcess.js | 6 ++
.../entityfields/password/onValidation.js | 6 ++
.../setpassword/onActionProcess.js | 4 +
.../entityfields/title/onValidation.js | 8 ++
.../recordcontainers/jdito/contentProcess.js | 24 ++++++
.../recordcontainers/jdito/onDelete.js | 4 +
.../recordcontainers/jdito/onInsert.js | 13 +++
.../recordcontainers/jdito/onUpdate.js | 15 ++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 +
neonContext/Employee/Employee.aod | 33 ++++++++
.../EmployeeEdit_view/EmployeeEdit_view.aod | 39 +++++++++
.../EmployeeFilter_view.aod | 34 ++++++++
.../EmployeeMain_view/EmployeeMain_view.aod | 18 +++++
.../EmployeePassword_view.aod | 27 +++++++
.../EmployeePreview_view.aod | 17 ++++
18 files changed, 345 insertions(+)
create mode 100644 entity/Employee_entity/Employee_entity.aod
create mode 100644 entity/Employee_entity/entityfields/confirm_password/onValidation.js
create mode 100644 entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js
create mode 100644 entity/Employee_entity/entityfields/isactive/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/password/onValidation.js
create mode 100644 entity/Employee_entity/entityfields/setpassword/onActionProcess.js
create mode 100644 entity/Employee_entity/entityfields/title/onValidation.js
create mode 100644 entity/Employee_entity/recordcontainers/jdito/contentProcess.js
create mode 100644 entity/Employee_entity/recordcontainers/jdito/onDelete.js
create mode 100644 entity/Employee_entity/recordcontainers/jdito/onInsert.js
create mode 100644 entity/Employee_entity/recordcontainers/jdito/onUpdate.js
create mode 100644 neonContext/Employee/Employee.aod
create mode 100644 neonView/EmployeeEdit_view/EmployeeEdit_view.aod
create mode 100644 neonView/EmployeeFilter_view/EmployeeFilter_view.aod
create mode 100644 neonView/EmployeeMain_view/EmployeeMain_view.aod
create mode 100644 neonView/EmployeePassword_view/EmployeePassword_view.aod
create mode 100644 neonView/EmployeePreview_view/EmployeePreview_view.aod
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
new file mode 100644
index 0000000000..1ed33a9fdb
--- /dev/null
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -0,0 +1,80 @@
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>Employee_entity</name>
+ <title>Employee</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <iconId>VAADIN:GROUP</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Title</title>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/title/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ </entityField>
+ <entityField>
+ <name>FIRSTNAME</name>
+ <title>Firstname</title>
+ </entityField>
+ <entityField>
+ <name>LASTNAME</name>
+ <title>Lastname</title>
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EMAIL_ADDRESS</name>
+ <title>Email address</title>
+ </entityField>
+ <entityField>
+ <name>PASSWORD</name>
+ <title>Password</title>
+ <contentType>PASSWORD</contentType>
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/password/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>CONFIRM_PASSWORD</name>
+ <title>Confirm password</title>
+ <contentType>PASSWORD</contentType>
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/onValidation.js</onValidation>
+ </entityField>
+ <entityActionField>
+ <name>setPassword</name>
+ <fieldType>ACTION</fieldType>
+ <title>Set Password</title>
+ <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
+ </entityActionField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>TITLE.value</element>
+ <element>ISACTIVE.value</element>
+ <element>FIRSTNAME.value</element>
+ <element>LASTNAME.value</element>
+ <element>EMAIL_ADDRESS.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Employee_entity/entityfields/confirm_password/onValidation.js b/entity/Employee_entity/entityfields/confirm_password/onValidation.js
new file mode 100644
index 0000000000..1ade64458c
--- /dev/null
+++ b/entity/Employee_entity/entityfields/confirm_password/onValidation.js
@@ -0,0 +1,6 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$field.PASSWORD") != vars.get("$field.CONFIRM_PASSWORD"))
+ result.string(translate.text("Password and confirmation must be the same!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js b/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js
new file mode 100644
index 0000000000..7ae1ab2b4f
--- /dev/null
+++ b/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object({
+ "true" : translate.text("Yes"),
+ "false" : translate.text("No")
+});
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/isactive/valueProcess.js b/entity/Employee_entity/entityfields/isactive/valueProcess.js
new file mode 100644
index 0000000000..d6c42ccf6d
--- /dev/null
+++ b/entity/Employee_entity/entityfields/isactive/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string("true");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/password/onValidation.js b/entity/Employee_entity/entityfields/password/onValidation.js
new file mode 100644
index 0000000000..1ade64458c
--- /dev/null
+++ b/entity/Employee_entity/entityfields/password/onValidation.js
@@ -0,0 +1,6 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$field.PASSWORD") != vars.get("$field.CONFIRM_PASSWORD"))
+ result.string(translate.text("Password and confirmation must be the same!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/setpassword/onActionProcess.js b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
new file mode 100644
index 0000000000..72a4b78bd1
--- /dev/null
+++ b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.neon");
+
+neon.openContext("Employee", "EmployeePassword_view", [vars.get("$field.TITLE")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/title/onValidation.js b/entity/Employee_entity/entityfields/title/onValidation.js
new file mode 100644
index 0000000000..86daa11792
--- /dev/null
+++ b/entity/Employee_entity/entityfields/title/onValidation.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.tools");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.TITLE") && tools.existUsers(vars.get("$field.TITLE")))
+ result.string(translate.text("The title already exists!"));
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..8a479d6601
--- /dev/null
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,24 @@
+import("system.vars");
+import("system.result");
+import("system.tools");
+import("Util_lib");
+
+var users;
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ users = vars.get("$local.idvalues");
+else
+ users = tools.getStoredUsers().map(function (row) {return row[1];});
+users = users.map(function (user)
+{
+ user = tools.getUser(user);
+ return [
+ user.title,
+ user.title,
+ user.params.isActive,
+ user.params.firstname,
+ user.params.lastname,
+ user.params.email
+ ];
+});
+
+result.object(users);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onDelete.js b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000..e10dd07e51
--- /dev/null
+++ b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.tools");
+
+tools.deleteUser(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000..a82eeac785
--- /dev/null
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.tools");
+
+var user = {};
+var parameters = []; //this has to be an array
+parameters[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+parameters[tools.LASTNAME] = vars.get("$field.LASTNAME");
+parameters[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+
+user[tools.TITLE] = vars.get("$field.TITLE");
+user[tools.PARAMS] = params;
+
+tools.insertUser(user);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000..2208551717
--- /dev/null
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.tools");
+
+var user = tools.getUser(vars.get("$field.TITLE"));
+
+user.params[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+user.params[tools.LASTNAME] = vars.get("$field.LASTNAME");
+user.params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+
+if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
+{
+ user[tools.PASSWORD] = vars.get("$field.PASSWORD");
+}
+
+tools.updateUser(user);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 3644aa55f8..f8e2253344 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -130,6 +130,10 @@
<key>Medium</key>
<value>Medium</value>
</entry>
+ <entry>
+ <key>The title already exists!</key>
+ <value>Der Titel existiert bereits!</value>
+ </entry>
<entry>
<key>Internet</key>
<value>Internet</value>
diff --git a/neonContext/Employee/Employee.aod b/neonContext/Employee/Employee.aod
new file mode 100644
index 0000000000..e9eced1253
--- /dev/null
+++ b/neonContext/Employee/Employee.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Employee</name>
+ <title>Employee</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>EmployeeMain_view</mainview>
+ <filterview>EmployeeFilter_view</filterview>
+ <editview>EmployeeEdit_view</editview>
+ <preview>EmployeePreview_view</preview>
+ <entity>Employee_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>51816f14-17da-4c96-80d8-f3b5280863b8</name>
+ <view>EmployeeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>91c2bbc7-89fb-4688-881e-6fa21e96b211</name>
+ <view>EmployeeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6a36e3cf-5918-4c60-94d9-a3a7ed50ffce</name>
+ <view>EmployeePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>215e8e26-662f-45f6-9c61-c0b0b1129e66</name>
+ <view>EmployeeMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a01b0910-cd32-4fa7-a739-0b9eb19debc2</name>
+ <view>EmployeePassword_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
new file mode 100644
index 0000000000..cb955b069a
--- /dev/null
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -0,0 +1,39 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>aff1892e-9fca-45cd-bcd6-d2b857e2cb7b</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
+ <entityField>FIRSTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
+ <entityField>LASTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
new file mode 100644
index 0000000000..42acff8f12
--- /dev/null
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -0,0 +1,34 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Employees</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
+ <entityField>ISACTIVE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>18b974f1-81ea-4ca0-83bf-a1505f763446</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>27c4199c-157a-4c3e-a851-01aa1d82dfd2</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
new file mode 100644
index 0000000000..0cceb2165e
--- /dev/null
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -0,0 +1,18 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeeMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>f9ae631b-48ad-4d7c-a3a1-6cb00230e5c7</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>f9ae631b-48ad-4d7c-a3a1-6cb00230e5c7</name>
+ <entityField>#ENTITY</entityField>
+ <view>EmployeePreview_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/EmployeePassword_view/EmployeePassword_view.aod b/neonView/EmployeePassword_view/EmployeePassword_view.aod
new file mode 100644
index 0000000000..0731140bd0
--- /dev/null
+++ b/neonView/EmployeePassword_view/EmployeePassword_view.aod
@@ -0,0 +1,27 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeePassword_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Password</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>632294e8-f9ec-4bd1-afe4-87e3b5fc84c4</name>
+ <entityField>PASSWORD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>66a7726a-c226-4d74-95a4-ea88950920bf</name>
+ <entityField>CONFIRM_PASSWORD</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
new file mode 100644
index 0000000000..d18d815697
--- /dev/null
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -0,0 +1,17 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Card</name>
+ <titleField>TITLE</titleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ </children>
+</neonView>
--
GitLab
From 9bfe1b834b130a34319b0df6258386a7de83546b Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 28 Mar 2019 16:51:49 +0100
Subject: [PATCH 139/250] Employee fix
---
entity/Employee_entity/Employee_entity.aod | 6 +++++-
.../entityfields/confirm_password/onValidation.js | 3 ++-
.../Employee_entity/entityfields/password/onValidation.js | 6 ------
.../entityfields/setpassword/onActionProcess.js | 5 ++++-
entity/Employee_entity/recordcontainers/jdito/onUpdate.js | 5 +++--
5 files changed, 14 insertions(+), 11 deletions(-)
delete mode 100644 entity/Employee_entity/entityfields/password/onValidation.js
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 1ed33a9fdb..80c05d8fb1 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -44,7 +44,6 @@
<name>PASSWORD</name>
<title>Password</title>
<contentType>PASSWORD</contentType>
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/password/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CONFIRM_PASSWORD</name>
@@ -58,6 +57,11 @@
<title>Set Password</title>
<onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
</entityActionField>
+ <entityParameter>
+ <name>passwordChange_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Employee_entity/entityfields/confirm_password/onValidation.js b/entity/Employee_entity/entityfields/confirm_password/onValidation.js
index 1ade64458c..f4f7551118 100644
--- a/entity/Employee_entity/entityfields/confirm_password/onValidation.js
+++ b/entity/Employee_entity/entityfields/confirm_password/onValidation.js
@@ -1,6 +1,7 @@
import("system.translate");
import("system.result");
import("system.vars");
+import("Entity_lib");
-if (vars.get("$field.PASSWORD") != vars.get("$field.CONFIRM_PASSWORD"))
+if (vars.get("$field.PASSWORD") != ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONFIRM_PASSWORD")))
result.string(translate.text("Password and confirmation must be the same!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/password/onValidation.js b/entity/Employee_entity/entityfields/password/onValidation.js
deleted file mode 100644
index 1ade64458c..0000000000
--- a/entity/Employee_entity/entityfields/password/onValidation.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$field.PASSWORD") != vars.get("$field.CONFIRM_PASSWORD"))
- result.string(translate.text("Password and confirmation must be the same!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/setpassword/onActionProcess.js b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
index 72a4b78bd1..c05551ee97 100644
--- a/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
+++ b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
@@ -1,4 +1,7 @@
import("system.vars");
import("system.neon");
-neon.openContext("Employee", "EmployeePassword_view", [vars.get("$field.TITLE")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
+var params = {
+ "passwordChange_param" : true
+};
+neon.openContext("Employee", "EmployeePassword_view", [vars.get("$field.TITLE")], neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 2208551717..0e94ccf1fc 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -7,9 +7,10 @@ user.params[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
user.params[tools.LASTNAME] = vars.get("$field.LASTNAME");
user.params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
-if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
+if (vars.exists("$param.passwordChange_param") && vars.get("$param.passwordChange_param")
+ && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
{
- user[tools.PASSWORD] = vars.get("$field.PASSWORD");
+ user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
}
tools.updateUser(user);
\ No newline at end of file
--
GitLab
From 93fd6c244b6cdbf2968bbe99111f4efc84173ed9 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 29 Mar 2019 15:32:40 +0100
Subject: [PATCH 140/250] Employee and EmployeeRole
---
.../_____SYSTEM_APPLICATION_NEON.aod | 1 +
.../AttributeRelation_entity.aod | 6 +
.../EmployeeRole_entity.aod | 50 +++++++++
.../entityfields/uid/possibleItemsProcess.js | 10 ++
.../recordcontainers/jdito/contentProcess.js | 11 ++
.../recordcontainers/jdito/onInsert.js | 22 ++++
entity/Employee_entity/Employee_entity.aod | 103 +++++++++++++++++-
.../objectrowid_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
.../entityfields/contact_id/onValidation.js | 0
.../children/usertitle_param/valueProcess.js | 4 +
.../entityfields/firstname/valueProcess.js | 16 +++
.../entityfields/image/valueProcess.js | 15 +++
.../entityfields/lastname/valueProcess.js | 16 +++
.../name_fieldgroup/valueProcess.js | 4 +
.../confirm_password => }/onValidation.js | 3 +-
.../recordcontainers/jdito/contentProcess.js | 19 +++-
.../recordcontainers/jdito/onInsert.js | 10 +-
.../recordcontainers/jdito/onUpdate.js | 9 +-
.../_____LANGUAGE_EXTRA.aod | 18 +++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 19 ++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 18 +++
neonContext/EmployeeRole/EmployeeRole.aod | 12 ++
.../EmployeeEdit_view/EmployeeEdit_view.aod | 8 ++
.../EmployeeFilter_view.aod | 5 +
.../EmployeeMain_view/EmployeeMain_view.aod | 10 ++
.../EmployeePreview_view.aod | 25 ++++-
.../EmployeeRoleFilter_view.aod | 23 ++++
28 files changed, 424 insertions(+), 21 deletions(-)
create mode 100644 entity/EmployeeRole_entity/EmployeeRole_entity.aod
create mode 100644 entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js
create mode 100644 entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
create mode 100644 entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
create mode 100644 entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/contact_id/onValidation.js
create mode 100644 entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/firstname/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/image/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/lastname/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js
rename entity/Employee_entity/{entityfields/confirm_password => }/onValidation.js (52%)
create mode 100644 neonContext/EmployeeRole/EmployeeRole.aod
create mode 100644 neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index daae7fbe27..74af7250a3 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -32,6 +32,7 @@
<node name="Attribute" kind="10077" />
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
+ <node name="Employee" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 2821c0bf01..118e70579d 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -99,6 +99,12 @@
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>cb20be7b-35aa-43c7-bf98-3a31010b33d6</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
new file mode 100644
index 0000000000..fa71af3a04
--- /dev/null
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -0,0 +1,50 @@
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>EmployeeRole_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <title>Role</title>
+ <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>EmployeeRoles</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFields>
+ <element>UID.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js b/entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js
new file mode 100644
index 0000000000..a9b4b9a616
--- /dev/null
+++ b/entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.tools");
+
+var roles = [];
+var allRoles = tools.getAllRoles([tools.ROLE_INTERNAL, tools.ROLE_PROJECT, tools.ROLE_XMPP]);
+
+for (let roleId in allRoles)
+ roles.push([roleId, allRoles[roleId][0]])
+
+result.object(roles);
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..9f314aac5d
--- /dev/null
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var roles = [];
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+
+if (userTitle)
+ roles = tools.getRoles(userTitle).map(function (role) {return [role]});
+
+result.object(roles);
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000..bd399bd50c
--- /dev/null
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,22 @@
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+var role = vars.get("$field.UID");
+
+if (userTitle)
+{
+ var user = tools.getUser(userTitle);
+ var roles = tools.getRoles(userTitle);
+ var roleObj = {};
+ roles = [role].concat(roles)
+ .filter(function (role)
+ {
+ roleObj[role] = true;
+ return !(role in roleObj);
+ });
+ user[tools.ROLES] = roles;
+
+ tools.updateUser(user);
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 80c05d8fb1..f79dd76e4d 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -3,6 +3,7 @@
<name>Employee_entity</name>
<title>Employee</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
<iconId>VAADIN:GROUP</iconId>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -11,23 +12,30 @@
</entityProvider>
<entityField>
<name>UID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>TITLE</name>
- <title>Title</title>
+ <title>Login</title>
<mandatory v="true" />
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/title/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CONTACT_ID</name>
+ <title>Person</title>
+ <consumer>Contacts</consumer>
+ <mandatory v="false" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
</entityField>
<entityField>
<name>FIRSTNAME</name>
<title>Firstname</title>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/firstname/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LASTNAME</name>
<title>Lastname</title>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ISACTIVE</name>
@@ -38,30 +46,114 @@
</entityField>
<entityField>
<name>EMAIL_ADDRESS</name>
- <title>Email address</title>
+ <title>Email</title>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>PASSWORD</name>
<title>Password</title>
<contentType>PASSWORD</contentType>
+ <searchable v="false" />
</entityField>
<entityField>
<name>CONFIRM_PASSWORD</name>
<title>Confirm password</title>
<contentType>PASSWORD</contentType>
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/onValidation.js</onValidation>
+ <searchable v="false" />
</entityField>
<entityActionField>
<name>setPassword</name>
<fieldType>ACTION</fieldType>
- <title>Set Password</title>
+ <title>Set password</title>
<onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PASSWORD</iconId>
</entityActionField>
<entityParameter>
<name>passwordChange_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityParameter>
+ <name>onlyActives_param</name>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Contacts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityFieldGroup>
+ <name>NAME_fieldGroup</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+ <title>Name</title>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>FIRSTNAME</element>
+ <element>LASTNAME</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DEPARTMENT</name>
+ <title>Department</title>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>ROLES</name>
+ </entityField>
+ <entityConsumer>
+ <name>EmployeeRoles</name>
+ <title>Roles</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>EmployeeRole_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -78,6 +170,9 @@
<element>FIRSTNAME.value</element>
<element>LASTNAME.value</element>
<element>EMAIL_ADDRESS.value</element>
+ <element>DESCRIPTION.value</element>
+ <element>CONTACT_ID.value</element>
+ <element>CONTACT_ID.displayValue</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..24b12e282d
--- /dev/null
+++ b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..5996e99db2
--- /dev/null
+++ b/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/contact_id/onValidation.js b/entity/Employee_entity/entityfields/contact_id/onValidation.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
new file mode 100644
index 0000000000..8277e40dbe
--- /dev/null
+++ b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/firstname/valueProcess.js b/entity/Employee_entity/entityfields/firstname/valueProcess.js
new file mode 100644
index 0000000000..7558bfe949
--- /dev/null
+++ b/entity/Employee_entity/entityfields/firstname/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var firstname = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select FIRSTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
+ );
+ result.string(firstname);
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/image/valueProcess.js b/entity/Employee_entity/entityfields/image/valueProcess.js
new file mode 100644
index 0000000000..4701975fe7
--- /dev/null
+++ b/entity/Employee_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.db");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Person_lib");
+import("Sql_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+ var personId = db.cell(SqlCondition.begin()
+ .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
+ .buildSql("select PERSON_ID from CONTACT")
+ );
+ result.string(PersUtils.getImage(personId, (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
+}
diff --git a/entity/Employee_entity/entityfields/lastname/valueProcess.js b/entity/Employee_entity/entityfields/lastname/valueProcess.js
new file mode 100644
index 0000000000..919ab80374
--- /dev/null
+++ b/entity/Employee_entity/entityfields/lastname/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var lastname = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select LASTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
+ );
+ result.string(lastname);
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js b/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js
new file mode 100644
index 0000000000..2cb5fabc54
--- /dev/null
+++ b/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim());
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/confirm_password/onValidation.js b/entity/Employee_entity/onValidation.js
similarity index 52%
rename from entity/Employee_entity/entityfields/confirm_password/onValidation.js
rename to entity/Employee_entity/onValidation.js
index f4f7551118..1ade64458c 100644
--- a/entity/Employee_entity/entityfields/confirm_password/onValidation.js
+++ b/entity/Employee_entity/onValidation.js
@@ -1,7 +1,6 @@
import("system.translate");
import("system.result");
import("system.vars");
-import("Entity_lib");
-if (vars.get("$field.PASSWORD") != ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONFIRM_PASSWORD")))
+if (vars.get("$field.PASSWORD") != vars.get("$field.CONFIRM_PASSWORD"))
result.string(translate.text("Password and confirmation must be the same!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 8a479d6601..71470598bf 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.result");
import("system.tools");
@@ -12,13 +13,19 @@ users = users.map(function (user)
{
user = tools.getUser(user);
return [
- user.title,
- user.title,
- user.params.isActive,
- user.params.firstname,
- user.params.lastname,
- user.params.email
+ user[tools.TITLE],
+ user[tools.TITLE],
+ user[tools.PARAMS][tools.ISACTIVE],
+ user[tools.PARAMS][tools.FIRSTNAME],
+ user[tools.PARAMS][tools.LASTNAME],
+ user[tools.PARAMS][tools.EMAIL],
+ user[tools.PARAMS][tools.DESCRIPTION],
+ user[tools.PARAMS][tools.CONTACTID],
+ user[tools.PARAMS][tools.CONTACTID]
];
});
+var filter = vars.exists("$local.filter") && vars.get("$local.filter");
+//logging.log(filter)
+
result.object(users);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index a82eeac785..85d0821c80 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -2,10 +2,12 @@ import("system.vars");
import("system.tools");
var user = {};
-var parameters = []; //this has to be an array
-parameters[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
-parameters[tools.LASTNAME] = vars.get("$field.LASTNAME");
-parameters[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+var params = []; //this has to be an array
+params[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+params[tools.LASTNAME] = vars.get("$field.LASTNAME");
+params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
+params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS] = params;
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 0e94ccf1fc..7d445e2474 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -1,11 +1,14 @@
+import("system.logging");
import("system.vars");
import("system.tools");
var user = tools.getUser(vars.get("$field.TITLE"));
-user.params[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
-user.params[tools.LASTNAME] = vars.get("$field.LASTNAME");
-user.params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
+user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
+user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
if (vars.exists("$param.passwordChange_param") && vars.get("$param.passwordChange_param")
&& vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index a0f27879af..d9b394cbcb 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2655,6 +2655,18 @@
<entry>
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
</entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
+ <entry>
+ <key>Password</key>
+ </entry>
+ <entry>
+ <key>Confirm password</key>
+ </entry>
+ <entry>
+ <key>Set password</key>
+ </entry>
<entry>
<key>Email</key>
</entry>
@@ -2673,6 +2685,12 @@
<entry>
<key>{$OBJECTLINK_OBJECT}</key>
</entry>
+ <entry>
+ <key>Roles</key>
+ </entry>
+ <entry>
+ <key>standard phone</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 f8e2253344..c9c66d90bf 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
<key>Company</key>
<value>Firma</value>
</entry>
+ <entry>
+ <key>Confirm password</key>
+ <value>Passwort bestätigen</value>
+ </entry>
<entry>
<key>Entrydate (Day)</key>
<value>Eingangsdatum (Tag)</value>
@@ -146,6 +150,10 @@
<key>Online-Meeting</key>
<value>Online-Meeting</value>
</entry>
+ <entry>
+ <key>Set password</key>
+ <value>Passwort setzen</value>
+ </entry>
<entry>
<key>Choose address</key>
<value>Adresse auswählen</value>
@@ -2582,6 +2590,10 @@
<key>Internal</key>
<value>intern</value>
</entry>
+ <entry>
+ <key>Roles</key>
+ <value>Rollen</value>
+ </entry>
<entry>
<key>Brunei Darussalam</key>
<value>Brunei Darussalam</value>
@@ -2710,6 +2722,10 @@
<key>Hong Kong</key>
<value>Hongkong</value>
</entry>
+ <entry>
+ <key>Password</key>
+ <value>Passwort</value>
+ </entry>
<entry>
<key>Chad</key>
<value>Tschad</value>
@@ -3442,6 +3458,9 @@
<key>{$OBJECTLINK_OBJECT}</key>
<value>Objekt</value>
</entry>
+ <entry>
+ <key>standard phone</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 4c8ee3cf90..b30d135609 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -713,6 +713,9 @@
<entry>
<key>Connection</key>
</entry>
+ <entry>
+ <key>standard phone</key>
+ </entry>
<entry>
<key>standard email</key>
</entry>
@@ -2683,6 +2686,18 @@
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
<value>%0 has to be between %2 and %3.</value>
</entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
+ <entry>
+ <key>Password</key>
+ </entry>
+ <entry>
+ <key>Confirm password</key>
+ </entry>
+ <entry>
+ <key>Set password</key>
+ </entry>
<entry>
<key>Email</key>
</entry>
@@ -2703,6 +2718,9 @@
<key>{$OBJECTLINK_OBJECT}</key>
<value>Object</value>
</entry>
+ <entry>
+ <key>Roles</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/EmployeeRole/EmployeeRole.aod b/neonContext/EmployeeRole/EmployeeRole.aod
new file mode 100644
index 0000000000..0cb5fb8242
--- /dev/null
+++ b/neonContext/EmployeeRole/EmployeeRole.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>EmployeeRole</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>EmployeeRole_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>fd4de342-238b-494e-a85b-ff08e3f065b9</name>
+ <view>EmployeeRoleFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index cb955b069a..61348eb415 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -21,6 +21,10 @@
<name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
<entityField>ISACTIVE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
<entityField>FIRSTNAME</entityField>
@@ -33,6 +37,10 @@
<name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
<entityField>EMAIL_ADDRESS</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index 42acff8f12..121d76e930 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
<name>EmployeeFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
@@ -12,6 +13,10 @@
<name>Employees</name>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>15185ef0-5402-43c4-b5c9-1e0e836ef1c3</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
<entityField>TITLE</entityField>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index 0cceb2165e..9aa43b4eca 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -14,5 +14,15 @@
<entityField>#ENTITY</entityField>
<view>EmployeePreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>79a01c28-1eaa-4974-babd-fb6e4d59471b</name>
+ <entityField>EmployeeRoles</entityField>
+ <view>EmployeeRoleFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7164f8cd-3892-4694-92ad-fc45afac68f1</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index d18d815697..2cbb42497c 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -9,9 +9,30 @@
</layout>
<children>
<cardViewTemplate>
- <name>Card</name>
- <titleField>TITLE</titleField>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>NAME_fieldGroup</titleField>
+ <subtitleField>TITLE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>0bda9209-1437-49eb-98b7-6edea9c6836a</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d9786e3d-5364-4075-a08d-0d4ea91c4728</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>79cd6a97-6caf-4acb-81af-028b94f33e8f</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
</children>
</neonView>
diff --git a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
new file mode 100644
index 0000000000..1938871992
--- /dev/null
+++ b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
@@ -0,0 +1,23 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeeRoleFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ab1c8d39-fc29-42e8-8b8e-3557d544b272</name>
+ <entityField>UID</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
--
GitLab
From 13277ebd72ae1cced39392dfdb8ba32107f9c100 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 15:56:22 +0100
Subject: [PATCH 141/250] Preset Activity&Task Link in Contact
---
entity/Contact_entity/Contact_entity.aod | 2 +-
entity/Person_entity/Person_entity.aod | 10 ++++++++++
.../children/presetlinks_param/valueProcess.js | 5 +++++
.../additionalactivitylinks_param/valueProcess.js | 10 ++++++++++
.../entityfields/newactivity/onActionProcess.js | 4 +++-
5 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index a98e4ccf61..05d8f1930b 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -15,7 +15,7 @@
</entityField>
<entityField>
<name>ORGANISATION_ID</name>
- <title>Organisation</title>
+ <title>Company</title>
<consumer>Organisations</consumer>
<mandatory v="false" />
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 242a346917..807cbc4a7b 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -107,6 +107,10 @@
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
@@ -831,6 +835,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>USER_NEW_CONTACT</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
</entityField>
+ <entityParameter>
+ <name>AdditionalActivityLinks_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js</valueProcess>
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
new file mode 100644
index 0000000000..e99125dac0
--- /dev/null
+++ b/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+var links = vars.get("$param.AdditionalActivityLinks_param");
+result.string(links);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js b/entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js
new file mode 100644
index 0000000000..79f798f5d2
--- /dev/null
+++ b/entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("system.vars");
+
+var links = [];
+if (vars.get("$field.ORGANISATION_ID"))
+ links.push(["Organisation", vars.get("$field.ORGANISATION_ID")]);
+
+links = JSON.stringify(links);
+result.string(links);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newactivity/onActionProcess.js b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
index 34520c7f11..d8b4bc6fa8 100644
--- a/entity/Person_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
@@ -1,4 +1,6 @@
import("system.vars");
import("ActivityTask_lib");
-ActivityUtils.createNewActivity(vars.getString("$field.CONTACTID"));
\ No newline at end of file
+var links = vars.get("$param.AdditionalActivityLinks_param");
+links = JSON.parse(links);
+ActivityUtils.createNewActivity(vars.getString("$field.CONTACTID"), links);
\ No newline at end of file
--
GitLab
From bfa20de5d9d4b6e351eecccbdf46561950d50061 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 16:13:05 +0100
Subject: [PATCH 142/250] Activity&Task: Links and label changes
---
entity/Activity_entity/Activity_entity.aod | 1 +
.../direction_icon/valueProcess.js | 21 ++++++++++++----
entity/Person_entity/Person_entity.aod | 8 +++++--
.../presetlinks_param/valueProcess.js | 2 +-
.../valueProcess.js | 4 +++-
.../newactivity/onActionProcess.js | 2 +-
.../entityfields/newtask/onActionProcess.js | 5 +++-
.../presetlinks_param/valueProcess.js | 5 ++++
entity/Task_entity/Task_entity.aod | 4 ++--
.../_____LANGUAGE_EXTRA.aod | 20 ++++++++--------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 24 +++++++++----------
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 24 +++++++++----------
neonView/TaskFilter_view/TaskFilter_view.aod | 12 +++++-----
process/KeywordRegistry_basic/process.js | 3 +++
14 files changed, 83 insertions(+), 52 deletions(-)
rename entity/Person_entity/entityfields/{additionalactivitylinks_param => additionalactivitytasklinks_param}/valueProcess.js (72%)
create mode 100644 entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 3dff2ecaf5..cdc3b4a69a 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -13,6 +13,7 @@
<name>DIRECTION</name>
<title>Direction</title>
<consumer>KeywordDirections</consumer>
+ <mandatory v="true" />
<groupable v="true" />
<displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction/displayValueProcess.js</displayValueProcess>
</entityField>
diff --git a/entity/Activity_entity/entityfields/direction_icon/valueProcess.js b/entity/Activity_entity/entityfields/direction_icon/valueProcess.js
index b07c641b6b..ce60c7e407 100644
--- a/entity/Activity_entity/entityfields/direction_icon/valueProcess.js
+++ b/entity/Activity_entity/entityfields/direction_icon/valueProcess.js
@@ -1,8 +1,21 @@
import("system.vars");
import("system.result");
import("system.neon");
+import("KeywordRegistry_basic");
-if(vars.getString("$field.DIRECTION") == "i")
- result.string("vaadin:arrow_backward");
-else
- result.string("vaadin:arrow_forward");
+var direction = vars.getString("$field.DIRECTION");
+var res;
+switch (direction)
+{
+ case $KeywordRegistry.activityDirection$incoming():
+ res = "VAADIN:ARROW_BACKWARD";
+ break;
+ case $KeywordRegistry.activityDirection$outgoing():
+ res = "VAADIN:ARROW_FORWARD";
+ break;
+ default:
+ res = "";
+ break;
+}
+
+result.string(res);
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 807cbc4a7b..da58ebe4bd 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -642,6 +642,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -836,9 +840,9 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
- <name>AdditionalActivityLinks_param</name>
+ <name>AdditionalActivityTaskLinks_param</name>
<title></title>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js</valueProcess>
<description>PARAMETER</description>
</entityParameter>
</entityFields>
diff --git a/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
index e99125dac0..f790fd2b65 100644
--- a/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -1,5 +1,5 @@
import("system.result");
import("system.vars");
-var links = vars.get("$param.AdditionalActivityLinks_param");
+var links = vars.get("$param.AdditionalActivityTaskLinks_param");
result.string(links);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js b/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js
similarity index 72%
rename from entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js
rename to entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js
index 79f798f5d2..6837f0bb73 100644
--- a/entity/Person_entity/entityfields/additionalactivitylinks_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js
@@ -3,7 +3,9 @@ import("system.vars");
import("system.vars");
var links = [];
-if (vars.get("$field.ORGANISATION_ID"))
+
+var orgId = vars.get("$field.ORGANISATION_ID")
+if (orgId && orgId.trim() != "0")
links.push(["Organisation", vars.get("$field.ORGANISATION_ID")]);
links = JSON.stringify(links);
diff --git a/entity/Person_entity/entityfields/newactivity/onActionProcess.js b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
index d8b4bc6fa8..e7d148841f 100644
--- a/entity/Person_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
@@ -1,6 +1,6 @@
import("system.vars");
import("ActivityTask_lib");
-var links = vars.get("$param.AdditionalActivityLinks_param");
+var links = vars.get("$param.AdditionalActivityTaskLinks_param");
links = JSON.parse(links);
ActivityUtils.createNewActivity(vars.getString("$field.CONTACTID"), links);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newtask/onActionProcess.js b/entity/Person_entity/entityfields/newtask/onActionProcess.js
index 71580d10a1..6293b7faa2 100644
--- a/entity/Person_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newtask/onActionProcess.js
@@ -1,4 +1,7 @@
import("system.vars");
import("ActivityTask_lib");
-TaskUtils.createNewTask(vars.get("$field.CONTACTID"));
\ No newline at end of file
+var links = vars.get("$param.AdditionalActivityTaskLinks_param");
+links = JSON.parse(links);
+
+TaskUtils.createNewTask(vars.get("$field.CONTACTID"), links);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js b/entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
new file mode 100644
index 0000000000..f790fd2b65
--- /dev/null
+++ b/entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+var links = vars.get("$param.AdditionalActivityTaskLinks_param");
+result.string(links);
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 3111fd2565..213666a309 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -62,7 +62,7 @@
</entityField>
<entityField>
<name>START_DATE</name>
- <title>start date</title>
+ <title>Begin</title>
<contentType>DATE</contentType>
<resolution>MINUTE</resolution>
<groupable v="true" />
@@ -71,7 +71,7 @@
</entityField>
<entityField>
<name>MATURITY_DATE</name>
- <title>maturity date</title>
+ <title>Maturity</title>
<contentType>DATE</contentType>
<resolution>MINUTE</resolution>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d9b394cbcb..d1e1e40383 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1002,9 +1002,6 @@
<entry>
<key>{$TASK_REQUESTOR}</key>
</entry>
- <entry>
- <key>start date</key>
- </entry>
<entry>
<key>task number</key>
</entry>
@@ -1083,9 +1080,6 @@
<entry>
<key>details</key>
</entry>
- <entry>
- <key>maturity date</key>
- </entry>
<entry>
<key>Contact type</key>
</entry>
@@ -2411,9 +2405,6 @@
<entry>
<key>ex works</key>
</entry>
- <entry>
- <key>Relation</key>
- </entry>
<entry>
<key>30 days net</key>
<value></value>
@@ -2689,7 +2680,16 @@
<key>Roles</key>
</entry>
<entry>
- <key>standard phone</key>
+ <key>Password and confirmation must be the same!</key>
+ </entry>
+ <entry>
+ <key>Login</key>
+ </entry>
+ <entry>
+ <key>Begin</key>
+ </entry>
+ <entry>
+ <key>Maturity</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index c9c66d90bf..1745419852 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1450,10 +1450,6 @@
<entry>
<key>asdf</key>
</entry>
- <entry>
- <key>maturity date</key>
- <value>Fälligkeitsdatum</value>
- </entry>
<entry>
<key>{$TASK_STATUS}</key>
<value>Status</value>
@@ -1470,10 +1466,6 @@
<key>{$TASK_REQUESTOR}</key>
<value>Anforderer</value>
</entry>
- <entry>
- <key>start date</key>
- <value>Beginndatum</value>
- </entry>
<entry>
<key>task number</key>
<value>Aufgabennummer</value>
@@ -3196,9 +3188,6 @@
<key>ex works</key>
<value>ab Werk</value>
</entry>
- <entry>
- <key>Relation</key>
- </entry>
<entry>
<key>Payment term</key>
<value>Zahlungsbedingung</value>
@@ -3459,7 +3448,18 @@
<value>Objekt</value>
</entry>
<entry>
- <key>standard phone</key>
+ <key>Password and confirmation must be the same!</key>
+ </entry>
+ <entry>
+ <key>Login</key>
+ </entry>
+ <entry>
+ <key>Begin</key>
+ <value>Beginn</value>
+ </entry>
+ <entry>
+ <key>Maturity</key>
+ <value>Fällig</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index b30d135609..81f9dded14 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -713,9 +713,6 @@
<entry>
<key>Connection</key>
</entry>
- <entry>
- <key>standard phone</key>
- </entry>
<entry>
<key>standard email</key>
</entry>
@@ -1021,9 +1018,6 @@
<key>{$TASK_REQUESTOR}</key>
<value>requestor</value>
</entry>
- <entry>
- <key>start date</key>
- </entry>
<entry>
<key>task number</key>
</entry>
@@ -1104,9 +1098,6 @@
<entry>
<key>details</key>
</entry>
- <entry>
- <key>maturity date</key>
- </entry>
<entry>
<key>Contact type</key>
</entry>
@@ -2423,9 +2414,6 @@
<entry>
<key>ex works</key>
</entry>
- <entry>
- <key>Relation</key>
- </entry>
<entry>
<key>30 days net</key>
</entry>
@@ -2721,6 +2709,18 @@
<entry>
<key>Roles</key>
</entry>
+ <entry>
+ <key>Password and confirmation must be the same!</key>
+ </entry>
+ <entry>
+ <key>Login</key>
+ </entry>
+ <entry>
+ <key>Begin</key>
+ </entry>
+ <entry>
+ <key>Maturity</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 5581203669..0e557d7bc8 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -39,15 +39,15 @@
<entityField>#ENTITY</entityField>
<title></title>
<columns>
+ <neonTableColumn>
+ <name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
+ <entityField>#ICON</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
<entityField>SUBJECT</entityField>
<expandRatio v="100" />
</neonTableColumn>
- <neonTableColumn>
- <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>5d11add4-d939-4c8e-9633-efd0c2991837</name>
<entityField>PRIORITY</entityField>
@@ -57,8 +57,8 @@
<entityField>MATURITY_DATE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>51190c85-fa03-4022-bc72-063d4b895d5b</name>
- <entityField>EDITOR_CONTACT_ID</entityField>
+ <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
+ <entityField>STATUS</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 6b42e2ff36..ec0826d232 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -22,7 +22,10 @@ $KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType"
$KeywordRegistry.contractPayment = function(){return "ContractPayment";};
$KeywordRegistry.contractStatus = function(){return "ContractStatus";};
$KeywordRegistry.contractType = function(){return "ContractType";};
+
$KeywordRegistry.activityDirection = function(){return "ActivityDirection";};
+$KeywordRegistry.activityDirection$incoming = function(){return "BSICacti-0dir-0inc-b8a3-f43e2c73df65";};
+$KeywordRegistry.activityDirection$outgoing = function(){return "BSICacti-0dir-outg-8337-909b0f93143a";};
$KeywordRegistry.contactStatus = function(){return "ContactStatus";};
$KeywordRegistry.contactStatus$active = function(){return "BSIC0rel-stat-actv-ae03-b6b04430e90b";};
--
GitLab
From e43889e0b512252292c6becd154dafc21ed4c85b Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 16:39:50 +0100
Subject: [PATCH 143/250] contactmgmt: adjusted searchable fields
---
entity/Organisation_entity/Organisation_entity.aod | 6 ++++++
entity/Person_entity/Person_entity.aod | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 766b3a4856..19bd7ed720 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -747,26 +747,32 @@
</entityConsumer>
<entityField>
<name>DATE_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW_CONTACT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW_CONTACT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
</entityField>
</entityFields>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index da58ebe4bd..c55ad940fa 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -745,6 +745,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityField>
<name>ORGANISATION_NAME</name>
+ <searchable v="false" />
</entityField>
<entityParameter>
<name>ExcludedContactIds_param</name>
@@ -817,26 +818,32 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityField>
<name>DATE_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW_CONTACT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW_CONTACT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
--
GitLab
From 7dc62d3de8009b2da2a5d688281b1baa3dc6b99d Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 29 Mar 2019 16:42:32 +0100
Subject: [PATCH 144/250] Employee fix
---
.../AttributeRelationTree_entity.aod | 6 +
.../EmployeeRole_entity.aod | 2 +
.../recordcontainers/jdito/onDelete.js | 19 +++
.../recordcontainers/jdito/onInsert.js | 3 +-
.../recordcontainers/jdito/onUpdate.js | 23 +++
entity/Employee_entity/Employee_entity.aod | 21 +++
.../objectrowid_param/valueProcess.js | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
.../children/usertitle_param/valueProcess.js | 2 +-
.../entityfields/title/onValidation.js | 8 -
.../entityfields/uid/valueProcess.js | 7 +
.../recordcontainers/jdito/onInsert.js | 1 +
.../EmployeeMain_view/EmployeeMain_view.aod | 5 +
.../data/example_attribute/Attribute.xml | 22 +--
.../data/example_attribute/AttributeUsage.xml | 154 ++++++++++++++++++
15 files changed, 260 insertions(+), 21 deletions(-)
create mode 100644 entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
create mode 100644 entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
create mode 100644 entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
delete mode 100644 entity/Employee_entity/entityfields/title/onValidation.js
create mode 100644 entity/Employee_entity/entityfields/uid/valueProcess.js
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
index 12f10e91e6..3122954ecf 100644
--- a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
+++ b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
@@ -66,6 +66,12 @@
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
</entityFields>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index fa71af3a04..f184486509 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -42,6 +42,8 @@
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
</recordFields>
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000..cb067aab68
--- /dev/null
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+var role = vars.get("$field.UID");
+
+if (userTitle)
+{
+ var user = tools.getUser(userTitle);
+ var roles = tools.getRoles(userTitle);
+ roles = roles.filter(function (row)
+ {
+ return row != role;
+ });
+ user[tools.ROLES] = roles;
+
+ tools.updateUser(user);
+}
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
index bd399bd50c..23ca713599 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
@@ -13,8 +13,9 @@ if (userTitle)
roles = [role].concat(roles)
.filter(function (role)
{
+ var exists = role in roleObj;
roleObj[role] = true;
- return !(role in roleObj);
+ return !exists;
});
user[tools.ROLES] = roles;
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000..23ca713599
--- /dev/null
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,23 @@
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+var role = vars.get("$field.UID");
+
+if (userTitle)
+{
+ var user = tools.getUser(userTitle);
+ var roles = tools.getRoles(userTitle);
+ var roleObj = {};
+ roles = [role].concat(roles)
+ .filter(function (role)
+ {
+ var exists = role in roleObj;
+ roleObj[role] = true;
+ return !exists;
+ });
+ user[tools.ROLES] = roles;
+
+ tools.updateUser(user);
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index f79dd76e4d..8a7cb6fe7d 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -13,6 +13,7 @@
<entityField>
<name>UID</name>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/uid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TITLE</name>
@@ -154,6 +155,26 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..24b12e282d
--- /dev/null
+++ b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..5996e99db2
--- /dev/null
+++ b/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
index 8277e40dbe..2c71e53a49 100644
--- a/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.TITLE"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/title/onValidation.js b/entity/Employee_entity/entityfields/title/onValidation.js
deleted file mode 100644
index 86daa11792..0000000000
--- a/entity/Employee_entity/entityfields/title/onValidation.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("system.tools");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.TITLE") && tools.existUsers(vars.get("$field.TITLE")))
- result.string(translate.text("The title already exists!"));
diff --git a/entity/Employee_entity/entityfields/uid/valueProcess.js b/entity/Employee_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000..fa5d98db33
--- /dev/null
+++ b/entity/Employee_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ && vars.get("$field.TITLE"))
+ result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index 85d0821c80..070b796b0c 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -1,3 +1,4 @@
+import("system.neon");
import("system.vars");
import("system.tools");
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index 9aa43b4eca..11918294c2 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -24,5 +24,10 @@
<entityField>Attributes</entityField>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>68e54801-e68f-4797-97d2-368b4b82a7e4</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 2ae99c4f9e..28ca84e85f 100644
--- a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -300,7 +300,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Jahresurlaub"/>
<column name="ATTRIBUTE_PARENT_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
@@ -417,7 +417,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
<column name="ATTRIBUTE_NAME" value="Signatur"/>
<column name="ATTRIBUTE_TYPE" value="GROUP "/>
@@ -762,7 +762,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
<column name="ATTRIBUTE_NAME" value="Personal"/>
<column name="ATTRIBUTE_TYPE" value="GROUP "/>
@@ -811,7 +811,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
<column name="ATTRIBUTE_NAME" value="Mitarbeiterkonto"/>
<column name="ATTRIBUTE_TYPE" value="GROUP "/>
@@ -914,7 +914,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="schreibt für"/>
<column name="ATTRIBUTE_PARENT_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
@@ -936,7 +936,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Feiertag"/>
<column name="ATTRIBUTE_PARENT_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
@@ -976,7 +976,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Vorgesetzter von"/>
<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
@@ -984,7 +984,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="berichtet an"/>
<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
@@ -992,7 +992,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Gebiet"/>
<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
@@ -1000,7 +1000,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Urlaubsgenehmigung durch"/>
<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
@@ -1008,7 +1008,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="3f119858-9d69-4903-a572-d286be151f73"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Urlaubsprüfung durch"/>
<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
index d1cc31c444..ae2d23abf2 100644
--- a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -284,6 +284,76 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="OBJECT_TYPE" value="Person"/>
</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="1f269307-9900-44e7-b575-0412f0ac2908"/>
+ <column name="AB_ATTRIBUTE_ID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
+ <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
+ <column name="AB_ATTRIBUTE_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
+ <column name="AB_ATTRIBUTE_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
+ <column name="AB_ATTRIBUTE_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
+ <column name="AB_ATTRIBUTE_ID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="931958f6-efaf-4da2-89b1-92f844787094"/>
+ <column name="AB_ATTRIBUTE_ID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
+ <column name="AB_ATTRIBUTE_ID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
+ <column name="AB_ATTRIBUTE_ID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
+ <column name="AB_ATTRIBUTE_ID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
+ <column name="AB_ATTRIBUTE_ID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="404278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
+ <column name="AB_ATTRIBUTE_ID" value="3f119858-9d69-4903-a572-d286be151f73"/>
+ <column name="OBJECT_TYPE" value="Employee"/>
+</insert>
<rollback>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID = ?</where>
@@ -615,6 +685,90 @@
<param value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
</whereParams>
</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="1f269307-9900-44e7-b575-0412f0ac2908"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="931958f6-efaf-4da2-89b1-92f844787094"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="04278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
+ </whereParams>
+</delete>
</rollback>
</changeSet>
</databaseChangeLog>
--
GitLab
From 84c9be6966465a0351c7ea5d6d3121a4ae6345cb Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 16:50:27 +0100
Subject: [PATCH 145/250] Salesproject: contact into preview
---
.../SalesprojectPreview_view.aod | 183 +++++++++---------
1 file changed, 92 insertions(+), 91 deletions(-)
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 315544ca5c..86491e2ff9 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,91 +1,92 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>SalesprojectPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Head</name>
- <iconField>IMAGE</iconField>
- <titleField>PROJECTTITLE</titleField>
- <descriptionField>PROJECTCODE</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
- <entityField>RELATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
- <entityField>STATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
- <entityField>REASONS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
- <entityField>PHASE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
- <entityField>STARTDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
- <entityField>ENDDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
- <entityField>PROBABILITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
- <entityField>VOLUME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
- <entityField>TIMETRACKINGSUM</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Further informations</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- <scoreCardViewTemplate>
- <name>AdditionalInfo</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>79490331-6be4-422f-9450-da0db56f0654</name>
- <entityField>DAYS_NOTACTIVE</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
- </children>
-</neonView>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>SalesprojectPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Head</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PROJECTTITLE</titleField>
+ <subtitleField>CONTACT_ID</subtitleField>
+ <descriptionField>PROJECTCODE</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
+ <entityField>RELATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
+ <entityField>STATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
+ <entityField>REASONS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
+ <entityField>STARTDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
+ <entityField>ENDDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
+ <entityField>PROBABILITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
+ <entityField>VOLUME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
+ <entityField>TIMETRACKINGSUM</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Further informations</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <scoreCardViewTemplate>
+ <name>AdditionalInfo</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>79490331-6be4-422f-9450-da0db56f0654</name>
+ <entityField>DAYS_NOTACTIVE</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
--
GitLab
From bb3ca9b22041fa30157fa3cb17bfc85b8c4e9bb1 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 17:05:03 +0100
Subject: [PATCH 146/250] Document: adjust Preview
---
.../DocumentPreview_view.aod | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/neonView/DocumentPreview_view/DocumentPreview_view.aod b/neonView/DocumentPreview_view/DocumentPreview_view.aod
index c5b0b80483..b5c1513318 100644
--- a/neonView/DocumentPreview_view/DocumentPreview_view.aod
+++ b/neonView/DocumentPreview_view/DocumentPreview_view.aod
@@ -12,27 +12,23 @@
<name>Head</name>
<iconField>PREVIEW_IMAGE</iconField>
<titleField>NAME</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
+ <subtitleField>TYPE</subtitleField>
+ <descriptionField>SIZE</descriptionField>
<favoriteAction1>downloadSingleFileAction</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>Info</name>
- <editMode v="false" />
+ <name>Details</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>440566ed-1e63-437c-84d0-c5c7af5bc77a</name>
- <entityField>SIZE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>561bb15b-2bb5-441b-af7c-b49cc9e809cd</name>
- <entityField>TYPE</entityField>
+ <name>85eba544-ca8f-40aa-ba01-9311f8861033</name>
+ <entityField>IS_MAIN_DOCUMENT</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>66fc2feb-a0c3-4ac6-8eae-809a7a8da289</name>
- <entityField>IS_MAIN_DOCUMENT</entityField>
+ <name>4a89e2f0-1b61-432f-9560-b5f171f7e06d</name>
+ <entityField>DESCRIPTION</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
--
GitLab
From 10e75c33a3d90ad12a3306fa4a8c5a589bb7bfcb Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 17:07:59 +0100
Subject: [PATCH 147/250] Offer: searchable fields
---
entity/Offer_entity/Offer_entity.aod | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index a5e72ce894..07c13a4f19 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -661,18 +661,22 @@
</entityConsumer>
<entityField>
<name>USER_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
</entityFields>
--
GitLab
From 578470359a019cf155c9f76a972b11f27089d6e6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 17:12:52 +0100
Subject: [PATCH 148/250] Offer: sorting in main view
---
neonView/OfferMain_view/OfferMain_view.aod | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index 4b4735152b..f4fe27b4bb 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -19,6 +19,11 @@
<entityField>Offeritems</entityField>
<view>OfferitemFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e6b12eed-d67e-467c-9302-f6340f901235</name>
+ <entityField>#ENTITY</entityField>
+ <view>OfferDetail_view</view>
+ </neonViewReference>
<neonViewReference>
<name>a3702740-418d-40d5-9415-788542c14abb</name>
<entityField>Activities</entityField>
@@ -29,11 +34,6 @@
<entityField>Tasks</entityField>
<view>TaskFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>e6b12eed-d67e-467c-9302-f6340f901235</name>
- <entityField>#ENTITY</entityField>
- <view>OfferDetail_view</view>
- </neonViewReference>
<neonViewReference>
<name>e96f2fec-1a98-4380-895a-82ab78ba408a</name>
<entityField>Documents</entityField>
--
GitLab
From 48a47a74a57f031600de8a4520063348510277f5 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 09:21:06 +0200
Subject: [PATCH 149/250] Exclude Activity & Task as chooseable context within
the ActivityLink and TaskLink entity
---
.../ActivityLink_entity.aod | 2 +-
entity/Context_entity/Context_entity.aod | 59 +++++++++++++++----
.../excludecontexts_param/valueProcess.js | 2 +
.../excludecontexts_param/valueProcess.js | 2 +
.../recordcontainers/jdito/contentProcess.js | 5 +-
entity/TaskLink_entity/TaskLink_entity.aod | 2 +-
process/Context_lib/process.js | 17 ++++--
7 files changed, 70 insertions(+), 19 deletions(-)
create mode 100644 entity/Context_entity/entityfields/activitylinkable/children/excludecontexts_param/valueProcess.js
create mode 100644 entity/Context_entity/entityfields/tasklinkable/children/excludecontexts_param/valueProcess.js
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index be69dcabe1..ed4fc232f6 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -73,7 +73,7 @@
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>ActivityLinkable</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 922b46b44d..5410da87b5 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -16,18 +16,6 @@
<fieldName>Context</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>d713987f-1cf0-4c6c-8373-24d135d22dc8</name>
- <entityName>ActivityLink_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2dcb4637-6096-43fc-b07e-d44fb51fbc1b</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
<entityName>AppointmentLink_entity</entityName>
@@ -53,6 +41,53 @@
<entityProvider>
<name>Context</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <children>
+ <entityParameter>
+ <name>excludeContexts_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>excludeContexts_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>ActivityLinkable</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
+ <entityName>ActivityLink_entity</entityName>
+ <fieldName>Context</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>excludeContexts_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/excludecontexts_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>TaskLinkable</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
+ <entityName>TaskLink_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>excludeContexts_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/excludecontexts_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityProvider>
</entityFields>
<recordContainers>
diff --git a/entity/Context_entity/entityfields/activitylinkable/children/excludecontexts_param/valueProcess.js b/entity/Context_entity/entityfields/activitylinkable/children/excludecontexts_param/valueProcess.js
new file mode 100644
index 0000000000..e48be1dbc1
--- /dev/null
+++ b/entity/Context_entity/entityfields/activitylinkable/children/excludecontexts_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.object(["Task", "Activity"]);
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/tasklinkable/children/excludecontexts_param/valueProcess.js b/entity/Context_entity/entityfields/tasklinkable/children/excludecontexts_param/valueProcess.js
new file mode 100644
index 0000000000..e48be1dbc1
--- /dev/null
+++ b/entity/Context_entity/entityfields/tasklinkable/children/excludecontexts_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.object(["Task", "Activity"]);
\ No newline at end of file
diff --git a/entity/Context_entity/recordcontainers/jdito/contentProcess.js b/entity/Context_entity/recordcontainers/jdito/contentProcess.js
index 9ecbf1f708..503f36da09 100644
--- a/entity/Context_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Context_entity/recordcontainers/jdito/contentProcess.js
@@ -2,4 +2,7 @@ import("system.vars");
import("system.result");
import("Context_lib");
-result.object(ContextUtils.getContexts(true));
+var excludeContexts = vars.getString("$param.excludeContexts_param");
+if (excludeContexts)
+ excludeContexts = JSON.parse(excludeContexts);
+result.object(ContextUtils.getContexts(true, excludeContexts));
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 8074c19d87..3809c91d58 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -60,7 +60,7 @@
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>TaskLinkable</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index b8034c7952..70bfde6d1d 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -42,10 +42,11 @@ ContextUtils.getContextName = function(pContextId)
/**
*
* @param {Boolean} [pFilter=false] filter only for contexts which have a mapping in ContextUtils._getSelectMap
+ * @param {String[]} [pExcludeContexts] contextIds that shall not be included (so this is a additional filter to the pFiler param)
*
* @return {String[][]} the contexts [[contextId, contextName, contextTitle], [... ], ...]
*/
-ContextUtils.getContexts = function(pFilter)
+ContextUtils.getContexts = function(pFilter, pExcludeContexts)
{
if (pFilter == undefined)
pFilter = false;
@@ -54,13 +55,21 @@ ContextUtils.getContexts = function(pFilter)
if (pFilter)
{
- contexts = contexts.filter(function(pContext)
- {
+ contexts = contexts.filter(function(pContext) {
+ if (pExcludeContexts && pExcludeContexts.indexOf(pContext[0]) > -1)
+ return false;
// filter only contexts which have defined mappings in Context_lib
return ContextUtils._getSelectMap()[pContext[0]] != undefined;
});
}
-
+ else if (pExcludeContexts)
+ {
+ contexts = contexts.filter(function(pContext) {
+ if (pExcludeContexts && pExcludeContexts.indexOf(pContext[0]) > -1)
+ return false;
+ return true;
+ });
+ }
return contexts.map(ContextUtils._contextDataMapping).sort(function(pContext1, pContext2)
{
--
GitLab
From 6b61233c678aa1c44a3aca7ddf111f20cbe2392e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 09:26:09 +0200
Subject: [PATCH 150/250] rename column in table CONTACT: POSTITION -> POSITION
---
aliasDefinition/Data_alias/Data_alias.aod | 2 +-
entity/Contact_entity/Contact_entity.aod | 2 +-
entity/Person_entity/Person_entity.aod | 2 +-
entity/SalesprojectMember_entity/SalesprojectMember_entity.aod | 2 +-
.../db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 1a1bee31dd..43dd6f35da 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -300,7 +300,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>POSTITION</name>
+ <name>POSITION</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 05d8f1930b..6b81f7851e 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -248,7 +248,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>POSITION.value</name>
- <recordfield>CONTACT.POSTITION</recordfield>
+ <recordfield>CONTACT.POSITION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACTROLE.value</name>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index c55ad940fa..2c8d411de9 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -980,7 +980,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>POSITION.value</name>
- <recordfield>CONTACT.POSTITION</recordfield>
+ <recordfield>CONTACT.POSITION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DEPARTMENT.value</name>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 34540f9d11..bda7d26d8f 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -289,7 +289,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>POSITION.value</name>
- <recordfield>CONTACT.POSTITION</recordfield>
+ <recordfield>CONTACT.POSITION</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml b/others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml
index 545d958d08..780b482967 100644
--- a/others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml
@@ -8,7 +8,7 @@
<column name="CONTACTROLE" type="NVARCHAR(50)"/>
</addColumn>
<addColumn tableName="CONTACT">
- <column name="POSTITION" type="NVARCHAR(50)"/>
+ <column name="POSITION" type="NVARCHAR(50)"/>
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
--
GitLab
From 84b247f47ba3ca67894d1074c8848a5c970c94a1 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 1 Apr 2019 11:20:05 +0200
Subject: [PATCH 151/250] Employee optimization
---
entity/Document_entity/Document_entity.aod | 6 ++
entity/Employee_entity/Employee_entity.aod | 55 +++++++++++++++++++
.../assignmentname_param/valueProcess.js | 3 +
.../assignmentrowid_param/valueProcess.js | 4 ++
.../assignmenttable_param/valueProcess.js | 3 +
.../base64string_param/valueProcess.js | 4 ++
.../recordcontainers/jdito/contentProcess.js | 9 ++-
.../recordcontainers/jdito/onInsert.js | 1 +
.../recordcontainers/jdito/onUpdate.js | 1 +
entity/Employee_entity/titleProcess.js | 4 ++
entity/Person_entity/Person_entity.aod | 6 --
.../StoredSelection_entity.aod | 53 ++++++++++++++++++
.../recordcontainers/jdito/contentProcess.js | 28 ++++++++++
.../Timetracking_entity.aod | 6 +-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++
.../StoredSelection/StoredSelection.aod | 12 ++++
.../EmployeeMain_view/EmployeeMain_view.aod | 10 ++++
.../EmployeePreview_view.aod | 4 ++
.../StoredSelectionFilter_view.aod | 26 +++++++++
19 files changed, 225 insertions(+), 14 deletions(-)
create mode 100644 entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
create mode 100644 entity/Employee_entity/titleProcess.js
create mode 100644 entity/StoredSelection_entity/StoredSelection_entity.aod
create mode 100644 entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
create mode 100644 neonContext/StoredSelection/StoredSelection.aod
create mode 100644 neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index d4c10e0ed4..6a1829f663 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -179,6 +179,12 @@
<fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>abd400df-a5a4-4750-b3a4-0476b2721161</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 8a7cb6fe7d..496c82b042 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -5,10 +5,20 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
<iconId>VAADIN:GROUP</iconId>
+ <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <lookupIdfield>CONTACT_ID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>823f9c90-c834-4e37-a47b-b3756fd28182</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
@@ -25,6 +35,7 @@
<name>CONTACT_ID</name>
<title>Person</title>
<consumer>Contacts</consumer>
+ <linkedContext>Person</linkedContext>
<mandatory v="false" />
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
</entityField>
@@ -175,6 +186,49 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <title>Documents</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>StoredSelections</name>
+ <title>Stored selections</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>StoredSelection_entity</entityName>
+ <fieldName>StoredSelections</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Base64String_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>STORED_SELECTIONS</name>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -194,6 +248,7 @@
<element>DESCRIPTION.value</element>
<element>CONTACT_ID.value</element>
<element>CONTACT_ID.displayValue</element>
+ <element>STORED_SELECTIONS.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
new file mode 100644
index 0000000000..f002ad73ad
--- /dev/null
+++ b/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000..24b12e282d
--- /dev/null
+++ b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000..d8e665c062
--- /dev/null
+++ b/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("EMPLOYEE");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js b/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
new file mode 100644
index 0000000000..d3297d7eb8
--- /dev/null
+++ b/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.STORED_SELECTIONS"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 71470598bf..98ec35774e 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("system.tools");
@@ -11,7 +10,7 @@ else
users = tools.getStoredUsers().map(function (row) {return row[1];});
users = users.map(function (user)
{
- user = tools.getUser(user);
+ user = tools.getUser(user, tools.PROFILE_FULL);
return [
user[tools.TITLE],
user[tools.TITLE],
@@ -19,13 +18,13 @@ users = users.map(function (user)
user[tools.PARAMS][tools.FIRSTNAME],
user[tools.PARAMS][tools.LASTNAME],
user[tools.PARAMS][tools.EMAIL],
- user[tools.PARAMS][tools.DESCRIPTION],
+ user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
- user[tools.PARAMS][tools.CONTACTID]
+ user[tools.PARAMS][tools.CONTACTID],
+ user[tools.PARAMS][tools.FRAME_STOREDSEARCHES]
];
});
var filter = vars.exists("$local.filter") && vars.get("$local.filter");
-//logging.log(filter)
result.object(users);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index 070b796b0c..e771eb763f 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -9,6 +9,7 @@ params[tools.LASTNAME] = vars.get("$field.LASTNAME");
params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
+params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS] = params;
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 7d445e2474..f487449ce4 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -9,6 +9,7 @@ user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
+user[tools.PARAMS][tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
if (vars.exists("$param.passwordChange_param") && vars.get("$param.passwordChange_param")
&& vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
diff --git a/entity/Employee_entity/titleProcess.js b/entity/Employee_entity/titleProcess.js
new file mode 100644
index 0000000000..2cb5fabc54
--- /dev/null
+++ b/entity/Employee_entity/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim());
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 2c8d411de9..5883d8dc24 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -279,12 +279,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>ContactEditors</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>f5b4d286-9f5e-4b13-8dca-d9b04186f6ca</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>ffdbb464-fa37-4bb7-a66d-d9e0d3a9bc56</name>
<entityName>Activity_entity</entityName>
diff --git a/entity/StoredSelection_entity/StoredSelection_entity.aod b/entity/StoredSelection_entity/StoredSelection_entity.aod
new file mode 100644
index 0000000000..97ed60b10e
--- /dev/null
+++ b/entity/StoredSelection_entity/StoredSelection_entity.aod
@@ -0,0 +1,53 @@
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>StoredSelection_entity</name>
+ <title>Stored selections</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>Base64String_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>StoredSelections</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>1386345f-0ed8-4c82-b96d-a249775314ee</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>StoredSelections</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CONTEXT_NAME</name>
+ <title>Module</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>SELECTION_TITLE</name>
+ <title>Name</title>
+ <state>READONLY</state>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <contentProcess>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>CONTEXT_NAME.value</element>
+ <element>SELECTION_TITLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js b/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..cc4302b632
--- /dev/null
+++ b/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,28 @@
+import("system.result");
+import("system.pack");
+import("system.util");
+import("system.vars");
+
+var records = [];
+if (vars.exists("$param.Base64String_param") && vars.get("$param.Base64String_param"))
+{
+ var codedSelections = pack.gunzip(vars.get("$param.Base64String_param"));
+
+ var selections = new XML(util.decodeBase64String(codedSelections));
+ selections = selections.FRAME;
+ for (let i in selections)
+ {
+ context = selections[i];
+ var contextName = context.NAME;
+ if (contextName)
+ {
+ var title = context.STORE.(ID == "#STORE_SAVED").ELEMENT.TITLE;
+ for (let ii in title)
+ {
+ records.push([(contextName + title[ii]), contextName, title[ii]]);
+ }
+ }
+ }
+}
+
+result.object(records);
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 2ed0a5850b..8b75e31a16 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -37,7 +37,7 @@
<entityField>
<name>CONTACT_ID</name>
<title>Creator</title>
- <consumer>Contacts</consumer>
+ <consumer>Employees</consumer>
<linkedContext>Person</linkedContext>
<mandatory v="true" />
</entityField>
@@ -87,11 +87,11 @@
</children>
</entityProvider>
<entityConsumer>
- <name>Contacts</name>
+ <name>Employees</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Person_entity</entityName>
+ <entityName>Employee_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 1745419852..605049e492 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -74,6 +74,10 @@
<key>Filename</key>
<value>Dateiname</value>
</entry>
+ <entry>
+ <key>Stored selections</key>
+ <value>Gespeicherte Suchen</value>
+ </entry>
<entry>
<key>Male</key>
<value>Männlich</value>
diff --git a/neonContext/StoredSelection/StoredSelection.aod b/neonContext/StoredSelection/StoredSelection.aod
new file mode 100644
index 0000000000..cda8fb5311
--- /dev/null
+++ b/neonContext/StoredSelection/StoredSelection.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>StoredSelection</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>StoredSelection_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>8ab7727b-5dc7-47bb-9034-079d84ede3a3</name>
+ <view>StoredSelectionFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index 11918294c2..90103f5684 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -29,5 +29,15 @@
<entityField>AttributeTree</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>169d3ae7-d688-42fd-9097-77bbd9bfb81f</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>aaca4c8c-7953-43d8-9390-53b78d86863a</name>
+ <entityField>StoredSelections</entityField>
+ <view>StoredSelectionFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index 2cbb42497c..a96af6d20e 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -20,6 +20,10 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>a5f8b519-26d8-4824-b9cf-9119c03b1bd8</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>0bda9209-1437-49eb-98b7-6edea9c6836a</name>
<entityField>DEPARTMENT</entityField>
diff --git a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
new file mode 100644
index 0000000000..668cad9f84
--- /dev/null
+++ b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
@@ -0,0 +1,26 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>StoredSelectionFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>713574de-2d9c-4006-93a3-3860fb145c26</name>
+ <entityField>CONTEXT_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4cc4d5ff-24cf-46d9-9941-cda11e445a17</name>
+ <entityField>SELECTION_TITLE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
--
GitLab
From 0b61d36bd6252c3bcedc6aeacc9fd3a4b8e53e7d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 13:17:33 +0200
Subject: [PATCH 152/250] refactoring Context_lib
---
.../recordcontainers/jdito/contentProcess.js | 4 +-
process/Context_lib/process.js | 306 +++++++++---------
process/Proto_lib/Proto_lib.aod | 6 +
process/Proto_lib/process.js | 11 +
4 files changed, 165 insertions(+), 162 deletions(-)
create mode 100644 process/Proto_lib/Proto_lib.aod
create mode 100644 process/Proto_lib/process.js
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 771f35a4cb..f74342ef8f 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -12,7 +12,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
{
var active;
- var selectMap = ContextUtils._getSelectMap()
+ var selectMap = ContextUtils.getSelectMap ()
if(vars.exists("$local.filter") && vars.get("$local.filter") )
{
var filter = JSON.parse(vars.getString("$local.filter"));
@@ -42,7 +42,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
record[5] = translate.text(active);
else
{
- if(selectMap[context][8].indexOf(row[3]) > -1)
+ if(selectMap[context].activeStates.indexOf(row[3]) > -1)
record[5] = translate.text("true");
else
record[5] = translate.text("false");
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 70bfde6d1d..82a5ac3b5b 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -4,6 +4,7 @@ import("system.vars");
import("system.SQLTYPES");
import("Keyword_lib");
import("Sql_lib");
+import("Proto_lib");
import("Contact_lib");
import("system.logging");
@@ -41,7 +42,7 @@ ContextUtils.getContextName = function(pContextId)
/**
*
- * @param {Boolean} [pFilter=false] filter only for contexts which have a mapping in ContextUtils._getSelectMap
+ * @param {Boolean} [pFilter=false] filter only for contexts which have a mapping in ContextUtils.getSelectMap
* @param {String[]} [pExcludeContexts] contextIds that shall not be included (so this is a additional filter to the pFiler param)
*
* @return {String[][]} the contexts [[contextId, contextName, contextTitle], [... ], ...]
@@ -59,7 +60,7 @@ ContextUtils.getContexts = function(pFilter, pExcludeContexts)
if (pExcludeContexts && pExcludeContexts.indexOf(pContext[0]) > -1)
return false;
// filter only contexts which have defined mappings in Context_lib
- return ContextUtils._getSelectMap()[pContext[0]] != undefined;
+ return ContextUtils.getSelectMap ()[pContext[0]] != undefined;
});
}
else if (pExcludeContexts)
@@ -111,161 +112,146 @@ ContextUtils._contextDataMapping = function(pContext)
return [pContext[0], contextName, (pContext[1] ? pContext[1] : contextName)];
}
+function ContextSelector(pSqlNameSelect, pTableName, pIdField)
+{
+ //the >>this.property = null;<< is for autocomplete in the designer
+ this.sqlNameSelect = null; ProtoPropertyUtils.makeSemiReadOnly(this, "sqlNameSelect");
+ this.setSqlNameSelect(pSqlNameSelect);
+
+ this.tableName = null; ProtoPropertyUtils.makeSemiReadOnly(this, "tableName");
+ this.setTableName(pTableName);
+
+ this.idField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "idField");
+ this.setIdField(pIdField);
+
+ this.sqlJoin = null; ProtoPropertyUtils.makeSemiReadOnly(this, "sqlJoin");
+ this.contactIdField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "contactIdField");
+ this.creationDateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "creationDateField");
+ this.stateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "stateField");
+ this.activeStates = null; ProtoPropertyUtils.makeSemiReadOnly(this, "activeStates");
+}
+ContextSelector.create = function(pSqlNameSelect, pTableName, pIdField)
+{
+ return new ContextSelector(pSqlNameSelect, pTableName, pIdField);
+};
+ContextSelector.prototype.getFullIdField = function()
+{
+ return this.tableName + "." + this.idField;
+};
+
+ContextSelector.prototype.getFullFromClause = function()
+{
+ if (this.sqlJoin)
+ return " " + this.tableName + " " + this.sqlJoin + " ";
+ else
+ return this.tableName;
+
+};
+ContextSelector.prototype.setSqlNameSelect = function(pValue)
+{
+ this._sqlNameSelect = pValue;
+ return this;
+};
+ContextSelector.prototype.setTableName = function(pValue)
+{
+ this._tableName = pValue;
+ return this;
+};
+ContextSelector.prototype.setIdField = function(pValue)
+{
+ this._idField = pValue;
+ return this;
+};
+ContextSelector.prototype.setSqlJoin = function(pValue)
+{
+ this._sqlJoin = pValue;
+ return this;
+};
+ContextSelector.prototype.setContactIdField = function(pValue)
+{
+ this._contactIdField = pValue;
+ return this;
+};
+ContextSelector.prototype.setCreationDateField = function(pValue)
+{
+ this._creationDateField = pValue;
+ return this;
+};
+ContextSelector.prototype.setStateField = function(pValue)
+{
+ this._stateField = pValue;
+ return this;
+};
+ContextSelector.prototype.setActiveStates = function(pValue)
+{
+ this._activeStates = pValue;
+ return this;
+};
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
-ContextUtils._getSelectMap = function()
+ContextUtils.getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId,
- // nameField, 0
- // Tablename 1
- // joins (if needed), 2
- // IDField, 3
- // RelationField, 4
- // CreationDate 5
- // override Tablename (needed if Tablename is a join clause) 6
- // StateField 7
- // Active States 8
-
- // "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
- "Organisation": [
- "\"NAME\"",
- "ORGANISATION",
- "",
- "ORGANISATIONID",
- "",
- "",
- "",
- "",
- []
- ],
- "Person": [
- (new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()),
- "PERSON",
- " join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ",
- "CONTACTID",
- "CONTACT",
- "",
- "CONTACT",
- "",
- []
- ],
- "Activity": [
- "SUBJECT",
- "ACTIVITY",
- "",
- "ACTIVITYID",
- "",
- "",
- "",
- "",
- []
- ],
- "Salesproject": [
- maskingUtils.concat([
- "'" + translate.text("Salesproject") + "'",
- "' '",
- maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10),
- "' | '",
- "PROJECTTITLE"
- ], "", false),
- "SALESPROJECT",
- "",
- "SALESPROJECTID",
- "CONTACT_ID",
- "STARTDATE",
- "",
- "STATE",
- ["25b0ac77-ef92-4809-802e-bb9d8782f865", "23d38486-4cce-41ce-a8df-164ad44df706"]
- ],
- "Contract": [
- maskingUtils.concat([
- KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
- maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10)
- ], " "),
- "CONTRACT",
- "",
- "CONTRACTID",
- "CONTACT_ID",
- "CONTRACTSTART",
- "",
- "CONTRACTSTATUS",
- ["e12d37e9-3429-40b5-973b-c1569843ca46", "3579eb0c-d8ca-4b6b-85ee-f1800a9301eb", "4c63c82d-0276-4c12-9937-13fd361ad786"]
- ],
- "Offer": [
- maskingUtils.concat([
- "'" + translate.text("Offer") + "'",
- "' '",
- maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10),
- "'-'",
- maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
- ], "", false),
- "OFFER",
- "",
- "OFFERID",
- "CONTACT_ID",
- "OFFERDATE",
- "",
- "STATUS",
- ["5134153d-2e18-452f-ab35-7a52f1aee7d1", "e5d6b5a4-7576-440f-8332-bc40147c0335"]
- ],
- "Order": [
- maskingUtils.concat([
- "'" + translate.text("Order") + "'",
- "' '",
- maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10),
- "'-'",
- maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
- ], "", false),
- "SALESORDER",
- "",
- "SALESORDERID",
- "CONTACT_ID",
- "ORDERDATE",
- "",
- "",
- []
- ],
- "Product": [
- maskingUtils.concat([
- "PRODUCTCODE",
- "' | '",
- "PRODUCTNAME"
- ], "", false),
- "PRODUCT",
- "",
- "PRODUCTID",
- "",
- "",
- "",
- "",
- []
- ],
- "Task": [
- "SUBJECT",
- "TASK",
- "",
- "TASKID",
- translate.text("Task"),
- "",
- "",
- "",
- []
- ]
+ "Organisation": ContextSelector.create("NAME", "ORGANISATION", "ORGANISATIONID")
+ ,"Person": ContextSelector.create(null, "PERSON", "CONTACTID")
+ .setSqlNameSelect(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql())
+ .setSqlJoin("join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ ,"Activity": ContextSelector.create("SUBJECT", "ACTIVITY", "ACTIVITYID")
+ ,"Salesproject": ContextSelector.create(null, "SALESPROJECT", "SALESPROJECTID")
+ .setSqlNameSelect(maskingUtils.concat([
+ "'" + translate.text("Salesproject") + "'",
+ "' '",
+ maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10),
+ "' | '",
+ "PROJECTTITLE"
+ ], "", false))
+ .setContactIdField("CONTACT_ID")
+ .setCreationDateField("STARTDATE")
+ .setStateField("STATE")
+ .setActiveStates(["25b0ac77-ef92-4809-802e-bb9d8782f865", "23d38486-4cce-41ce-a8df-164ad44df706"])
+ ,"Contract": ContextSelector.create(null, "CONTRACT", "CONTRACTID")
+ .setSqlNameSelect(maskingUtils.concat([
+ KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
+ maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10)
+ ], " "))
+ .setContactIdField("CONTACT_ID")
+ .setCreationDateField("CONTRACTSTART")
+ .setStateField("CONTRACTSTATUS")
+ .setActiveStates(["e12d37e9-3429-40b5-973b-c1569843ca46", "3579eb0c-d8ca-4b6b-85ee-f1800a9301eb", "4c63c82d-0276-4c12-9937-13fd361ad786"])
+ ,"Offer": ContextSelector.create(null, "OFFER", "OFFERID")
+ .setSqlNameSelect(maskingUtils.concat([
+ "'" + translate.text("Offer") + "'",
+ "' '",
+ maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10),
+ "'-'",
+ maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
+ ], "", false))
+ .setContactIdField("CONTACT_ID")
+ .setStateField("STATUS")
+ .setActiveStates(["5134153d-2e18-452f-ab35-7a52f1aee7d1", "e5d6b5a4-7576-440f-8332-bc40147c0335"])
+ ,"Order": ContextSelector.create(null, "SALESORDER", "")
+ .setSqlNameSelect(maskingUtils.concat([
+ "'" + translate.text("Order") + "'",
+ "' '",
+ maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10),
+ "'-'",
+ maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
+ ], "", false))
+ .setContactIdField("CONTACT_ID")
+ .setCreationDateField("ORDERDATE")
+ ,"Product": ContextSelector.create(null, "PRODUCT", "PRODUCTID")
+ .setSqlNameSelect(maskingUtils.concat([
+ "PRODUCTCODE",
+ "' | '",
+ "PRODUCTNAME"
+ ], "", false))
+ ,"Task": ContextSelector.create("SUBJECT", "TASK", "TASKID")
+ .setContactIdField(translate.text("Task"))//wait, what?
}
}
-ContextUtils.getFieldTitle = function(pContextId, pDefault)
-{
- if (ContextUtils._getSelectMap()[pContextId] != undefined && ContextUtils._getSelectMap()[pContextId].length >= 4)
- return ContextUtils._getSelectMap()[pContextId][4];
-
- return pDefault;
-}
-
-
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
@@ -273,10 +259,10 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
{
var select = "(case " + pContextIdDbField + " ";
- var selectMap = ContextUtils._getSelectMap()
+ var selectMap = ContextUtils.getSelectMap ()
for (let contextId in selectMap)
{
- select += "when '" + contextId + "' then (select " + selectMap[contextId][0] + " from " + selectMap[contextId][1] + " " + selectMap[contextId][2] + (pRowIdDbField ? " where " + selectMap[contextId][3] + " = " + pRowIdDbField : " ") + ") ";
+ select += "when '" + contextId + "' then (select " + selectMap[contextId].sqlNameSelect + " from " + selectMap[contextId].getFullFromClause() + (pRowIdDbField ? " where " + selectMap[contextId].idField + " = " + pRowIdDbField : " ") + ") ";
}
select += "else 'Not defined in ContextUtils.getNameSql()!'";
@@ -290,10 +276,10 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
*/
ContextUtils.getNameSql = function(pContextId, pRowId)
{
- var selectMap = ContextUtils._getSelectMap()
+ var selectMap = ContextUtils.getSelectMap ()
if (selectMap[pContextId] != undefined)
{
- return SqlCondition.begin().andPrepare((selectMap[pContextId][6] ? selectMap[pContextId][6] : selectMap[pContextId][1]) + "." + selectMap[pContextId][3], pRowId).buildSql("select " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1] + " " + selectMap[pContextId][2], "1=2");
+ return SqlCondition.begin().andPrepare(selectMap[pContextId].getFullIdField(), pRowId).buildSql("select " + selectMap[pContextId].sqlNameSelect + " from " + selectMap[pContextId].getFullFromClause(), "1 = 2");
}
else
return "select 1 from person where 1=2";
@@ -304,36 +290,36 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
*/
ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive, pWithState)
{
- var selectMap = ContextUtils._getSelectMap()
+ var selectMap = ContextUtils.getSelectMap ();
var cond = SqlCondition.begin();
if (pRowId)
{
- cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][4], pRowId)
+ cond.andPrepare(selectMap[pContextId].tableName + "." + selectMap[pContextId].contactIdField, pRowId)
}
if (pActive != undefined)
{
- var activeStates = selectMap[pContextId][8]
+ var activeStates = selectMap[pContextId].activeStates;
if(activeStates != null && activeStates.length > 0)
{
var condSub = SqlCondition.begin();
activeStates.forEach(function (state)
{
if(pActive)
- condSub.orPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][7], state)
+ condSub.orPrepare(selectMap[pContextId].tableName + "." + selectMap[pContextId].stateField, state)
else
- condSub.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][7], state, "# != ?")
+ condSub.andPrepare(selectMap[pContextId].tableName + "." + selectMap[pContextId].stateField, state, "# != ?")
});
cond.andSqlCondition(condSub);
}
}
var dateColumn = "";
if (pWithDate === true)
- dateColumn = ", " + selectMap[pContextId][5];
+ dateColumn = ", " + (selectMap[pContextId].creationDateField || "''");
var stateColumn = "";
if (pWithState === true)
- stateColumn = ", " + selectMap[pContextId][7];
+ stateColumn = ", " + (selectMap[pContextId].stateField || "''");
- return cond.buildSql("select " + selectMap[pContextId][3] + ", " + selectMap[pContextId][0] + dateColumn + stateColumn + " from " + selectMap[pContextId][1] + " " + selectMap[pContextId][2], "1=1");
+ return cond.buildSql("select " + selectMap[pContextId].getFullIdField() + ", " + selectMap[pContextId].sqlNameSelect + dateColumn + stateColumn + " from " + selectMap[pContextId].getFullFromClause(), "1=1");
}
diff --git a/process/Proto_lib/Proto_lib.aod b/process/Proto_lib/Proto_lib.aod
new file mode 100644
index 0000000000..99585a3435
--- /dev/null
+++ b/process/Proto_lib/Proto_lib.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process 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/process/1.2.0">
+ <name>Proto_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Proto_lib/process.js</process>
+</process>
diff --git a/process/Proto_lib/process.js b/process/Proto_lib/process.js
new file mode 100644
index 0000000000..04d65e8fcb
--- /dev/null
+++ b/process/Proto_lib/process.js
@@ -0,0 +1,11 @@
+function ProtoPropertyUtils(){}
+
+ProtoPropertyUtils.makeSemiReadOnly = function(pObj, pPropName)
+{
+ Object.defineProperty(pObj, pPropName, {
+ enumerable: true,
+ get: function (){
+ return pObj["_" + pPropName];
+ }
+ });
+};
\ No newline at end of file
--
GitLab
From b877de6f16d8563945a84caca9a69728acab64d6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 14:56:08 +0200
Subject: [PATCH 153/250] refactoring Context_lib (2)
---
process/Context_lib/process.js | 133 +++++++++++++++++++++++++--------
process/Proto_lib/process.js | 15 ++++
2 files changed, 115 insertions(+), 33 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 82a5ac3b5b..1abab8d76e 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -112,44 +112,109 @@ ContextUtils._contextDataMapping = function(pContext)
return [pContext[0], contextName, (pContext[1] ? pContext[1] : contextName)];
}
-function ContextSelector(pSqlNameSelect, pTableName, pIdField)
+/**
+ * represents a single context selection for one context
+ * this is usefull for objectlinks and 360° definition
+ * most properties are read only and can only be written with a setter
+ *
+ * @param {String} [pTableName] presets the matching property of the object
+ * @param {String} [pIdField] presets the matching property of the object
+ * @param {String} [pTitleExpression] presets the matching property of the object
+ *
+ * TODO: mostly temporary function until you can get fields from another Entity
+ *
+ * @class
+ */
+function ContextSelector(pTableName, pIdField, pTitleExpression)
{
- //the >>this.property = null;<< is for autocomplete in the designer
- this.sqlNameSelect = null; ProtoPropertyUtils.makeSemiReadOnly(this, "sqlNameSelect");
- this.setSqlNameSelect(pSqlNameSelect);
+ //the >>this.propertyX = null;<< is for autocomplete in the designer
+
+ /**
+ * title-definition; db-column or another sql-expression (like concating fields) as long as it returns one field
+ * read-only property; set it with a matching setter
+ * @property
+ */
+ this.titleExpression = null; ProtoPropertyUtils.makeSemiReadOnly(this, "titleExpression");
+ this.setTitleExpression(pTitleExpression);
+ /**
+ * name of the database-table
+ * read-only property; set it with a matching setter
+ * @property
+ */
this.tableName = null; ProtoPropertyUtils.makeSemiReadOnly(this, "tableName");
this.setTableName(pTableName);
+ /**
+ * db-field for the ID of one record (UID of matching context)
+ * read-only property; set it with a matching setter
+ * @property
+ */
this.idField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "idField");
this.setIdField(pIdField);
- this.sqlJoin = null; ProtoPropertyUtils.makeSemiReadOnly(this, "sqlJoin");
+ /**
+ * expression for additional joins to be made (addotopmaö pt table-name)
+ * read-only property; set it with a matching setter
+ * @property
+ */
+ this.joinExpression = null; ProtoPropertyUtils.makeSemiReadOnly(this, "joinExpression");
+ /**
+ * db-field for the ID of the relation to a CONTACT-record
+ * read-only property; set it with a matching setter
+ * @property
+ */
this.contactIdField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "contactIdField");
+ /**
+ * db-field that represents the date of creation
+ * read-only property; set it with a matching setter
+ * @property
+ */
this.creationDateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "creationDateField");
+ /**
+ * db-field where the STATE-information (active/inactive) is stored (see the activeStates-property)
+ * read-only property; set it with a matching setter
+ * @property
+ */
this.stateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "stateField");
+ /**
+ * array that contains IDs of states that represent an "active"-state
+ * read-only property; set it with a matching setter
+ * @property
+ */
this.activeStates = null; ProtoPropertyUtils.makeSemiReadOnly(this, "activeStates");
}
-ContextSelector.create = function(pSqlNameSelect, pTableName, pIdField)
+/**
+ * creates a new instance of a ContextSelector and returns it
+ * if given it also sets some properties (property names with matching function-parameters)
+ * @static
+ */
+ContextSelector.create = function(pTableName, pIdField, pTitleExpression)
{
- return new ContextSelector(pSqlNameSelect, pTableName, pIdField);
+ return new ContextSelector(pTableName, pIdField, pTitleExpression);
};
+/**
+ * @return {String} full id field containing tablename and column
+ */
ContextSelector.prototype.getFullIdField = function()
{
return this.tableName + "." + this.idField;
};
-
+/**
+ * @return {String} full from-expression with tablename and join-part
+ */
ContextSelector.prototype.getFullFromClause = function()
{
- if (this.sqlJoin)
- return " " + this.tableName + " " + this.sqlJoin + " ";
+ if (this.joinExpression)
+ return " " + this.tableName + " " + this.joinExpression + " ";
else
return this.tableName;
};
-ContextSelector.prototype.setSqlNameSelect = function(pValue)
+//setters which to nothing special; no need to document them
+ContextSelector.prototype.setTitleExpression = function(pValue)
{
- this._sqlNameSelect = pValue;
+ this._titleExpression = pValue;
return this;
};
ContextSelector.prototype.setTableName = function(pValue)
@@ -162,9 +227,9 @@ ContextSelector.prototype.setIdField = function(pValue)
this._idField = pValue;
return this;
};
-ContextSelector.prototype.setSqlJoin = function(pValue)
+ContextSelector.prototype.setJoinExpression = function(pValue)
{
- this._sqlJoin = pValue;
+ this._joinExpression = pValue;
return this;
};
ContextSelector.prototype.setContactIdField = function(pValue)
@@ -187,6 +252,7 @@ ContextSelector.prototype.setActiveStates = function(pValue)
this._activeStates = pValue;
return this;
};
+
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
@@ -194,13 +260,14 @@ ContextUtils.getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- "Organisation": ContextSelector.create("NAME", "ORGANISATION", "ORGANISATIONID")
- ,"Person": ContextSelector.create(null, "PERSON", "CONTACTID")
- .setSqlNameSelect(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql())
- .setSqlJoin("join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
- ,"Activity": ContextSelector.create("SUBJECT", "ACTIVITY", "ACTIVITYID")
- ,"Salesproject": ContextSelector.create(null, "SALESPROJECT", "SALESPROJECTID")
- .setSqlNameSelect(maskingUtils.concat([
+ "Organisation": ContextSelector.create("ORGANISATION", "ORGANISATIONID", "NAME")
+ ,"Person": ContextSelector.create("CONTACT", "CONTACTID")
+ .setTitleExpression(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql())
+ .setJoinExpression("join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID \n\
+ join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ ,"Activity": ContextSelector.create("ACTIVITY", "ACTIVITYID", "SUBJECT")
+ ,"Salesproject": ContextSelector.create("SALESPROJECT", "SALESPROJECTID")
+ .setTitleExpression(maskingUtils.concat([
"'" + translate.text("Salesproject") + "'",
"' '",
maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10),
@@ -211,8 +278,8 @@ ContextUtils.getSelectMap = function()
.setCreationDateField("STARTDATE")
.setStateField("STATE")
.setActiveStates(["25b0ac77-ef92-4809-802e-bb9d8782f865", "23d38486-4cce-41ce-a8df-164ad44df706"])
- ,"Contract": ContextSelector.create(null, "CONTRACT", "CONTRACTID")
- .setSqlNameSelect(maskingUtils.concat([
+ ,"Contract": ContextSelector.create("CONTRACT", "CONTRACTID")
+ .setTitleExpression(maskingUtils.concat([
KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10)
], " "))
@@ -220,8 +287,8 @@ ContextUtils.getSelectMap = function()
.setCreationDateField("CONTRACTSTART")
.setStateField("CONTRACTSTATUS")
.setActiveStates(["e12d37e9-3429-40b5-973b-c1569843ca46", "3579eb0c-d8ca-4b6b-85ee-f1800a9301eb", "4c63c82d-0276-4c12-9937-13fd361ad786"])
- ,"Offer": ContextSelector.create(null, "OFFER", "OFFERID")
- .setSqlNameSelect(maskingUtils.concat([
+ ,"Offer": ContextSelector.create("OFFER", "OFFERID")
+ .setTitleExpression(maskingUtils.concat([
"'" + translate.text("Offer") + "'",
"' '",
maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10),
@@ -231,8 +298,8 @@ ContextUtils.getSelectMap = function()
.setContactIdField("CONTACT_ID")
.setStateField("STATUS")
.setActiveStates(["5134153d-2e18-452f-ab35-7a52f1aee7d1", "e5d6b5a4-7576-440f-8332-bc40147c0335"])
- ,"Order": ContextSelector.create(null, "SALESORDER", "")
- .setSqlNameSelect(maskingUtils.concat([
+ ,"Order": ContextSelector.create("SALESORDER", "SALESORDERID")
+ .setTitleExpression(maskingUtils.concat([
"'" + translate.text("Order") + "'",
"' '",
maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10),
@@ -241,13 +308,13 @@ ContextUtils.getSelectMap = function()
], "", false))
.setContactIdField("CONTACT_ID")
.setCreationDateField("ORDERDATE")
- ,"Product": ContextSelector.create(null, "PRODUCT", "PRODUCTID")
- .setSqlNameSelect(maskingUtils.concat([
+ ,"Product": ContextSelector.create("PRODUCT", "PRODUCTID")
+ .setTitleExpression(maskingUtils.concat([
"PRODUCTCODE",
"' | '",
"PRODUCTNAME"
], "", false))
- ,"Task": ContextSelector.create("SUBJECT", "TASK", "TASKID")
+ ,"Task": ContextSelector.create("TASK", "TASKID", "SUBJECT")
.setContactIdField(translate.text("Task"))//wait, what?
}
}
@@ -262,7 +329,7 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
var selectMap = ContextUtils.getSelectMap ()
for (let contextId in selectMap)
{
- select += "when '" + contextId + "' then (select " + selectMap[contextId].sqlNameSelect + " from " + selectMap[contextId].getFullFromClause() + (pRowIdDbField ? " where " + selectMap[contextId].idField + " = " + pRowIdDbField : " ") + ") ";
+ select += "when '" + contextId + "' then (select " + selectMap[contextId].titleExpression + " from " + selectMap[contextId].getFullFromClause() + (pRowIdDbField ? " where " + selectMap[contextId].idField + " = " + pRowIdDbField : " ") + ") ";
}
select += "else 'Not defined in ContextUtils.getNameSql()!'";
@@ -279,7 +346,7 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
var selectMap = ContextUtils.getSelectMap ()
if (selectMap[pContextId] != undefined)
{
- return SqlCondition.begin().andPrepare(selectMap[pContextId].getFullIdField(), pRowId).buildSql("select " + selectMap[pContextId].sqlNameSelect + " from " + selectMap[pContextId].getFullFromClause(), "1 = 2");
+ return SqlCondition.begin().andPrepare(selectMap[pContextId].getFullIdField(), pRowId).buildSql("select " + selectMap[pContextId].titleExpression + " from " + selectMap[pContextId].getFullFromClause(), "1 = 2");
}
else
return "select 1 from person where 1=2";
@@ -321,5 +388,5 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive
if (pWithState === true)
stateColumn = ", " + (selectMap[pContextId].stateField || "''");
- return cond.buildSql("select " + selectMap[pContextId].getFullIdField() + ", " + selectMap[pContextId].sqlNameSelect + dateColumn + stateColumn + " from " + selectMap[pContextId].getFullFromClause(), "1=1");
+ return cond.buildSql("select " + selectMap[pContextId].getFullIdField() + ", " + selectMap[pContextId].titleExpression + dateColumn + stateColumn + " from " + selectMap[pContextId].getFullFromClause(), "1=1");
}
diff --git a/process/Proto_lib/process.js b/process/Proto_lib/process.js
index 04d65e8fcb..a13e079380 100644
--- a/process/Proto_lib/process.js
+++ b/process/Proto_lib/process.js
@@ -1,5 +1,20 @@
+/**
+ * Methods to manage properties of objects that can be instanciated
+ * Do not create an instance of this itself!
+ *
+ * @class
+ */
function ProtoPropertyUtils(){}
+/**
+ * makes an property of a object semi read-only
+ * this means a property with a undersocre-prefix "_" holds the actual value and the origin prop cannot be written
+ *
+ * @param {Object} pObj the object that holds the property
+ * @param {String} pPropName name of the property within pObj to mark as readonly
+ *
+ * @return void
+ */
ProtoPropertyUtils.makeSemiReadOnly = function(pObj, pPropName)
{
Object.defineProperty(pObj, pPropName, {
--
GitLab
From 98c670eb8fdd9bb39aa75d5837e158d90ee63daa Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 15:19:15 +0200
Subject: [PATCH 154/250] Context_lib: removed probably senseless code
---
process/Context_lib/process.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 1abab8d76e..15f89e3062 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -315,7 +315,6 @@ ContextUtils.getSelectMap = function()
"PRODUCTNAME"
], "", false))
,"Task": ContextSelector.create("TASK", "TASKID", "SUBJECT")
- .setContactIdField(translate.text("Task"))//wait, what?
}
}
--
GitLab
From 38b663b6c1a482ab7ddaa1229feae5ee9b42287d Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 1 Apr 2019 16:00:05 +0200
Subject: [PATCH 155/250] Employee fixes
---
entity/Activity_entity/Activity_entity.aod | 9 ++--
.../entityfields/creator/valueProcess.js | 7 +++
entity/Employee_entity/Employee_entity.aod | 44 +++++++++++++++----
entity/Employee_entity/afterOperatingState.js | 6 +++
.../confirm_password/mandatoryProcess.js | 8 ++++
.../confirm_password/stateProcess.js | 10 +++++
.../entityfields/contact_id/onValidation.js | 12 +++++
.../onlyactives_param/valueProcess.js | 2 +
.../onlyactives_param/valueProcess.js | 2 +
.../entityfields/password/mandatoryProcess.js | 8 ++++
.../entityfields/password/stateProcess.js | 10 +++++
.../setpassword/onActionProcess.js | 4 +-
.../entityfields/uid/onValidation.js | 11 +++++
.../entityfields/uid/valueProcess.js | 7 ---
.../recordcontainers/jdito/contentProcess.js | 4 +-
.../recordcontainers/jdito/onDelete.js | 2 +-
.../recordcontainers/jdito/onInsert.js | 6 ++-
.../recordcontainers/jdito/onUpdate.js | 5 ++-
entity/Person_entity/Person_entity.aod | 6 ---
.../Timetracking_entity.aod | 2 +
.../contact_id/displayValueProcess.js | 5 +++
.../entityfields/contact_id/valueProcess.js | 7 +++
.../_____LANGUAGE_EXTRA.aod | 12 +++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 15 ++++++-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 12 +++++
neonContext/Employee/Employee.aod | 5 +++
neonContext/EmployeeRole/EmployeeRole.aod | 4 ++
.../EmployeeEdit_view/EmployeeEdit_view.aod | 17 ++++++-
.../EmployeeFilter_view.aod | 2 +-
.../EmployeeLookup_view.aod | 30 +++++++++++++
.../EmployeePreview_view.aod | 2 +-
.../EmployeeRoleEdit_view.aod | 22 ++++++++++
process/Employee_lib/Employee_lib.aod | 9 ++++
process/Employee_lib/process.js | 20 +++++++++
34 files changed, 289 insertions(+), 38 deletions(-)
create mode 100644 entity/Activity_entity/entityfields/creator/valueProcess.js
create mode 100644 entity/Employee_entity/afterOperatingState.js
create mode 100644 entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
create mode 100644 entity/Employee_entity/entityfields/confirm_password/stateProcess.js
create mode 100644 entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/password/mandatoryProcess.js
create mode 100644 entity/Employee_entity/entityfields/password/stateProcess.js
create mode 100644 entity/Employee_entity/entityfields/uid/onValidation.js
delete mode 100644 entity/Employee_entity/entityfields/uid/valueProcess.js
create mode 100644 entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js
create mode 100644 entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
create mode 100644 neonView/EmployeeLookup_view/EmployeeLookup_view.aod
create mode 100644 neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
create mode 100644 process/Employee_lib/Employee_lib.aod
create mode 100644 process/Employee_lib/process.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index cdc3b4a69a..e955aa2c78 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -260,9 +260,10 @@
<entityField>
<name>CREATOR</name>
<title>Creator</title>
- <consumer>Contacts</consumer>
+ <consumer>Employees</consumer>
<linkedContext>Person</linkedContext>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
@@ -377,12 +378,12 @@
<iconId>VAADIN:CART</iconId>
</entityActionField>
<entityConsumer>
- <name>Contacts</name>
+ <name>Employees</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
diff --git a/entity/Activity_entity/entityfields/creator/valueProcess.js b/entity/Activity_entity/entityfields/creator/valueProcess.js
new file mode 100644
index 0000000000..b8bc2d0539
--- /dev/null
+++ b/entity/Activity_entity/entityfields/creator/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 496c82b042..fae8cd5d30 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -4,6 +4,7 @@
<title>Employee</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
+ <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
<iconId>VAADIN:GROUP</iconId>
<titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
@@ -22,14 +23,14 @@
</entityProvider>
<entityField>
<name>UID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/uid/valueProcess.js</valueProcess>
+ <title>Username</title>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/uid/onValidation.js</onValidation>
</entityField>
<entityField>
- <name>TITLE</name>
- <title>Login</title>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/title/onValidation.js</onValidation>
+ <name>TITLE_ORIGINAL</name>
+ <description>the original username, this is required to update the correct user when the username is changed</description>
+ <searchable v="false" />
</entityField>
<entityField>
<name>CONTACT_ID</name>
@@ -65,13 +66,17 @@
<name>PASSWORD</name>
<title>Password</title>
<contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
<searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>CONFIRM_PASSWORD</name>
<title>Confirm password</title>
<contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
<searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
</entityField>
<entityActionField>
<name>setPassword</name>
@@ -81,12 +86,14 @@
<iconId>VAADIN:PASSWORD</iconId>
</entityActionField>
<entityParameter>
- <name>passwordChange_param</name>
+ <name>PasswordChange_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
- <name>onlyActives_param</name>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
@@ -228,7 +235,26 @@
</entityConsumer>
<entityField>
<name>STORED_SELECTIONS</name>
+ <searchable v="false" />
</entityField>
+ <entityProvider>
+ <name>Employees</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -240,7 +266,7 @@
<onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
- <element>TITLE.value</element>
+ <element>TITLE_ORIGINAL.value</element>
<element>ISACTIVE.value</element>
<element>FIRSTNAME.value</element>
<element>LASTNAME.value</element>
diff --git a/entity/Employee_entity/afterOperatingState.js b/entity/Employee_entity/afterOperatingState.js
new file mode 100644
index 0000000000..96b470c432
--- /dev/null
+++ b/entity/Employee_entity/afterOperatingState.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ neon.setFieldValue("$field.UID", "");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js b/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
new file mode 100644
index 0000000000..66736a3ca9
--- /dev/null
+++ b/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ result.string(true);
+
diff --git a/entity/Employee_entity/entityfields/confirm_password/stateProcess.js b/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
new file mode 100644
index 0000000000..7df5126f58
--- /dev/null
+++ b/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ state = neon.COMPONENTSTATE_AUTO;
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/contact_id/onValidation.js b/entity/Employee_entity/entityfields/contact_id/onValidation.js
index e69de29bb2..35de5d935e 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValidation.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValidation.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("system.tools");
+import("system.translate");
+
+var contactId = vars.get("$field.CONTACT_ID");
+var isTaken = tools.getUserByAttribute(tools.CONTACTID, [contactId]);
+isTaken = isTaken
+ ? isTaken[tools.TITLE] != vars.get("$field.TITLE_ORIGINAL")
+ : false;
+if (contactId && isTaken)
+ result.string(translate.text("The person is already associated with another employee!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js b/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js
new file mode 100644
index 0000000000..ed5935fc12
--- /dev/null
+++ b/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string(true);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js b/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js
new file mode 100644
index 0000000000..3b4a1820eb
--- /dev/null
+++ b/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string(false);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/password/mandatoryProcess.js b/entity/Employee_entity/entityfields/password/mandatoryProcess.js
new file mode 100644
index 0000000000..66736a3ca9
--- /dev/null
+++ b/entity/Employee_entity/entityfields/password/mandatoryProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ result.string(true);
+
diff --git a/entity/Employee_entity/entityfields/password/stateProcess.js b/entity/Employee_entity/entityfields/password/stateProcess.js
new file mode 100644
index 0000000000..7df5126f58
--- /dev/null
+++ b/entity/Employee_entity/entityfields/password/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ state = neon.COMPONENTSTATE_AUTO;
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/setpassword/onActionProcess.js b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
index c05551ee97..bda0a6b48a 100644
--- a/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
+++ b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
@@ -2,6 +2,6 @@ import("system.vars");
import("system.neon");
var params = {
- "passwordChange_param" : true
+ "PasswordChange_param" : true
};
-neon.openContext("Employee", "EmployeePassword_view", [vars.get("$field.TITLE")], neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
+neon.openContext("Employee", "EmployeePassword_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/uid/onValidation.js b/entity/Employee_entity/entityfields/uid/onValidation.js
new file mode 100644
index 0000000000..e6c2cc26a8
--- /dev/null
+++ b/entity/Employee_entity/entityfields/uid/onValidation.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("system.tools");
+import("Entity_lib");
+
+var title = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.UID"));
+if (!(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && title == vars.get("$field.TITLE_ORIGINAL"))
+ && title != "" && tools.existUsers(title))
+ result.string(translate.text("Username already exists!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/uid/valueProcess.js b/entity/Employee_entity/entityfields/uid/valueProcess.js
deleted file mode 100644
index fa5d98db33..0000000000
--- a/entity/Employee_entity/entityfields/uid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
- && vars.get("$field.TITLE"))
- result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 98ec35774e..f09c6c4a66 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -2,6 +2,7 @@ import("system.vars");
import("system.result");
import("system.tools");
import("Util_lib");
+import("Contact_lib");
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -20,10 +21,11 @@ users = users.map(function (user)
user[tools.PARAMS][tools.EMAIL],
user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
- user[tools.PARAMS][tools.CONTACTID],
+ ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //not good
user[tools.PARAMS][tools.FRAME_STOREDSEARCHES]
];
});
+ArrayUtils.sort2d(users, 0, true, false);
var filter = vars.exists("$local.filter") && vars.get("$local.filter");
diff --git a/entity/Employee_entity/recordcontainers/jdito/onDelete.js b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
index e10dd07e51..c6dddbee3d 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.tools");
-tools.deleteUser(vars.get("$field.TITLE"));
\ No newline at end of file
+tools.deleteUser(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index e771eb763f..1ab06f0014 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -11,7 +11,11 @@ params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-user[tools.TITLE] = vars.get("$field.TITLE");
+user[tools.TITLE] = vars.get("$field.UID");
user[tools.PARAMS] = params;
+if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
+{
+ user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
+}
tools.insertUser(user);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index f487449ce4..d3fd1e6b72 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -2,8 +2,9 @@ import("system.logging");
import("system.vars");
import("system.tools");
-var user = tools.getUser(vars.get("$field.TITLE"));
+var user = tools.getUser(vars.get("$field.TITLE_ORIGINAL"));
+user[tools.TITLE] = vars.get("$field.UID");
user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
@@ -11,7 +12,7 @@ user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
user[tools.PARAMS][tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-if (vars.exists("$param.passwordChange_param") && vars.get("$param.passwordChange_param")
+if (vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param")
&& vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
{
user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 5883d8dc24..41e31b257a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -279,12 +279,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>ContactEditors</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>ffdbb464-fa37-4bb7-a66d-d9e0d3a9bc56</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
</entityProvider>
<entityField>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 8b75e31a16..443bfc6a97 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -40,6 +40,8 @@
<consumer>Employees</consumer>
<linkedContext>Person</linkedContext>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TIMETRACKINGID</name>
diff --git a/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js b/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js
new file mode 100644
index 0000000000..a9e1c2fa99
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
+result.string(ContactUtils.getTitleByContactId(vars.get("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
new file mode 100644
index 0000000000..8df31bc890
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d1e1e40383..4c77d30255 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2691,6 +2691,18 @@
<entry>
<key>Maturity</key>
</entry>
+ <entry>
+ <key>Stored selections</key>
+ </entry>
+ <entry>
+ <key>Username</key>
+ </entry>
+ <entry>
+ <key>The person is already associated with another employee!</key>
+ </entry>
+ <entry>
+ <key>Username already exists!</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 605049e492..8a7f5281e5 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -12,7 +12,7 @@
</entry>
<entry>
<key>Confirm password</key>
- <value>Passwort bestätigen</value>
+ <value>Passwort prüfen</value>
</entry>
<entry>
<key>Entrydate (Day)</key>
@@ -102,6 +102,10 @@
<key>Customercode</key>
<value>Kundennummer</value>
</entry>
+ <entry>
+ <key>The person is already associated with another employee!</key>
+ <value>Die Person ist bereits mit einem anderen Mitarbeiter verknüpft!</value>
+ </entry>
<entry>
<key>Time expenses</key>
<value>Aufwand</value>
@@ -3152,6 +3156,10 @@
<key>Function</key>
<value>Funktion</value>
</entry>
+ <entry>
+ <key>Username already exists!</key>
+ <value>Der Benutzername existiert bereits!</value>
+ </entry>
<entry>
<key>Relational</key>
</entry>
@@ -3302,6 +3310,10 @@
<entry>
<key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
</entry>
+ <entry>
+ <key>Username</key>
+ <value>Benutzername</value>
+ </entry>
<entry>
<key>normal</key>
</entry>
@@ -3453,6 +3465,7 @@
</entry>
<entry>
<key>Password and confirmation must be the same!</key>
+ <value>Die Passwörter stimmen nicht überein!</value>
</entry>
<entry>
<key>Login</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 81f9dded14..898fc6da0a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2721,6 +2721,18 @@
<entry>
<key>Maturity</key>
</entry>
+ <entry>
+ <key>Stored selections</key>
+ </entry>
+ <entry>
+ <key>Username</key>
+ </entry>
+ <entry>
+ <key>The person is already associated with another employee!</key>
+ </entry>
+ <entry>
+ <key>Username already exists!</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Employee/Employee.aod b/neonContext/Employee/Employee.aod
index e9eced1253..1d7640c187 100644
--- a/neonContext/Employee/Employee.aod
+++ b/neonContext/Employee/Employee.aod
@@ -7,6 +7,7 @@
<filterview>EmployeeFilter_view</filterview>
<editview>EmployeeEdit_view</editview>
<preview>EmployeePreview_view</preview>
+ <lookupview>EmployeeLookup_view</lookupview>
<entity>Employee_entity</entity>
<references>
<neonViewReference>
@@ -29,5 +30,9 @@
<name>a01b0910-cd32-4fa7-a739-0b9eb19debc2</name>
<view>EmployeePassword_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>3427f53f-9201-495c-a37c-b2c9b33eb123</name>
+ <view>EmployeeLookup_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/EmployeeRole/EmployeeRole.aod b/neonContext/EmployeeRole/EmployeeRole.aod
index 0cb5fb8242..28bfe0b0c7 100644
--- a/neonContext/EmployeeRole/EmployeeRole.aod
+++ b/neonContext/EmployeeRole/EmployeeRole.aod
@@ -8,5 +8,9 @@
<name>fd4de342-238b-494e-a85b-ff08e3f065b9</name>
<view>EmployeeRoleFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>6ec0af90-47aa-4f94-8e05-7c535bd4c965</name>
+ <view>EmployeeRoleEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index 61348eb415..c355722233 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -14,8 +14,8 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>aff1892e-9fca-45cd-bcd6-d2b857e2cb7b</name>
- <entityField>TITLE</entityField>
+ <name>fdd5320e-a8c0-4043-a88e-aeba1ca02cd1</name>
+ <entityField>UID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
@@ -41,7 +41,20 @@
<name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
<entityField>DESCRIPTION</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>4ad9c1aa-37a9-46f9-a566-94e5be5c2a7f</name>
+ <entityField>PASSWORD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5381db3a-762d-439a-b41b-e4e67edc2099</name>
+ <entityField>CONFIRM_PASSWORD</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>af8112a3-78d3-436f-b665-ebce595a7c24</name>
+ <entityField>EmployeeRoles</entityField>
+ <view>EmployeeRoleEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index 121d76e930..aac34a16e2 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -19,7 +19,7 @@
</neonTableColumn>
<neonTableColumn>
<name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
- <entityField>TITLE</entityField>
+ <entityField>UID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
diff --git a/neonView/EmployeeLookup_view/EmployeeLookup_view.aod b/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
new file mode 100644
index 0000000000..df29cc7825
--- /dev/null
+++ b/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
@@ -0,0 +1,30 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeeLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>e37a558f-1936-4e23-aac5-11c23028c1d5</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b7eb1603-f9eb-46ae-8096-cfecaee359d5</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7c1a3e27-e7da-4e50-bef0-e987d9e1c4c8</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index a96af6d20e..02a259276e 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -12,7 +12,7 @@
<name>Header</name>
<iconField>IMAGE</iconField>
<titleField>NAME_fieldGroup</titleField>
- <subtitleField>TITLE</subtitleField>
+ <subtitleField>UID</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
new file mode 100644
index 0000000000..3013b36d8e
--- /dev/null
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -0,0 +1,22 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>EmployeeRoleEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>GenericMultiple</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ecaa1457-eb60-4116-a46c-9c91e2d3fd63</name>
+ <entityField>UID</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/process/Employee_lib/Employee_lib.aod b/process/Employee_lib/Employee_lib.aod
new file mode 100644
index 0000000000..9c77c83eb0
--- /dev/null
+++ b/process/Employee_lib/Employee_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process 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/process/1.2.0">
+ <name>Employee_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Employee_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
new file mode 100644
index 0000000000..9a781c2556
--- /dev/null
+++ b/process/Employee_lib/process.js
@@ -0,0 +1,20 @@
+import("system.tools");
+
+/**
+ * Provides functions for employees and users.j
+ *
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function EmployeeUtils () {}
+
+/**
+ * Returns the contact id of the current user
+ *
+ * @return the contact id
+ */
+EmployeeUtils.getCurrentContactId = function ()
+{
+ return tools.getCurrentUser()[tools.PARAMS][tools.CONTACTID];
+}
\ No newline at end of file
--
GitLab
From d8ddfeaabc3c5f12c27ac3a8105e484fd68bbf2e Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 1 Apr 2019 17:05:02 +0200
Subject: [PATCH 156/250] Note to Description in Offeritem_entity
---
entity/Offeritem_entity/Offeritem_entity.aod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 0185cc75e4..112db2654d 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -182,7 +182,7 @@
<entityField>
<name>INFO</name>
<documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
- <title>Note</title>
+ <title>Description</title>
<contentType>LONG_TEXT</contentType>
<state>READONLY</state>
</entityField>
--
GitLab
From e963ae27afa47d141025c5726fd7a47161875db7 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 2 Apr 2019 09:40:41 +0200
Subject: [PATCH 157/250] Orderitem refactoring
---
entity/Orderitem_entity/Orderitem_entity.aod | 622 +++++++++---------
.../OrderitemFilter_view.aod | 4 +
2 files changed, 315 insertions(+), 311 deletions(-)
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index de79c9ea43..b8979d94e9 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,311 +1,311 @@
-<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>Orderitem_entity</name>
- <title>Orderitem</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
- <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ASSIGNEDTO</name>
- </entityField>
- <entityField>
- <name>DISCOUNT</name>
- <title>Discount</title>
- </entityField>
- <entityField>
- <name>GROUPCODEID</name>
- <title>Commodity group</title>
- <consumer>KeywordProductGroupcodes</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ITEMNAME</name>
- <title>Designation</title>
- </entityField>
- <entityField>
- <name>ITEMPOSITION</name>
- <title>Position</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ITEMSORT</name>
- </entityField>
- <entityField>
- <name>SALESORDERITEMID</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SALESORDER_ID</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRICE</name>
- <title>Unit price</title>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
- <title>Article</title>
- <consumer>Products</consumer>
- <linkedContext>Product</linkedContext>
- <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
- <title>Quantity</title>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
- <onValidation></onValidation>
- <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>UNIT</name>
- <title>Unit</title>
- <consumer>KeywordQuantityUnits</consumer>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>VAT in %</title>
- <state>AUTO</state>
- </entityField>
- <entityParameter>
- <name>OrderId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>TotalPrice</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
- <title>Sum</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- <onValidation></onValidation>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Orderitems</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>INFO</name>
- <title>Note</title>
- </entityField>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </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>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
- <tableName>SALESORDERITEM</tableName>
- <primaryKey>SALESORDERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ASSIGNEDTO.value</name>
- <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISCOUNT.value</name>
- <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.value</name>
- <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMNAME.value</name>
- <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMPOSITION.value</name>
- <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMSORT.value</name>
- <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESORDERITEMID.value</name>
- <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESORDER_ID.value</name>
- <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OPTIONAL.value</name>
- <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICE.value</name>
- <recordfield>SALESORDERITEM.PRICE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>QUANTITY.value</name>
- <recordfield>SALESORDERITEM.QUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.value</name>
- <recordfield>SALESORDERITEM.UNIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>SALESORDERITEM.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>SALESORDERITEM.INFO</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>Orderitem_entity</name>
+ <title>Orderitem</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
+ <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ASSIGNEDTO</name>
+ </entityField>
+ <entityField>
+ <name>DISCOUNT</name>
+ <title>Discount</title>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <title>Commodity group</title>
+ <consumer>KeywordProductGroupcodes</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMNAME</name>
+ <title>Designation</title>
+ </entityField>
+ <entityField>
+ <name>ITEMPOSITION</name>
+ <title>Position</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMSORT</name>
+ </entityField>
+ <entityField>
+ <name>SALESORDERITEMID</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SALESORDER_ID</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <title>Optional</title>
+ <contentType>BOOLEAN</contentType>
+ <mandatory v="true" />
+ <possibleItemsProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <title>Unit price</title>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
+ <title>Article</title>
+ <consumer>Products</consumer>
+ <linkedContext>Product</linkedContext>
+ <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
+ <title>Quantity</title>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValidation></onValidation>
+ <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <title>Unit</title>
+ <consumer>KeywordQuantityUnits</consumer>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>VAT in %</title>
+ <state>AUTO</state>
+ </entityField>
+ <entityParameter>
+ <name>OrderId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TotalPrice</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
+ <title>Sum</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ <onValidation></onValidation>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OrderStatus_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Orderitems</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </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>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
+ <tableName>SALESORDERITEM</tableName>
+ <primaryKey>SALESORDERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ASSIGNEDTO.value</name>
+ <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT.value</name>
+ <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.value</name>
+ <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMNAME.value</name>
+ <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMPOSITION.value</name>
+ <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMSORT.value</name>
+ <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESORDERITEMID.value</name>
+ <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESORDER_ID.value</name>
+ <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OPTIONAL.value</name>
+ <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE.value</name>
+ <recordfield>SALESORDERITEM.PRICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ <recordfield>SALESORDERITEM.QUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.value</name>
+ <recordfield>SALESORDERITEM.UNIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>SALESORDERITEM.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESORDERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index dddaaae965..46be535856 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -50,6 +50,10 @@
<name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
<entityField>INFO</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
+ <entityField>TotalPrice</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
--
GitLab
From bb23e4f7e8e68b5b1cc3894f7b0e120eb8aea5ae Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 16:18:04 +0200
Subject: [PATCH 158/250] Indexer: adjust column sort
---
.../Data_alias/indexsearchgroups/organisation/query.js | 6 +++---
.../Data_alias/indexsearchgroups/person/query.js | 5 ++---
process/runIndexer_ws/runIndexer_ws.aod | 1 +
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
index 1bb4c5ad46..0480b06a5f 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
@@ -15,9 +15,9 @@ sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
- ,sqlHelper.concat(["defaultAddress.ZIP", "defaultAddress.CITY"])
- ,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
+ ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+ ], " - ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from ORGANISATION "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
index 6178113261..32e581b155 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
@@ -3,7 +3,6 @@ import("system.vars");
import("system.calendars");
import("system.db");
import("Sql_lib");
-
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
@@ -16,8 +15,8 @@ sqlQuery = "select CONTACT.CONTACTID "
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
- ,sqlHelper.concat(["defaultAddress.ZIP", "defaultAddress.CITY"])
- ,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
+ ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+ ], " - ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from PERSON "
diff --git a/process/runIndexer_ws/runIndexer_ws.aod b/process/runIndexer_ws/runIndexer_ws.aod
index 264fd8f40a..a3c2f51db7 100644
--- a/process/runIndexer_ws/runIndexer_ws.aod
+++ b/process/runIndexer_ws/runIndexer_ws.aod
@@ -7,4 +7,5 @@
<style>REST</style>
<loginTypeId>internal.none</loginTypeId>
<restrictedRoles />
+ <alias>Data_alias</alias>
</process>
--
GitLab
From 1d3268e62fd091925860d18435cf7d43f5728780 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 16:42:01 +0200
Subject: [PATCH 159/250] context_lib-definition: added standard address to
person
---
process/Context_lib/process.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 15f89e3062..4073611e2f 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -262,9 +262,16 @@ ContextUtils.getSelectMap = function()
return {
"Organisation": ContextSelector.create("ORGANISATION", "ORGANISATIONID", "NAME")
,"Person": ContextSelector.create("CONTACT", "CONTACTID")
- .setTitleExpression(new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql())
+ .setTitleExpression(maskingUtils.concat([
+ new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()
+ ,"' - '"//looks pretty bad; TODO: workaround till Lookups can be loaded over a link-entity; then use displayProc
+ ,"defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"
+ ,"' - '"
+ ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"
+ ]," "))
.setJoinExpression("join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID \n\
- join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID\n\
+ left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID")
,"Activity": ContextSelector.create("ACTIVITY", "ACTIVITYID", "SUBJECT")
,"Salesproject": ContextSelector.create("SALESPROJECT", "SALESPROJECTID")
.setTitleExpression(maskingUtils.concat([
--
GitLab
From e43429174d340aeae789e3043fb620e9acde9b69 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 2 Apr 2019 10:01:57 +0200
Subject: [PATCH 160/250] Context_lib: small format changes
---
process/Context_lib/process.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 4073611e2f..8e16faee0d 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -352,7 +352,9 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
var selectMap = ContextUtils.getSelectMap ()
if (selectMap[pContextId] != undefined)
{
- return SqlCondition.begin().andPrepare(selectMap[pContextId].getFullIdField(), pRowId).buildSql("select " + selectMap[pContextId].titleExpression + " from " + selectMap[pContextId].getFullFromClause(), "1 = 2");
+ return SqlCondition.begin().andPrepare(selectMap[pContextId].getFullIdField(), pRowId)
+ .buildSql("select " + selectMap[pContextId].titleExpression
+ + " from " + selectMap[pContextId].getFullFromClause(), "1 = 2");
}
else
return "select 1 from person where 1=2";
@@ -394,5 +396,6 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive
if (pWithState === true)
stateColumn = ", " + (selectMap[pContextId].stateField || "''");
- return cond.buildSql("select " + selectMap[pContextId].getFullIdField() + ", " + selectMap[pContextId].titleExpression + dateColumn + stateColumn + " from " + selectMap[pContextId].getFullFromClause(), "1=1");
+ return cond.buildSql("select " + selectMap[pContextId].getFullIdField() + ", " + selectMap[pContextId].titleExpression + dateColumn + stateColumn
+ + " from " + selectMap[pContextId].getFullFromClause(), "1=1");
}
--
GitLab
From 3acb969ff02cc712e94907261d63af5c1370a4b6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 2 Apr 2019 10:08:06 +0200
Subject: [PATCH 161/250] Context_lib: exclude private-dummy organisation
---
process/Context_lib/process.js | 35 +++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 8e16faee0d..c0673e0e7e 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -183,6 +183,7 @@ function ContextSelector(pTableName, pIdField, pTitleExpression)
* @property
*/
this.activeStates = null; ProtoPropertyUtils.makeSemiReadOnly(this, "activeStates");
+ this.condition = null; ProtoPropertyUtils.makeSemiReadOnly(this, "condition");
}
/**
* creates a new instance of a ContextSelector and returns it
@@ -252,6 +253,15 @@ ContextSelector.prototype.setActiveStates = function(pValue)
this._activeStates = pValue;
return this;
};
+/**
+ * sets the condition property of a ContextSelector-object
+ * @param {Object} pSqlCondition condition as SqlCondition-object
+ */
+ContextSelector.prototype.setCondition = function(pSqlCondition)
+{
+ this._condition = pSqlCondition;
+ return this;
+};
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
@@ -261,6 +271,7 @@ ContextUtils.getSelectMap = function()
var maskingUtils = new SqlMaskingUtils();
return {
"Organisation": ContextSelector.create("ORGANISATION", "ORGANISATIONID", "NAME")
+ .setCondition(SqlCondition.begin().and("ORGANISATION.ORGANISATIONID != '0'"))
,"Person": ContextSelector.create("CONTACT", "CONTACTID")
.setTitleExpression(maskingUtils.concat([
new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()
@@ -365,37 +376,39 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
*/
ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive, pWithState)
{
- var selectMap = ContextUtils.getSelectMap ();
+ var selectMap = ContextUtils.getSelectMap();
+ var ownContextSelector = selectMap[pContextId];
var cond = SqlCondition.begin();
if (pRowId)
{
- cond.andPrepare(selectMap[pContextId].tableName + "." + selectMap[pContextId].contactIdField, pRowId)
+ cond.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.contactIdField, pRowId)
}
if (pActive != undefined)
{
- var activeStates = selectMap[pContextId].activeStates;
+ var activeStates = ownContextSelector.activeStates;
if(activeStates != null && activeStates.length > 0)
{
var condSub = SqlCondition.begin();
activeStates.forEach(function (state)
{
if(pActive)
- condSub.orPrepare(selectMap[pContextId].tableName + "." + selectMap[pContextId].stateField, state)
+ condSub.orPrepare(ownContextSelector.tableName + "." + ownContextSelector.stateField, state)
else
- condSub.andPrepare(selectMap[pContextId].tableName + "." + selectMap[pContextId].stateField, state, "# != ?")
+ condSub.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.stateField, state, "# != ?")
});
cond.andSqlCondition(condSub);
}
}
var dateColumn = "";
if (pWithDate === true)
- dateColumn = ", " + (selectMap[pContextId].creationDateField || "''");
-
+ dateColumn = ", " + (ownContextSelector.creationDateField || "''");
var stateColumn = "";
if (pWithState === true)
- stateColumn = ", " + (selectMap[pContextId].stateField || "''");
-
- return cond.buildSql("select " + selectMap[pContextId].getFullIdField() + ", " + selectMap[pContextId].titleExpression + dateColumn + stateColumn
- + " from " + selectMap[pContextId].getFullFromClause(), "1=1");
+ stateColumn = ", " + (ownContextSelector.stateField || "''");
+ if (ownContextSelector.condition)
+ cond.andSqlCondition(ownContextSelector.condition);
+ var res = cond.buildSql("select " + ownContextSelector.getFullIdField() + ", " + ownContextSelector.titleExpression + dateColumn + stateColumn
+ + " from " + ownContextSelector.getFullFromClause(), "1=1");
+ return res;
}
--
GitLab
From 67f58d66182a8194ca89480c4ee077d20827420a Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 2 Apr 2019 10:34:34 +0200
Subject: [PATCH 162/250] Offer: Offercode as one column in table
---
entity/Offer_entity/Offer_entity.aod | 6 ++++++
.../entityfields/fulloffercode/valueProcess.js | 5 +++++
.../offercode_versnr_fieldgroup/valueProcess.js | 2 +-
neonView/OfferFilter_view/OfferFilter_view.aod | 8 ++------
4 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 entity/Offer_entity/entityfields/fulloffercode/valueProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 07c13a4f19..b2dd85d8d2 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -679,6 +679,12 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>FullOfferCode</name>
+ <title>Offer number</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js b/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js
new file mode 100644
index 0000000000..d39bcd7a3c
--- /dev/null
+++ b/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+//a filedGroup cannot be placed in a table (filter-view) at the moment and therefore a separate field is needed:
+result.string(vars.get("$field.OFFERCODE") + "-" + vars.get("$field.VERSNR"));
diff --git a/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js b/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js
index c7fab6e323..28c9f0b087 100644
--- a/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js
+++ b/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.OFFERCODE") + "-" + vars.get("$field.VERSNR"));
+result.string(vars.get("$field.FullOfferCode"));
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index edf7596f2f..b64a227c3a 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -54,12 +54,8 @@
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
- <entityField>OFFERCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>36b035da-4a57-413e-a5dc-c8974ca3855b</name>
- <entityField>VERSNR</entityField>
+ <name>4d40cee3-bcb1-4e67-8c1d-d5fc2e49cc11</name>
+ <entityField>FullOfferCode</entityField>
</neonTableColumn>
<neonTableColumn>
<name>780087e7-ff3c-4592-90be-607357168295</name>
--
GitLab
From c75f9f5815ac0693aecb10ad4e4d1979f4f9b066 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 2 Apr 2019 10:42:28 +0200
Subject: [PATCH 163/250] removed several logging.log
---
.../Offer_entity/entityfields/deliveryterms/valueProcess.js | 1 -
process/Report_lib/process.js | 4 ++--
process/Sql_lib/process.js | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
index 2e15600563..911cd325a0 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -2,7 +2,6 @@ import("system.logging");
import("system.result");
import("system.vars");
-logging.log(vars.get("$param.OfferDeliveryTerm_param"))
if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
{
result.string(vars.get("$param.OfferDeliveryTerm_param"));
diff --git a/process/Report_lib/process.js b/process/Report_lib/process.js
index d1f68a387e..af40b17919 100644
--- a/process/Report_lib/process.js
+++ b/process/Report_lib/process.js
@@ -15,8 +15,8 @@ import("system.vars");
* reportData.add(moreDataValues);<br>
* <br>
* <br>
- * logging.log(reportData.getReportFields().toSource());<br>
- * logging.log(reportData.getReportData().toSource());<br>
+ * logMsg(reportData.getReportFields().toSource());<br>
+ * logMsg(reportData.getReportData().toSource());<br>
*
* @class
* @param {Array} [pFieldNames=[]] the report fieldnames as an array
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 195c85cb41..4a64fc6b37 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1062,12 +1062,12 @@ SqlUtils.getSingleColumnType = function(fieldOrTableName, columnName, alias) {
*
* sqlPageData(sql, blockSize, function (pData, pRunNo){
* var j = pData.length;//pData is the current block with data
-* logging.log(pRunNo.toString() + "#" + j);//pRunNo is the amount how often the func. has been already called
+* logMsg(pRunNo.toString() + "#" + j);//pRunNo is the amount how often the func. has been already called
* //you can calculate the progress easily by: progress = (blockSize* (pRunNo-1) + pData.length) / (allRows - startOffset)
* //example in per cent:
* var startOffset = 0;//we did not pass any startOffset to sqlPageData - this is equivalent to zero
* var progress = (blockSize* (pRunNo-1) + pData.length) / (allRows - startOffset);
-* logging.log("progess: " + eMath.roundDec(progress * 100, 2, eMath.ROUND_CEILING) + "%");
+* logMsg("progess: " + eMath.roundDec(progress * 100, 2, eMath.ROUND_CEILING) + "%");
*
* for (var i = 0; i < j; i++)
* {
@@ -1076,7 +1076,7 @@ SqlUtils.getSingleColumnType = function(fieldOrTableName, columnName, alias) {
* }
*
* count += pRunNo * 100;
-* logging.log("count:" + count);//you cannot overwrite a variable of 'sqlPageData' by accident
+* logMsg("count:" + count);//you cannot overwrite a variable of 'sqlPageData' by accident
* });
*
* logging.show(letValues);//contains orgnames
--
GitLab
From 837688e9f9b379d4a5bdf6573ea7aa06271d64df Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 2 Apr 2019 10:42:56 +0200
Subject: [PATCH 164/250] Employee and EmployeeRole
---
.../recordcontainers/db/conditionProcess.js | 4 ----
.../EmployeeRole_entity.aod | 8 ++++++--
.../{uid => role}/possibleItemsProcess.js | 0
.../recordcontainers/jdito/contentProcess.js | 4 ++--
.../recordcontainers/jdito/onInsert.js | 2 +-
.../recordcontainers/jdito/onUpdate.js | 8 +++++---
entity/Employee_entity/Employee_entity.aod | 19 +++++++++---------
entity/Employee_entity/afterOperatingState.js | 2 +-
.../entityfields/image/onValueChange.js | 4 ++++
.../recordcontainers/jdito/contentProcess.js | 17 ++++++++++------
.../recordcontainers/jdito/onDelete.js | 6 +++++-
.../recordcontainers/jdito/onInsert.js | 1 +
.../recordcontainers/jdito/onUpdate.js | 20 ++++++++++++++++++-
.../Timetracking_entity.aod | 2 +-
.../EmployeePreview_view.aod | 4 ++++
.../EmployeeRoleEdit_view.aod | 2 +-
.../EmployeeRoleFilter_view.aod | 2 +-
process/Employee_lib/process.js | 14 ++++++++++++-
18 files changed, 84 insertions(+), 35 deletions(-)
rename entity/EmployeeRole_entity/entityfields/{uid => role}/possibleItemsProcess.js (100%)
create mode 100644 entity/Employee_entity/entityfields/image/onValueChange.js
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
index 623fac4157..d2b6666319 100644
--- a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.db");
import("system.result");
@@ -7,9 +6,6 @@ import("Sql_lib");
var cond = SqlCondition.begin()
.andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.ObjectRowId_param");
-if (vars.exists("$param.ObjectRowId_param"))
- logging.log(vars.get("$param.ObjectRowId_param"))
-
if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param")
&& vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
{
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index f184486509..4fd240c55b 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -9,8 +9,6 @@
</entityProvider>
<entityField>
<name>UID</name>
- <title>Role</title>
- <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityParameter>
<name>UserTitle_param</name>
@@ -35,6 +33,11 @@
</entityParameter>
</children>
</entityProvider>
+ <entityField>
+ <name>ROLE</name>
+ <title>Role</title>
+ <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -46,6 +49,7 @@
<onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
+ <element>ROLE.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js b/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
similarity index 100%
rename from entity/EmployeeRole_entity/entityfields/uid/possibleItemsProcess.js
rename to entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
index 9f314aac5d..5e4ff916b0 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -5,7 +5,7 @@ import("system.tools");
var roles = [];
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-if (userTitle)
- roles = tools.getRoles(userTitle).map(function (role) {return [role]});
+if (userTitle && tools.existUsers(userTitle))
+ roles = tools.getRoles(userTitle).map(function (role) {return [role, role]});
result.object(roles);
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
index 23ca713599..cd847798b8 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var role = vars.get("$field.UID");
+var role = vars.get("$field.ROLE");
if (userTitle)
{
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
index 23ca713599..ae08df85d8 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
@@ -3,14 +3,16 @@ import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var role = vars.get("$field.UID");
+var oldRole = vars.get("$field.UID");
+var newRole = vars.get("$field.ROLE");
-if (userTitle)
+if (userTitle && oldRole != newRole)
{
var user = tools.getUser(userTitle);
var roles = tools.getRoles(userTitle);
var roleObj = {};
- roles = [role].concat(roles)
+ roleObj[oldRole] = true;
+ roles = [newRole].concat(roles)
.filter(function (role)
{
var exists = role in roleObj;
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index fae8cd5d30..ca823d2c54 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -12,14 +12,6 @@
<entityProvider>
<name>#PROVIDER</name>
<lookupIdfield>CONTACT_ID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>823f9c90-c834-4e37-a47b-b3756fd28182</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
@@ -37,7 +29,7 @@
<title>Person</title>
<consumer>Contacts</consumer>
<linkedContext>Person</linkedContext>
- <mandatory v="false" />
+ <mandatory v="true" />
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -139,8 +131,8 @@
<name>IMAGE</name>
<contentType>IMAGE</contentType>
<searchable v="false" />
- <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
@@ -148,6 +140,7 @@
<entityField>
<name>DEPARTMENT</name>
<title>Department</title>
+ <state>INVISIBLE</state>
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -247,6 +240,12 @@
<fieldName>Employees</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Employee_entity/afterOperatingState.js b/entity/Employee_entity/afterOperatingState.js
index 96b470c432..bfb14f69c3 100644
--- a/entity/Employee_entity/afterOperatingState.js
+++ b/entity/Employee_entity/afterOperatingState.js
@@ -3,4 +3,4 @@ import("system.neon");
import("system.vars");
if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
- neon.setFieldValue("$field.UID", "");
\ No newline at end of file
+ neon.setFieldValue("$field.UID", ""); //UID = user-title, should be initially empty
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/image/onValueChange.js b/entity/Employee_entity/entityfields/image/onValueChange.js
new file mode 100644
index 0000000000..8698d90353
--- /dev/null
+++ b/entity/Employee_entity/entityfields/image/onValueChange.js
@@ -0,0 +1,4 @@
+import("Entity_lib");
+
+// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
+FieldChanges.setChange("$field.IMAGE");
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index f09c6c4a66..917242b94f 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -4,14 +4,21 @@ import("system.tools");
import("Util_lib");
import("Contact_lib");
+var filter = vars.exists("$local.filter") && vars.get("$local.filter");
+
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
- users = vars.get("$local.idvalues");
+ users = [tools.getUser(vars.get("$local.idvalues"), tools.PROFILE_FULL)];
else
- users = tools.getStoredUsers().map(function (row) {return row[1];});
+{
+ var values = ["true", "false"];
+ if (vars.exists("$param.OnlyActives_param") && vars.get("$param.OnlyActives_param") == "true")
+ values = ["true"];
+ users = tools.getUsersByAttribute(tools.ISACTIVE, values, tools.PROFILE_FULL);
+}
+
users = users.map(function (user)
{
- user = tools.getUser(user, tools.PROFILE_FULL);
return [
user[tools.TITLE],
user[tools.TITLE],
@@ -25,8 +32,6 @@ users = users.map(function (user)
user[tools.PARAMS][tools.FRAME_STOREDSEARCHES]
];
});
-ArrayUtils.sort2d(users, 0, true, false);
-
-var filter = vars.exists("$local.filter") && vars.get("$local.filter");
+ArrayUtils.sort2d(users, 0, true, false); //sort by username
result.object(users);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onDelete.js b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
index c6dddbee3d..b3064b9528 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
@@ -1,4 +1,8 @@
+import("system.neon");
import("system.vars");
import("system.tools");
+import("Employee_lib");
-tools.deleteUser(vars.get("$field.UID"));
\ No newline at end of file
+//TODO: the current user should not delete himself, put this condition in grantDelete when available
+if (EmployeeUtils.getCurrentUserName() != vars.get("$field.UID"))
+ tools.deleteUser(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index 1ab06f0014..3693a103f6 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -10,6 +10,7 @@ params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
+params[tools.ISACTIVE] = vars.get("$field.ISACTIVE");
user[tools.TITLE] = vars.get("$field.UID");
user[tools.PARAMS] = params;
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index d3fd1e6b72..5cc71867cd 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -1,10 +1,28 @@
+import("system.db");
import("system.logging");
import("system.vars");
import("system.tools");
+import("Person_lib");
+import("Entity_lib");
-var user = tools.getUser(vars.get("$field.TITLE_ORIGINAL"));
+// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
+FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
+{
+ var personId = db.cell(SqlCondition.begin()
+ .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
+ .buildSql("select PERSON_ID from CONTACT")
+ );
+ if (state == FieldChanges.STATE_CHANGED())
+ PersUtils.setImage(personId, value);
+ else
+ PersUtils.removeImage(personId);
+});
+
+var user = {};
+user[tools.PARAMS] = [];
user[tools.TITLE] = vars.get("$field.UID");
+user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 443bfc6a97..ec6bf91c59 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -94,7 +94,7 @@
<dependency>
<name>dependency</name>
<entityName>Employee_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>Employees</fieldName>
</dependency>
</entityConsumer>
</entityFields>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index 02a259276e..41c53f7a3b 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -20,6 +20,10 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>68755289-a351-4915-8626-52f023e237f8</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>a5f8b519-26d8-4824-b9cf-9119c03b1bd8</name>
<entityField>CONTACT_ID</entityField>
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
index 3013b36d8e..adf9bda6f4 100644
--- a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>ecaa1457-eb60-4116-a46c-9c91e2d3fd63</name>
- <entityField>UID</entityField>
+ <entityField>ROLE</entityField>
</neonTableColumn>
</columns>
</genericMultipleViewTemplate>
diff --git a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
index 1938871992..92602b2146 100644
--- a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
+++ b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
@@ -15,7 +15,7 @@
<columns>
<neonTableColumn>
<name>ab1c8d39-fc29-42e8-8b8e-3557d544b272</name>
- <entityField>UID</entityField>
+ <entityField>ROLE</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index 9a781c2556..ef3273b495 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -16,5 +16,17 @@ function EmployeeUtils () {}
*/
EmployeeUtils.getCurrentContactId = function ()
{
- return tools.getCurrentUser()[tools.PARAMS][tools.CONTACTID];
+ var user = tools.getCurrentUser();
+ return user ? user[tools.PARAMS][tools.CONTACTID] : null;
+}
+
+/**
+ * Returns the username id of the current user
+ *
+ * @return the username
+ */
+EmployeeUtils.getCurrentUserName = function ()
+{
+ var user = tools.getCurrentUser();
+ return user ? user[tools.TITLE] : null;
}
\ No newline at end of file
--
GitLab
From f20ed8373691ea1d681ba4579676a27b305d09c7 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 2 Apr 2019 11:08:23 +0200
Subject: [PATCH 165/250] CreationDateField for offer added in Context_lib
---
process/Context_lib/process.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index c0673e0e7e..e08292ee51 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -314,6 +314,7 @@ ContextUtils.getSelectMap = function()
maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
], "", false))
.setContactIdField("CONTACT_ID")
+ .setCreationDateField("OFFERDATE")
.setStateField("STATUS")
.setActiveStates(["5134153d-2e18-452f-ab35-7a52f1aee7d1", "e5d6b5a4-7576-440f-8332-bc40147c0335"])
,"Order": ContextSelector.create("SALESORDER", "SALESORDERID")
--
GitLab
From 0b443533f5f591eb3473d96172b8ae53f3ddcaf2 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 2 Apr 2019 11:49:24 +0200
Subject: [PATCH 166/250] targetConsumerProcess for AllObjects in Object_entity
---
entity/Contact_entity/Contact_entity.aod | 8 +++
entity/Contract_entity/Contract_entity.aod | 8 +++
entity/Object_entity/Object_entity.aod | 64 +++++++++++++++++++
.../allobjects/targetConsumerProcess.js | 31 +++++++++
entity/Offer_entity/Offer_entity.aod | 8 +++
entity/Order_entity/Order_entity.aod | 8 +++
.../Organisation_entity.aod | 6 ++
entity/Person_entity/Person_entity.aod | 6 ++
entity/Product_entity/Product_entity.aod | 6 ++
.../Salesproject_entity.aod | 6 ++
neonContext/Contract/Contract.aod | 1 +
neonContext/Offer/Offer.aod | 1 +
neonContext/Order/Order.aod | 1 +
13 files changed, 154 insertions(+)
create mode 100644 entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 6b81f7851e..ff5923ed14 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -9,6 +9,14 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>ccbf2270-c30c-458e-8a99-bf0cdcc89689</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Persons</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CONTACTID</name>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 0e8b88c748..6d52f5e3c2 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -163,6 +163,14 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7d8f586a-3ee0-47e8-b328-3b624cf4abfa</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Contracts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CONTACT_ORG_ID</name>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 58bf718a57..14afaa53ef 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -58,6 +58,7 @@
<entityProvider>
<name>AllObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
<documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
<dependencies>
@@ -100,6 +101,69 @@
</entityParameter>
</children>
</entityProvider>
+ <entityConsumer>
+ <name>Organisations</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Persons</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Orders</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Products</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contracts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js b/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js
new file mode 100644
index 0000000000..1a9d1e2e9d
--- /dev/null
+++ b/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js
@@ -0,0 +1,31 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
+{
+ switch(vars.get("$param.ObjectType_param"))
+ {
+ case ContextUtils.getContextName("Organisation"):
+ result.string("Organisations");
+ break;
+ case ContextUtils.getContextName("Person"):
+ result.string("Persons");
+ break;
+ case ContextUtils.getContextName("Offer"):
+ result.string("Offers");
+ break;
+ case ContextUtils.getContextName("Order"):
+ result.string("Orders");
+ break;
+ case ContextUtils.getContextName("Product"):
+ result.string("Products");
+ break;
+ case ContextUtils.getContextName("Contract"):
+ result.string("Contracts");
+ break;
+ case ContextUtils.getContextName("Salesproject"):
+ result.string("Salesprojects");
+ break;
+ }
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index b2dd85d8d2..296a9c2bd3 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -10,6 +10,14 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>f909c251-16c1-49e2-9b43-6d5f834137c6</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CURRENCY</name>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 7c92100b57..bb720b0c99 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -10,6 +10,14 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>95e7ab85-0af9-46ea-a50a-7719833acd2a</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Orders</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CURRENCY</name>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 19bd7ed720..7a62ddafbb 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -260,6 +260,12 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>1a472ca0-4d27-453c-8de5-a046b86f22fb</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 41e31b257a..761e058e94 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -279,6 +279,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>ContactEditors</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>ec66d6b0-a1fa-40a1-9612-34775d3e89a9</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Persons</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 8939a51225..36400cf037 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -171,6 +171,12 @@
<fieldName>Products</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>760f179a-f37e-4bdf-af8f-d8935e86db0f</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Products</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index d292e27ad9..7807364170 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -23,6 +23,12 @@
<fieldName>Salesprojects</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>f010781d-453d-4df3-b330-75c1336e4d4c</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
diff --git a/neonContext/Contract/Contract.aod b/neonContext/Contract/Contract.aod
index ffaf63ede7..39e367fa3e 100644
--- a/neonContext/Contract/Contract.aod
+++ b/neonContext/Contract/Contract.aod
@@ -7,6 +7,7 @@
<filterview>ContractFilter_view</filterview>
<editview>ContractEdit_view</editview>
<preview>ContractPreview_view</preview>
+ <lookupview>ContractFilter_view</lookupview>
<entity>Contract_entity</entity>
<references>
<neonViewReference>
diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod
index baae56ff7c..e1d68da5ca 100644
--- a/neonContext/Offer/Offer.aod
+++ b/neonContext/Offer/Offer.aod
@@ -7,6 +7,7 @@
<filterview>OfferFilter_view</filterview>
<editview>OfferEdit_view</editview>
<preview>OfferPreview_view</preview>
+ <lookupview>OfferFilter_view</lookupview>
<entity>Offer_entity</entity>
<references>
<neonViewReference>
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index d4766497ac..09c0811ee9 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -8,6 +8,7 @@
<filterview>OrderFilter_view</filterview>
<editview>OrderEdit_view</editview>
<preview>OrderPreview_view</preview>
+ <lookupview>OrderFilter_view</lookupview>
<entity>Order_entity</entity>
<references>
<neonViewReference>
--
GitLab
From 4fff58aecedc961a5d6efacdd8b189730ec64c50 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Tue, 2 Apr 2019 12:44:34 +0200
Subject: [PATCH 167/250] #1036286 HeaderFooterLayout for SalesprojectPreview
---
.../SalesprojectPreview_view/SalesprojectPreview_view.aod | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 86491e2ff9..152e012906 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -3,9 +3,10 @@
<name>SalesprojectPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <headerFooterLayout>
<name>layout</name>
- </boxLayout>
+ <footer>AdditionalInfo</footer>
+ </headerFooterLayout>
</layout>
<children>
<cardViewTemplate>
--
GitLab
From 56f9264cd3f4ba7e858955aebd1bb833d4722d41 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 2 Apr 2019 13:59:16 +0200
Subject: [PATCH 168/250] implemented a function to filter manually in a jdito
entity
---
.../recordcontainers/jdito/contentProcess.js | 12 +-
process/JditoFilter_lib/JditoFilter_lib.aod | 9 ++
process/JditoFilter_lib/process.js | 111 ++++++++++++++++++
3 files changed, 129 insertions(+), 3 deletions(-)
create mode 100644 process/JditoFilter_lib/JditoFilter_lib.aod
create mode 100644 process/JditoFilter_lib/process.js
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 917242b94f..de090b22a0 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -3,8 +3,7 @@ import("system.result");
import("system.tools");
import("Util_lib");
import("Contact_lib");
-
-var filter = vars.exists("$local.filter") && vars.get("$local.filter");
+import("JditoFilter_lib");
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -28,10 +27,17 @@ users = users.map(function (user)
user[tools.PARAMS][tools.EMAIL],
user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
- ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //not good
+ ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
user[tools.PARAMS][tools.FRAME_STOREDSEARCHES]
];
});
+
+var filter = vars.exists("$local.filter") && vars.get("$local.filter");
+
+//TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
+users = JditoFilterUtils.filterRecords(["UID", "", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", "", ], users, filter);
+
+
ArrayUtils.sort2d(users, 0, true, false); //sort by username
result.object(users);
\ No newline at end of file
diff --git a/process/JditoFilter_lib/JditoFilter_lib.aod b/process/JditoFilter_lib/JditoFilter_lib.aod
new file mode 100644
index 0000000000..fcd05c04ee
--- /dev/null
+++ b/process/JditoFilter_lib/JditoFilter_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process 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/process/1.2.0">
+ <name>JditoFilter_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/JditoFilter_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
new file mode 100644
index 0000000000..f0331604c5
--- /dev/null
+++ b/process/JditoFilter_lib/process.js
@@ -0,0 +1,111 @@
+
+/**
+ * object for filtering records
+ *
+ * @param {Array} pColumns the column names
+ * @param {String|Object} pFilter the filter object
+ */
+function JditoFilter (pColumns, pFilter)
+{
+ var columnMap = {};
+ pColumns.forEach(function (row, i)
+ {
+ columnMap[row] = i;
+ });
+ this._columnMap = columnMap;
+
+ if (pFilter.length) //check if pFilter is a string
+ pFilter = JSON.parse(pFilter);
+
+ this._operator = pFilter.operator;
+ this._filters = pFilter.childs;
+}
+
+/**
+ * tests the given row if it matches the filter
+ *
+ * @param {Array} pRow one record
+ *
+ * @return {boolean} true, if it matches the condition
+ */
+JditoFilter.prototype.checkRecord = function (pRow)
+{
+ if (this._filters.length == 0)
+ return true;
+
+ if (this._operator == "AND")
+ return this._filters.every(_testFn, this);
+
+ return this._filters.some(_testFn, this);
+
+ function _testFn (pFilter)
+ {
+ let value = pRow[this._columnMap[pFilter.name]];
+ return this._testValue(value, (pFilter.key || pFilter.value), pFilter.operator);
+ }
+}
+
+/**
+ * compares two values with the given operator
+ */
+JditoFilter.prototype._testValue = function (pRowValue, pFilterValue, pOperator)
+{
+ switch (pOperator)
+ {
+ case "CONTAINS":
+ return (new RegExp(pFilterValue)).test(pRowValue);
+ case "CONTAINSNOT":
+ return !(new RegExp(pFilterValue)).test(pRowValue);
+ case "STARTSWITH":
+ return (new RegExp("^" + pFilterValue)).test(pRowValue);
+ case "ENDSWITH":
+ return (new RegExp(pFilterValue + "$")).test(pRowValue);
+ case "EQUAL":
+ return (new RegExp("^" + pFilterValue + "$")).test(pRowValue);
+ case "NOT_EQUAL":
+ return !(new RegExp("^" + pFilterValue + "$")).test(pRowValue);
+ case "LESS":
+ return pRowValue < pFilterValue;
+ case "LESS_OR_EQUAL":
+ return pRowValue <= pFilterValue;
+ case "GREATER":
+ return pRowValue > pFilterValue;
+ case "GREATER_OR_EQUAL":
+ return pRowValue >= pFilterValue;
+ case "ISNULL":
+ return pRowValue == "";
+ case "ISNOTNULL":
+ return pRowValue != "";
+ }
+}
+
+/**
+ * Provides functions for using the filter with jdito recordcontainers
+ *
+ * Do not instanciate this!
+ *
+ * @class
+ */
+function JditoFilterUtils () {}
+
+/**
+ * Filters the given records
+ *
+ * @param {Array} pColumns one dimensional array with all column names, the order has to match the columns of pRecords
+ * @param {Array} pRecords two dimensional array with all records
+ * @param {String|Object} pFilter the value of $local.filter
+ *
+ * @return {Array} the filtered records
+ */
+JditoFilterUtils.filterRecords = function (pColumns, pRecords, pFilter)
+{
+ if (!pFilter)
+ return pRecords;
+
+ var filter = new JditoFilter(pColumns, pFilter);
+
+ return pRecords.filter(function (row)
+ {
+ return this.checkRecord(row);
+ }, filter);
+}
\ No newline at end of file
--
GitLab
From 687d2aa80e36e72d9c9bb885d29fb9a7adaeda40 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Wed, 3 Apr 2019 07:52:31 +0200
Subject: [PATCH 169/250] upgrade project to 5.1.10 (TreeTable rename)
---
.aditoprj/project.version | 4 ++--
.../_____SYSTEM_CALENDAR_RIBBON.aod | 5 +++--
entity/360Degree_entity/360Degree_entity.aod | 2 +-
entity/ActivityLink_entity/ActivityLink_entity.aod | 2 +-
entity/Activity_entity/Activity_entity.aod | 3 ++-
entity/AddressType_entity/AddressType_entity.aod | 2 +-
entity/Address_entity/Address_entity.aod | 2 +-
entity/AnyContact_entity/AnyContact_entity.aod | 2 +-
entity/AppointmentLink_entity/AppointmentLink_entity.aod | 3 ++-
entity/Appointment_entity/Appointment_entity.aod | 3 ++-
.../AttributeRelationTree_entity.aod | 2 +-
.../AttributeRelation_entity/AttributeRelation_entity.aod | 3 ++-
entity/AttributeUsage_entity/AttributeUsage_entity.aod | 3 ++-
entity/Attribute_entity/Attribute_entity.aod | 3 ++-
entity/Communication_entity/Communication_entity.aod | 2 +-
entity/Contact_entity/Contact_entity.aod | 2 +-
entity/Context_entity/Context_entity.aod | 2 +-
entity/Contract_entity/Contract_entity.aod | 2 +-
entity/Countries_Entity/Countries_Entity.aod | 2 +-
entity/Document_entity/Document_entity.aod | 3 ++-
entity/EmployeeRole_entity/EmployeeRole_entity.aod | 2 +-
entity/Employee_entity/Employee_entity.aod | 2 +-
entity/Gender_keyword/Gender_keyword.aod | 2 +-
.../KeywordAttributeRelation_entity.aod | 2 +-
entity/KeywordAttribute_entity/KeywordAttribute_entity.aod | 2 +-
entity/KeywordEntry_entity/KeywordEntry_entity.aod | 2 +-
entity/Language_entity/Language_entity.aod | 2 +-
entity/ModuleTree_entity/ModuleTree_entity.aod | 2 +-
.../ObjectRelationType_entity/ObjectRelationType_entity.aod | 2 +-
entity/ObjectRelation_entity/ObjectRelation_entity.aod | 2 +-
entity/ObjectTree_entity/ObjectTree_entity.aod | 2 +-
entity/Object_entity/Object_entity.aod | 2 +-
entity/Offer_entity/Offer_entity.aod | 3 ++-
entity/Offeritem_entity/Offeritem_entity.aod | 2 +-
entity/Options_Entity/Options_Entity.aod | 2 +-
entity/Order_entity/Order_entity.aod | 2 +-
entity/Orderitem_entity/Orderitem_entity.aod | 2 +-
entity/Organisation_entity/Organisation_entity.aod | 3 ++-
entity/Person_entity/Person_entity.aod | 3 ++-
entity/Prod2prod_entity/Prod2prod_entity.aod | 2 +-
entity/Product_entity/Product_entity.aod | 3 ++-
entity/Productprice_entity/Productprice_entity.aod | 2 +-
.../SalesprojectClassificationEntry_entity.aod | 2 +-
.../SalesprojectClassification_entity.aod | 2 +-
.../SalesprojectCompetition_entity.aod | 3 ++-
.../SalesprojectCycle_entity/SalesprojectCycle_entity.aod | 2 +-
.../SalesprojectForecast_entity.aod | 2 +-
.../SalesprojectMember_entity/SalesprojectMember_entity.aod | 3 ++-
.../SalesprojectSource_entity/SalesprojectSource_entity.aod | 2 +-
entity/Salesproject_entity/Salesproject_entity.aod | 3 ++-
.../SalutationDistinct_entity/SalutationDistinct_entity.aod | 2 +-
.../SalutationTitleDistinct_entity.aod | 2 +-
entity/Social_entity/Social_entity.aod | 2 +-
entity/Stock_entity/Stock_entity.aod | 2 +-
entity/StoredSelection_entity/StoredSelection_entity.aod | 2 +-
entity/TaskLink_entity/TaskLink_entity.aod | 2 +-
entity/Task_entity/Task_entity.aod | 2 +-
entity/Timetracking_entity/Timetracking_entity.aod | 2 +-
entity/Turnover_entity/Turnover_entity.aod | 2 +-
neonView/360DegreeFilter_view/360DegreeFilter_view.aod | 6 +++---
neonView/ActivityDetail_view/ActivityDetail_view.aod | 2 +-
neonView/ActivityEdit_view/ActivityEdit_view.aod | 2 +-
neonView/ActivityFilter_view/ActivityFilter_view.aod | 6 +++---
.../ActivityLinkFilter_view/ActivityLinkFilter_view.aod | 2 +-
.../ActivityLinkMultiEdit_view.aod | 2 +-
.../ActivityLinkPreviewList_view.aod | 2 +-
.../ActivityLinkPreview_view/ActivityLinkPreview_view.aod | 2 +-
neonView/ActivityMain_view/ActivityMain_view.aod | 2 +-
neonView/ActivityPreview_view/ActivityPreview_view.aod | 2 +-
neonView/ActivityTimeline_view/ActivityTimeline_view.aod | 2 +-
neonView/AddressEdit_view/AddressEdit_view.aod | 2 +-
neonView/AddressFilter_view/AddressFilter_view.aod | 2 +-
neonView/AddressList_view/AddressList_view.aod | 2 +-
neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod | 2 +-
neonView/AnyContactLookup_view/AnyContactLookup_view.aod | 2 +-
.../AnyObjectRelationTree_view0.aod | 6 +++---
neonView/AppointmentEdit_view/AppointmentEdit_view.aod | 2 +-
.../AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod | 2 +-
.../AppointmentLinkFilter_view.aod | 2 +-
.../AppointmentPreview_view/AppointmentPreview_view.aod | 2 +-
neonView/AttributeEdit_view/AttributeEdit_view.aod | 2 +-
neonView/AttributeFilter_view/AttributeFilter_view.aod | 6 +++---
neonView/AttributeMain_view/AttributeMain_view.aod | 2 +-
neonView/AttributePreview_view/AttributePreview_view.aod | 2 +-
.../AttributeRelationEdit_view.aod | 2 +-
.../AttributeRelationFilter_view.aod | 2 +-
.../AttributeRelationPreviewList.aod | 2 +-
.../AttributeRelationTree_view.aod | 6 +++---
neonView/AttributeTree_view/AttributeTree_view.aod | 6 +++---
.../AttributeUsageFilter_view/AttributeUsageFilter_view.aod | 2 +-
.../AttributeUsageMultiEdit_view.aod | 2 +-
neonView/CommunicationEdit_view/CommunicationEdit_view.aod | 2 +-
.../CommunicationFilter_view/CommunicationFilter_view.aod | 2 +-
neonView/CommunicationList_view/CommunicationList_view.aod | 2 +-
.../CommunicationMultiEdit_view.aod | 2 +-
neonView/ContactEdit_view/ContactEdit_view.aod | 2 +-
neonView/ContactList_view/ContactList_view.aod | 2 +-
neonView/ContractEdit_view/ContractEdit_view.aod | 2 +-
neonView/ContractFilter_view/ContractFilter_view.aod | 2 +-
neonView/ContractMain_view/ContractMain_view.aod | 2 +-
neonView/ContractPreview_view/ContractPreview_view.aod | 2 +-
neonView/CountriesPreview_view/CountriesPreview_view.aod | 2 +-
neonView/CountriesTable_view/CountriesTable_view.aod | 2 +-
neonView/DefaultLookup_view/DefaultLookup_view.aod | 2 +-
neonView/DocumentEdit_view/DocumentEdit_view.aod | 2 +-
neonView/DocumentFilter_view/DocumentFilter_view.aod | 2 +-
neonView/DocumentList_view/DocumentList_view.aod | 2 +-
neonView/DocumentPreview_view/DocumentPreview_view.aod | 2 +-
neonView/EmployeeEdit_view/EmployeeEdit_view.aod | 2 +-
neonView/EmployeeFilter_view/EmployeeFilter_view.aod | 2 +-
neonView/EmployeeLookup_view/EmployeeLookup_view.aod | 2 +-
neonView/EmployeeMain_view/EmployeeMain_view.aod | 2 +-
neonView/EmployeePassword_view/EmployeePassword_view.aod | 2 +-
neonView/EmployeePreview_view/EmployeePreview_view.aod | 2 +-
neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod | 2 +-
.../EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod | 2 +-
neonView/FacebookTimeline_view/FacebookTimeline_view.aod | 2 +-
.../KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod | 2 +-
.../KeywordAttributeFilter_view.aod | 2 +-
.../KeywordAttributeRelationRows_view.aod | 2 +-
.../KeywordAttriubteRelationTitled_view.aod | 2 +-
neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod | 2 +-
.../KeywordEntryFilter_view/KeywordEntryFilter_view.aod | 6 +++---
.../KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod | 2 +-
neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod | 2 +-
.../KeywordEntryPreview_view/KeywordEntryPreview_view.aod | 2 +-
neonView/ModuleTree_view/ModuleTree_view.aod | 6 +++---
.../ObjectRelationEdit_view/ObjectRelationEdit_view.aod | 2 +-
.../ObjectRelationFilter_view/ObjectRelationFilter_view.aod | 2 +-
.../ObjectRelationPreview_view.aod | 2 +-
neonView/ObjectTree_view/ObjectTree_view.aod | 6 +++---
neonView/OfferDetail_view/OfferDetail_view.aod | 2 +-
neonView/OfferEdit_view/OfferEdit_view.aod | 2 +-
neonView/OfferFilter_view/OfferFilter_view.aod | 2 +-
neonView/OfferMain_view/OfferMain_view.aod | 2 +-
neonView/OfferPreview_view/OfferPreview_view.aod | 2 +-
neonView/OfferitemEdit_view/OfferitemEdit_view.aod | 2 +-
neonView/OfferitemFilter_view/OfferitemFilter_view.aod | 2 +-
.../OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod | 2 +-
neonView/OfferitemPreview_view/OfferitemPreview_view.aod | 2 +-
neonView/Options1_View/Options1_View.aod | 2 +-
neonView/Options2_View/Options2_View.aod | 2 +-
neonView/Options_View/Options_View.aod | 2 +-
neonView/OrderDetail_view/OrderDetail_view.aod | 2 +-
neonView/OrderEdit_view/OrderEdit_view.aod | 2 +-
neonView/OrderFilter_view/OrderFilter_view.aod | 2 +-
neonView/OrderMain_view/OrderMain_view.aod | 2 +-
neonView/OrderPreview_view/OrderPreview_view.aod | 2 +-
neonView/OrderitemFilter_view/OrderitemFilter_view.aod | 2 +-
.../OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod | 2 +-
neonView/OrderitemPreview_view/OrderitemPreview_view.aod | 2 +-
.../OrganisationEditDefaults_view.aod | 2 +-
neonView/OrganisationEdit_view/OrganisationEdit_view.aod | 2 +-
.../OrganisationFilter_view/OrganisationFilter_view.aod | 2 +-
.../OrganisationLookup_view/OrganisationLookup_view.aod | 2 +-
neonView/OrganisationMain_view/OrganisationMain_view.aod | 2 +-
.../OrganisationPreview_view/OrganisationPreview_view.aod | 2 +-
neonView/PersonDetail_view/PersonDetail_view.aod | 2 +-
.../PersonEditDefaults_view/PersonEditDefaults_view.aod | 2 +-
neonView/PersonEdit_view/PersonEdit_view.aod | 2 +-
neonView/PersonFilter_view/PersonFilter_view.aod | 2 +-
neonView/PersonLookup_view/PersonLookup_view.aod | 2 +-
neonView/PersonMain_view/PersonMain_view.aod | 2 +-
neonView/PersonPreview_view/PersonPreview_view.aod | 2 +-
neonView/PersonSimpleList_view/PersonSimpleList_view.aod | 2 +-
neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod | 2 +-
neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod | 6 +++---
.../ProductDescription_view/ProductDescription_view.aod | 2 +-
neonView/ProductEdit_view/ProductEdit_view.aod | 2 +-
neonView/ProductFilter_view/ProductFilter_view.aod | 2 +-
neonView/ProductMain_view/ProductMain_view.aod | 2 +-
neonView/ProductPreview_view/ProductPreview_view.aod | 2 +-
neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod | 2 +-
.../ProductpriceFilter_view/ProductpriceFilter_view.aod | 2 +-
.../ProductpriceRelation_view/ProductpriceRelation_view.aod | 2 +-
.../SalesprojectClassificationEntryEdit_view.aod | 2 +-
.../SalesprojectClassificationEntryPreview_view.aod | 2 +-
.../SalesprojectClassificationFilter_view.aod | 2 +-
.../SalesprojectClassificationPreview_view.aod | 2 +-
.../SalesprojectCompetitionEdit_view.aod | 2 +-
.../SalesprojectCompetitionFilter_view.aod | 2 +-
.../SalesprojectCompetitionPreview_view.aod | 2 +-
.../SalesprojectCycleEdit_view.aod | 2 +-
.../SalesprojectCycleFilter_view.aod | 2 +-
.../SalesprojectCyclePreview_view.aod | 2 +-
neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod | 2 +-
neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod | 2 +-
.../SalesprojectFilter_view/SalesprojectFilter_view.aod | 2 +-
.../SalesprojectForecastEdit_view.aod | 2 +-
.../SalesprojectForecastFilter_view.aod | 2 +-
.../SalesprojectForecastPreview_view.aod | 2 +-
neonView/SalesprojectMain_view/SalesprojectMain_view.aod | 2 +-
.../SalesprojectMemberEdit_view.aod | 2 +-
.../SalesprojectMemberFilter_view.aod | 2 +-
.../SalesprojectMemberPreview_view.aod | 2 +-
.../SalesprojectPreview_view/SalesprojectPreview_view.aod | 2 +-
.../SalesprojectSourceEdit_view.aod | 2 +-
.../SalesprojectSourceFilter_view.aod | 2 +-
.../SalesprojectSourcePreview_view.aod | 2 +-
neonView/StockCount_view/StockCount_view.aod | 2 +-
neonView/StockEdit_view/StockEdit_view.aod | 2 +-
neonView/StockFilter_view/StockFilter_view.aod | 2 +-
.../StoredSelectionFilter_view.aod | 2 +-
neonView/TaskEdit_view/TaskEdit_view.aod | 2 +-
neonView/TaskFilter_view/TaskFilter_view.aod | 6 +++---
neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod | 2 +-
neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod | 2 +-
.../TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod | 2 +-
neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod | 2 +-
neonView/TaskMainPreview_view/TaskMainPreview_view.aod | 2 +-
neonView/TaskMain_view/TaskMain_view.aod | 2 +-
neonView/TaskPreview_view/TaskPreview_view.aod | 2 +-
neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod | 2 +-
.../TimetrackingFilter_view/TimetrackingFilter_view.aod | 2 +-
.../TimetrackingPreview_view/TimetrackingPreview_view.aod | 2 +-
neonView/TurnoverChart_view/TurnoverChart_view.aod | 2 +-
neonView/TwitterTimeline_view/TwitterTimeline_view.aod | 2 +-
process/Appointment_lib/Appointment_lib.aod | 5 +++--
218 files changed, 259 insertions(+), 243 deletions(-)
diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index e2ebfe82e0..8174646658 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Mon Mar 18 10:57:45 CET 2019
-version=5.1.9
+#Wed Apr 03 07:50:41 CEST 2019
+version=5.1.10
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
index b8dc2fcdd6..42fef1c412 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
<application 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/application/1.2.0">
- <name>_____SYSTEM_CALENDAR_RIBBON</name>
+<?xml version="1.0" encoding="UTF-8"?>
+<application 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/application/1.2.0">
+ <name>_____SYSTEM_CALENDAR_RIBBON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200" />
<calendarRibbon>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 9a4120b092..66b17d986f 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>360Degree_entity</name>
<title>360 Degree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index ed4fc232f6..312eb10803 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>ActivityLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index e955aa2c78..8d1f8c7048 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Activity_entity</name>
<title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -146,6 +146,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityConsumer>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 48ca8e67b9..909902406d 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/AddressType_entity/titleProcess.js</titleProcess>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index f3dd9484a1..334ba18c64 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Address_entity</name>
<title>Addresses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index ef3c7122fe..72bf6904f8 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>AnyContact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 3aa241d80f..ca77a525de 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>AppointmentLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
@@ -25,6 +25,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index e3b7b3400b..4fa14d9e2b 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Appointment_entity</name>
<title>Termin</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -15,6 +15,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
index 3122954ecf..8728871cf3 100644
--- a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
+++ b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>AttributeRelationTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 118e70579d..e6588fbe36 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>AttributeRelation_entity</name>
<title>Attribute Relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -149,6 +149,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityConsumer>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index db802200ad..daac2b16c1 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>AttributeUsage_entity</name>
<title>Attribute Usage</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -18,6 +18,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index f244233174..4c48909625 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Attribute_entity</name>
<title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -45,6 +45,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityConsumer>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index b5de14e234..5bf31e7e5f 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Communication_entity</name>
<title>Communication</title>
<description>former Comm</description>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index ff5923ed14..6192516f60 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Contact_entity</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 5410da87b5..75c65e40e4 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Context_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 6d52f5e3c2..8136cd6d2d 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Contract_entity</name>
<title>Contract</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index d565b06e7c..52aefa689d 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Countries_Entity</name>
<title>Countries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 6a1829f663..4bb45b3cd4 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Document_entity</name>
<title>Document</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -57,6 +57,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityActionGroup>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 4fd240c55b..bc87a35555 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>EmployeeRole_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index ca823d2c54..968d2fb2ed 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Employee_entity</name>
<title>Employee</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index d6920a0084..8c9e2c0a1c 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/Gender_keyword/titleProcess.js</titleProcess>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 2930020424..73aa5c1d0b 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>KeywordAttributeRelation_entity</name>
<title>Keyword Attribute Values</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 0bd9afbf6e..43f05de696 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>KeywordAttribute_entity</name>
<title>Keyword Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 71b9ee7e29..51e1e38163 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>KeywordEntry_entity</name>
<title>Keyword</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index b63b9b4eee..42d80eae16 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Language_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/Language_entity/titleProcess.js</titleProcess>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 775888a81b..742063a7fd 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>ModuleTree_entity</name>
<title>Tree Entity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 003dba3b10..27f8339b5b 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>ObjectRelationType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/ObjectRelationType_entity/titleProcess.js</titleProcess>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index a654723375..f495721eb1 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>ObjectRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectRelation_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 4f1f27a339..76ab8c7b04 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>ObjectTree_entity</name>
<title>Object tree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 14afaa53ef..62d80564fa 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 296a9c2bd3..c1bf480be6 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Offer_entity</name>
<title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -69,6 +69,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 112db2654d..e172cf4ff4 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Offeritem_entity</name>
<title>Offeritem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index 3c3dbc6ec5..ab90e343e3 100644
--- a/entity/Options_Entity/Options_Entity.aod
+++ b/entity/Options_Entity/Options_Entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Options_Entity</name>
<title>Options</title>
<description></description>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index bb720b0c99..30b9585984 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Order_entity</name>
<title>Receipt</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index b8979d94e9..ae50324c83 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Orderitem_entity</name>
<title>Orderitem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 7a62ddafbb..8130dfa766 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Organisation_entity</name>
<title>Company</title>
<description>former Org</description>
@@ -326,6 +326,7 @@
<element>MASK</element>
<element>PROCESS</element>
<element>RECORD</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 761e058e94..9317d1cf6f 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Person_entity</name>
<title>Contact</title>
<description>former Pers</description>
@@ -31,6 +31,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 78d288fbd0..63123b47f0 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Prod2prod_entity</name>
<title>Parts list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 36400cf037..4ed30005ec 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Product_entity</name>
<title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -207,6 +207,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 4d059131a9..6d4fd26abd 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Productprice_entity</name>
<title>Prices</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
index f86cbbad6c..acb01ba63f 100644
--- a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
+++ b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectClassificationEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
index 51c8c393cf..f591683256 100644
--- a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
+++ b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectClassification_entity</name>
<title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index e4a89fde11..f479afb820 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectCompetition_entity</name>
<title>Competition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -80,6 +80,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
index 42e0185aec..fbf0ff3b28 100644
--- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
+++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectCycle_entity</name>
<title>Milestones</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index f58b697cca..945e940b05 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectForecast_entity</name>
<title>${FORECAST_ENGLISH}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index bda7d26d8f..2208a38eba 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectMember_entity</name>
<title>${SALESPROJECT_MEMBER}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -123,6 +123,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 7f5a87461d..5e469e8eb8 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectSource_entity</name>
<title>Touchpoint</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 7807364170..556054ab8e 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Salesproject_entity</name>
<title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -468,6 +468,7 @@
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityProvider>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index c24272e3d0..c302c499c3 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalutationDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/SalutationDistinct_entity/titleProcess.js</titleProcess>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 3a36b6eeb4..2064191216 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalutationTitleDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/titleProcess.js</titleProcess>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index c311251423..6d01283d64 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Social_entity</name>
<title>Social Media</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index c53691f953..462aaaa970 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Stock_entity</name>
<title>Stock</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/StoredSelection_entity/StoredSelection_entity.aod b/entity/StoredSelection_entity/StoredSelection_entity.aod
index 97ed60b10e..e782b82bd5 100644
--- a/entity/StoredSelection_entity/StoredSelection_entity.aod
+++ b/entity/StoredSelection_entity/StoredSelection_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>StoredSelection_entity</name>
<title>Stored selections</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 3809c91d58..36d64e1be3 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>TaskLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 213666a309..5a6394af6a 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Task_entity</name>
<title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index ec6bf91c59..621e193b43 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Timetracking_entity</name>
<title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 0197b2a6a5..8f155f79de 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>Turnover_entity</name>
<title>Turnover</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index 49cd28ef68..ed1ab18e2e 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>360DegreeFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
@@ -9,7 +9,7 @@
</groupLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>Treetable</name>
<favoriteActionGroup2>newModule</favoriteActionGroup2>
<titleField>TITLE</titleField>
@@ -19,7 +19,7 @@
<element>CONTEXT_NAME</element>
</defaultGroupFields>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
<timelineViewTemplate>
<name>Timeline</name>
<dateField>DATE</dateField>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 9e831646ef..2c3545b72c 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityDetail_view</name>
<title>Description</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index f72778d3de..5c306e04cb 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityEdit_view</name>
<title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 655915a687..e9f268d010 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
@@ -90,12 +90,12 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>ActivitiesTreetable</name>
<titleField>SUBJECT</titleField>
<descriptionField>INFO</descriptionField>
<iconField>#IMAGE</iconField>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
index b5af8f8f46..a4f49f54de 100644
--- a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
+++ b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityLinkFilter_view</name>
<title>Connections</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
index 4a89c48252..8ccfba24c2 100644
--- a/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
+++ b/neonView/ActivityLinkMultiEdit_view/ActivityLinkMultiEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityLinkMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod b/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
index 283d81b544..b16aae9503 100644
--- a/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
+++ b/neonView/ActivityLinkPreviewList_view/ActivityLinkPreviewList_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityLinkPreviewList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
index cc3071f1e7..891ec75b0f 100644
--- a/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
+++ b/neonView/ActivityLinkPreview_view/ActivityLinkPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityLinkPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index af453fbc92..5b4191c6e9 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 6604909f9e..e142cb9bf3 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
index 7f767fe7d2..9056b55d31 100644
--- a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
+++ b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ActivityTimeline_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AddressEdit_view/AddressEdit_view.aod b/neonView/AddressEdit_view/AddressEdit_view.aod
index 2114d1eb55..55e151a9eb 100644
--- a/neonView/AddressEdit_view/AddressEdit_view.aod
+++ b/neonView/AddressEdit_view/AddressEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AddressEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressFilter_view/AddressFilter_view.aod
index 2f07b18741..4f6d79febe 100644
--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ b/neonView/AddressFilter_view/AddressFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AddressFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index f022863515..4c155db5b2 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AddressList_view</name>
<description>Org addresses</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index c1be3d32a8..3f827b5696 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AdressMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
index 93cd56ffd1..2854715d2d 100644
--- a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
+++ b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AnyContactLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
index b4dfc33c7a..7b76743657 100644
--- a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
+++ b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AnyObjectRelationTree_view0</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
@@ -8,12 +8,12 @@
</boxLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>AnyObjectRelations</name>
<parentField>AnyObjectType</parentField>
<titleField>AnyObjectRowid</titleField>
<entityField>#ENTITY</entityField>
<title></title>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index e791617683..d5b9b97ef4 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AppointmentEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonView/AppointmentEdit_view/documentation.adoc</documentation>
diff --git a/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod b/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
index 67f76f8509..026d72f2c8 100644
--- a/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
+++ b/neonView/AppointmentLinkEdit_view/AppointmentLinkEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AppointmentLinkEdit_view</name>
<title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 617858db80..9e8660757e 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AppointmentLinkFilter_view</name>
<title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index f35b4d1937..53f8e32a4d 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AppointmentPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index 064c276ce1..b26276f75c 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index 823ebd3b35..0b65a9ac7b 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeFilter_view</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -10,14 +10,14 @@
</groupLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>AttributesTreetable</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
<titleField>NAME_WITH_TYPE</titleField>
<descriptionField>USAGELIST</descriptionField>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
<tableViewTemplate>
<name>AttributesTable</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/AttributeMain_view/AttributeMain_view.aod b/neonView/AttributeMain_view/AttributeMain_view.aod
index 8b879b2df3..eb7ee8159d 100644
--- a/neonView/AttributeMain_view/AttributeMain_view.aod
+++ b/neonView/AttributeMain_view/AttributeMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index c96aad0cda..1a5041da04 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributePreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
index a77940f8ad..a4b17b338e 100644
--- a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
+++ b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeRelationEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index 3a0762d98f..c1ce0f2055 100644
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeRelationFilter_view</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index be811dd2e4..70932bf359 100644
--- a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeRelationPreviewList</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index cdb9d96720..47d34ce205 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeRelationTree_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
@@ -8,11 +8,11 @@
</boxLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>AttributeRelationTree</name>
<parentField>PARENT_ID</parentField>
<titleField>TITLE</titleField>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/AttributeTree_view/AttributeTree_view.aod b/neonView/AttributeTree_view/AttributeTree_view.aod
index d7b3557694..ecc1b210da 100644
--- a/neonView/AttributeTree_view/AttributeTree_view.aod
+++ b/neonView/AttributeTree_view/AttributeTree_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeTree_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
@@ -8,12 +8,12 @@
</boxLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>Attributes</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<titleField>ATTRIBUTE_NAME</titleField>
<descriptionField>ATTRIBUTE_TYPE</descriptionField>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
index 7c14633a23..87500bc6ff 100644
--- a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
+++ b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeUsageFilter_view</name>
<description>View for listing all contexts where a attribute can be used in the attribute entity</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
index b30d15e4d4..0ecf44f96e 100644
--- a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
+++ b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>AttributeUsageMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/CommunicationEdit_view/CommunicationEdit_view.aod b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
index 11a21d8caf..9ecbfcdcf7 100644
--- a/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
+++ b/neonView/CommunicationEdit_view/CommunicationEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>CommunicationEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/CommunicationFilter_view/CommunicationFilter_view.aod b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
index 4ce77fc863..ffad63e17e 100644
--- a/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
+++ b/neonView/CommunicationFilter_view/CommunicationFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>CommunicationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/CommunicationList_view/CommunicationList_view.aod b/neonView/CommunicationList_view/CommunicationList_view.aod
index 191cccf8c6..cc011575bf 100644
--- a/neonView/CommunicationList_view/CommunicationList_view.aod
+++ b/neonView/CommunicationList_view/CommunicationList_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>CommunicationList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
index 3eb5eb88e2..723b26dfe6 100644
--- a/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
+++ b/neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>CommunicationMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ContactEdit_view/ContactEdit_view.aod b/neonView/ContactEdit_view/ContactEdit_view.aod
index 7e82ca816b..03a2f0de84 100644
--- a/neonView/ContactEdit_view/ContactEdit_view.aod
+++ b/neonView/ContactEdit_view/ContactEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContactEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ContactList_view/ContactList_view.aod b/neonView/ContactList_view/ContactList_view.aod
index f950d771e5..b99e10274e 100644
--- a/neonView/ContactList_view/ContactList_view.aod
+++ b/neonView/ContactList_view/ContactList_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContactList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ContractEdit_view/ContractEdit_view.aod b/neonView/ContractEdit_view/ContractEdit_view.aod
index 1391bdb496..ec6443f7b5 100644
--- a/neonView/ContractEdit_view/ContractEdit_view.aod
+++ b/neonView/ContractEdit_view/ContractEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index 55dc1f1f2b..4933b78162 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/ContractMain_view/ContractMain_view.aod b/neonView/ContractMain_view/ContractMain_view.aod
index a40e7c73b8..83ff714a33 100644
--- a/neonView/ContractMain_view/ContractMain_view.aod
+++ b/neonView/ContractMain_view/ContractMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index 57f1e90dba..ff1f59a0aa 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/CountriesPreview_view/CountriesPreview_view.aod b/neonView/CountriesPreview_view/CountriesPreview_view.aod
index 4945f24089..90df6f69c3 100644
--- a/neonView/CountriesPreview_view/CountriesPreview_view.aod
+++ b/neonView/CountriesPreview_view/CountriesPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>CountriesPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/CountriesTable_view/CountriesTable_view.aod b/neonView/CountriesTable_view/CountriesTable_view.aod
index 808613bd27..feecd97ed9 100644
--- a/neonView/CountriesTable_view/CountriesTable_view.aod
+++ b/neonView/CountriesTable_view/CountriesTable_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>CountriesTable_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/DefaultLookup_view/DefaultLookup_view.aod b/neonView/DefaultLookup_view/DefaultLookup_view.aod
index b3da0c6bf1..ff5f7c4ad6 100644
--- a/neonView/DefaultLookup_view/DefaultLookup_view.aod
+++ b/neonView/DefaultLookup_view/DefaultLookup_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DefaultLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/DocumentEdit_view/DocumentEdit_view.aod b/neonView/DocumentEdit_view/DocumentEdit_view.aod
index 283a647750..94c8f4329b 100644
--- a/neonView/DocumentEdit_view/DocumentEdit_view.aod
+++ b/neonView/DocumentEdit_view/DocumentEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DocumentEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index ff3fd20bc7..4806bb86be 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DocumentFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="false" />
diff --git a/neonView/DocumentList_view/DocumentList_view.aod b/neonView/DocumentList_view/DocumentList_view.aod
index 1242651dc1..d82e31df54 100644
--- a/neonView/DocumentList_view/DocumentList_view.aod
+++ b/neonView/DocumentList_view/DocumentList_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DocumentList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/DocumentPreview_view/DocumentPreview_view.aod b/neonView/DocumentPreview_view/DocumentPreview_view.aod
index b5c1513318..eaf0fc619b 100644
--- a/neonView/DocumentPreview_view/DocumentPreview_view.aod
+++ b/neonView/DocumentPreview_view/DocumentPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DocumentPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index c355722233..5dfcad7f88 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeeEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index aac34a16e2..f25bea5ddd 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeeFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/EmployeeLookup_view/EmployeeLookup_view.aod b/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
index df29cc7825..5a7bd7234f 100644
--- a/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
+++ b/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeeLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index 90103f5684..da3c34385d 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeeMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/EmployeePassword_view/EmployeePassword_view.aod b/neonView/EmployeePassword_view/EmployeePassword_view.aod
index 0731140bd0..7a3c199fcc 100644
--- a/neonView/EmployeePassword_view/EmployeePassword_view.aod
+++ b/neonView/EmployeePassword_view/EmployeePassword_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeePassword_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index 41c53f7a3b..57ce49321e 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeePreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
index adf9bda6f4..f91bb0b4e7 100644
--- a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeeRoleEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
index 92602b2146..9fc81ddf21 100644
--- a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
+++ b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>EmployeeRoleFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
index ee40a09655..1cfd71aba5 100644
--- a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
+++ b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>FacebookTimeline_view</name>
<title>Facebook</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod b/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
index 9eaf8ae599..6c8ad7446a 100644
--- a/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
+++ b/neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordAttributeEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
index f4eb93c10b..8322746e52 100644
--- a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
+++ b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordAttributeFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod b/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
index 79ac7a83b6..a7c6d12369 100644
--- a/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
+++ b/neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordAttributeRelationRows_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="false" />
diff --git a/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod b/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
index 396943e647..a4468d9f60 100644
--- a/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
+++ b/neonView/KeywordAttriubteRelationTitled_view/KeywordAttriubteRelationTitled_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordAttriubteRelationTitled_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
index c30f17a429..31283c6fff 100644
--- a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
+++ b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordEntryEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index c3d91906c2..80ba451c5e 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordEntryFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
@@ -9,7 +9,7 @@
</groupLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>EntriesTreetable</name>
<titleField>TITLE</titleField>
<descriptionField>KEYID</descriptionField>
@@ -17,7 +17,7 @@
<element>CONTAINER</element>
</defaultGroupFields>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
<tableViewTemplate>
<name>EntriesTable</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod b/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
index 853a9789c4..66dfddc51e 100644
--- a/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
+++ b/neonView/KeywordEntryMainSide_view/KeywordEntryMainSide_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordEntryMainSide_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod b/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
index 0eeea0860f..53dc6badf1 100644
--- a/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
+++ b/neonView/KeywordEntryMain_view/KeywordEntryMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordEntryMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
index 9956bc5eab..f8a6856aa3 100644
--- a/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
+++ b/neonView/KeywordEntryPreview_view/KeywordEntryPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>KeywordEntryPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ModuleTree_view/ModuleTree_view.aod b/neonView/ModuleTree_view/ModuleTree_view.aod
index eddfeddf9f..f57a3fe1d5 100644
--- a/neonView/ModuleTree_view/ModuleTree_view.aod
+++ b/neonView/ModuleTree_view/ModuleTree_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ModuleTree_view</name>
<title>Tree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -9,7 +9,7 @@
</boxLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>Modules</name>
<parentField>PARENT_ID</parentField>
<favoriteActionGroup3></favoriteActionGroup3>
@@ -18,6 +18,6 @@
<iconField>ICON</iconField>
<entityField>#ENTITY</entityField>
<title></title>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
index 889d80e42f..83e9082f7f 100644
--- a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
+++ b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ObjectRelationEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod b/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
index 52dacd7c7e..d0895c5772 100644
--- a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
+++ b/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ObjectRelationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod b/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
index ecf90e9d8b..6e54963483 100644
--- a/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
+++ b/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ObjectRelationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTree_view/ObjectTree_view.aod
index 3d68dc239b..d2be4d640d 100644
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTree_view/ObjectTree_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ObjectTree_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
@@ -8,13 +8,13 @@
</boxLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>ObjectRelations</name>
<parentField>PARENT_ID</parentField>
<titleField>TITLE</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>ICON</iconField>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/OfferDetail_view/OfferDetail_view.aod b/neonView/OfferDetail_view/OfferDetail_view.aod
index b8cb3ee246..a465d174bc 100644
--- a/neonView/OfferDetail_view/OfferDetail_view.aod
+++ b/neonView/OfferDetail_view/OfferDetail_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferDetail_view</name>
<title>Details</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 8a8b8f8f2e..60e014f44a 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferEdit_view</name>
<title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index b64a227c3a..541ac072d5 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index f4fe27b4bb..fd194c1b37 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index b661fd7df0..5a36edbfc7 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
index ff753701e6..52a11dc88e 100644
--- a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
+++ b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 5ec130f3ba..faeaabafb0 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
index b5df861786..9db36fae73 100644
--- a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
+++ b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 88b19d3d09..6927e3f06d 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/Options1_View/Options1_View.aod b/neonView/Options1_View/Options1_View.aod
index 9e739a0e6b..492de6430c 100644
--- a/neonView/Options1_View/Options1_View.aod
+++ b/neonView/Options1_View/Options1_View.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>Options1_View</name>
<title>Group1</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/Options2_View/Options2_View.aod b/neonView/Options2_View/Options2_View.aod
index 415a4c6d44..369889ca34 100644
--- a/neonView/Options2_View/Options2_View.aod
+++ b/neonView/Options2_View/Options2_View.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>Options2_View</name>
<title>Group2</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/Options_View/Options_View.aod b/neonView/Options_View/Options_View.aod
index 59528150c7..6ca564e9c7 100644
--- a/neonView/Options_View/Options_View.aod
+++ b/neonView/Options_View/Options_View.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>Options_View</name>
<title>Options</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 8af0f327be..b64c146302 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderDetail_view</name>
<title>Details</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index a7ed938003..8ab4459538 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderEdit_view</name>
<title>Receipt</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 19fc9b6497..f631fc736b 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index b6ea5b07fe..77bbd6830b 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index bfe3309e12..62dcd724c0 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 46be535856..99689b6ae5 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderitemFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
index 4f44b37029..684f0e1de2 100644
--- a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
+++ b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderitemMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
index 6560d2c27f..71fd61ff89 100644
--- a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
+++ b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrderitemPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
index 571abba34b..67713dbe16 100644
--- a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
+++ b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrganisationEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 4a26e10585..274866d3cf 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrganisationEdit_view</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 392717f6df..a1a8f1e6e4 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrganisationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index bd0f94acdd..0264632ac4 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrganisationLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 2dd5871774..b8cddb7e65 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrganisationMain_view</name>
<title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 442152285b..220f2e9911 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OrganisationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/PersonDetail_view/PersonDetail_view.aod b/neonView/PersonDetail_view/PersonDetail_view.aod
index 24224b2cf7..c09b04ddf5 100644
--- a/neonView/PersonDetail_view/PersonDetail_view.aod
+++ b/neonView/PersonDetail_view/PersonDetail_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonDetail_view</name>
<title>Details</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod b/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
index a9cada7791..f5a9a421c5 100644
--- a/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
+++ b/neonView/PersonEditDefaults_view/PersonEditDefaults_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/PersonEdit_view/PersonEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
index 97dfc7bb74..7893018897 100644
--- a/neonView/PersonEdit_view/PersonEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonEdit_view</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index 60c9ea74bc..4f25712128 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/PersonLookup_view/PersonLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
index de61ca290f..bce42f9fab 100644
--- a/neonView/PersonLookup_view/PersonLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 6ab7d40c76..25df37d62a 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index a47b8e33df..6b4a7a3769 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 19c45ebe7c..570e2fae64 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>PersonSimpleList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
index 9b2cb02c7a..9b5a532217 100644
--- a/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
+++ b/neonView/Prod2ProdEdit_view/Prod2ProdEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>Prod2ProdEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
index eeaf321c7d..9faf4b3a3b 100644
--- a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
+++ b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>Prod2prodFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
@@ -9,13 +9,13 @@
</boxLayout>
</layout>
<children>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>Partlist</name>
<parentField>DEST_ID</parentField>
<favoriteActionGroup1>alter</favoriteActionGroup1>
<titleField>PRODUCTCODE</titleField>
<descriptionField>QUANTITY</descriptionField>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/ProductDescription_view/ProductDescription_view.aod b/neonView/ProductDescription_view/ProductDescription_view.aod
index 8fb4ca516c..27be19e6d9 100644
--- a/neonView/ProductDescription_view/ProductDescription_view.aod
+++ b/neonView/ProductDescription_view/ProductDescription_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductDescription_view</name>
<title>Description</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index f068db7c5d..687d513b1e 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index e30ca8feab..51e6a88b64 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 28de5da816..9f143d1e45 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 91ff9e7ad9..b66c4446cd 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
index 94dabe34fe..958b508810 100644
--- a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
+++ b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductpriceEdit_view</name>
<title>Price list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
index 5ce915618f..b225f31a95 100644
--- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductpriceFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
index 4d3cd87977..3f9f33250c 100644
--- a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
+++ b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ProductpriceRelation_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod b/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
index 02539c4a78..e014c26740 100644
--- a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
+++ b/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectClassificationEntryEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
index 4fbd720d66..cf4ddc5040 100644
--- a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
+++ b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectClassificationEntryPreview_view</name>
<title>asdf</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod b/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
index 09564bc6da..c12d4d020e 100644
--- a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
+++ b/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectClassificationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
index dc547b3644..b6773490cf 100644
--- a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
+++ b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectClassificationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
index 16ddeeaa24..d315479fd2 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectCompetitionEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
index b59f7d997a..72233eec4d 100644
--- a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
+++ b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectCompetitionFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 556305ff42..ae8dfc222c 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectCompetitionPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod b/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod
index 3fbde44933..de1a3461bb 100644
--- a/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod
+++ b/neonView/SalesprojectCycleEdit_view/SalesprojectCycleEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectCycleEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod b/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
index f9f282b6f5..55809e21f2 100644
--- a/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
+++ b/neonView/SalesprojectCycleFilter_view/SalesprojectCycleFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectCycleFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod b/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod
index ec7629916b..41114194e6 100644
--- a/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod
+++ b/neonView/SalesprojectCyclePreview_view/SalesprojectCyclePreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectCyclePreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod b/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod
index 1177b22ab4..edacdea2ad 100644
--- a/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod
+++ b/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectCycle_view</name>
<title>Milestones</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index d6354dbb09..5c2db6962a 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectEdit_view</name>
<title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 1ea48c8e82..04505e731b 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
index 3e13766ead..366face940 100644
--- a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
+++ b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectForecastEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod b/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
index d2b2443bf4..63f7e54df8 100644
--- a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
+++ b/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectForecastFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
index c8ddeb76d2..1afb1bf945 100644
--- a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
+++ b/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectForecastPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 7350642bde..4f42910795 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
index 6005e46c72..635fc5f1b4 100644
--- a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
+++ b/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectMemberEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
index c2fa76a135..fe1a90deac 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectMemberFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
index e97ce873ab..b940c76d5b 100644
--- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
+++ b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectMemberPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 152e012906..26ce3663b0 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod b/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
index 1fbd5e0dc5..5eb40994bb 100644
--- a/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
+++ b/neonView/SalesprojectSourceEdit_view/SalesprojectSourceEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectSourceEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index a5549a7bf9..919820dd8d 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectSourceFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
index 5b907e2c92..9191fc15cb 100644
--- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
+++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectSourcePreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/StockCount_view/StockCount_view.aod b/neonView/StockCount_view/StockCount_view.aod
index 8e8ede676a..f6884c6a6c 100644
--- a/neonView/StockCount_view/StockCount_view.aod
+++ b/neonView/StockCount_view/StockCount_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>StockCount_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/StockEdit_view/StockEdit_view.aod b/neonView/StockEdit_view/StockEdit_view.aod
index ea63dc4bbf..b50a5b7294 100644
--- a/neonView/StockEdit_view/StockEdit_view.aod
+++ b/neonView/StockEdit_view/StockEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>StockEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/StockFilter_view/StockFilter_view.aod b/neonView/StockFilter_view/StockFilter_view.aod
index b715a7f618..85433255ea 100644
--- a/neonView/StockFilter_view/StockFilter_view.aod
+++ b/neonView/StockFilter_view/StockFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>StockFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
diff --git a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
index 668cad9f84..f9352814ab 100644
--- a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
+++ b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>StoredSelectionFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index f43c9f7a1c..9325040e64 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 0e557d7bc8..0b8c264401 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
@@ -62,12 +62,12 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treetableViewTemplate>
+ <treeViewTemplate>
<name>TasksTreetable</name>
<titleField>SUBJECT</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>#ICON</iconField>
<entityField>#ENTITY</entityField>
- </treetableViewTemplate>
+ </treeViewTemplate>
</children>
</neonView>
diff --git a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
index d947ac5f4a..6388445f76 100644
--- a/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
+++ b/neonView/TaskLinkFilter_view/TaskLinkFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskLinkFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
index d6b9737c69..9fdda896ab 100644
--- a/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
+++ b/neonView/TaskLinkMultiEdit_view/TaskLinkMultiEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskLinkMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod b/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
index a009b2b1c3..7beb90a626 100644
--- a/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
+++ b/neonView/TaskLinkPreviewList_view/TaskLinkPreviewList_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskLinkPreviewList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
index 1ab3daed2f..6171351549 100644
--- a/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
+++ b/neonView/TaskLinkPreview_view/TaskLinkPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskLinkPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index 21a1ad13fa..2bf917aa3e 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskMainPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index d8231d9831..1c96243564 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 11ab7e15bd..16fa80da79 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TaskPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
index 7f4c05f9fc..aeaa8657f0 100644
--- a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
+++ b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TimetrackingEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index e923bf38ea..9ddf2b4669 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TimetrackingFilter_view</name>
<title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
index 5977d7ad08..140d82d9c7 100644
--- a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
+++ b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TimetrackingPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 093b1e4038..0b728d0c71 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TurnoverChart_view</name>
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
index b7fa1d026f..10d401110b 100644
--- a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
+++ b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
@@ -1,5 +1,5 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>TwitterTimeline_view</name>
<title>Twitter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/Appointment_lib/Appointment_lib.aod b/process/Appointment_lib/Appointment_lib.aod
index 8116d1ce92..20497c5ba1 100644
--- a/process/Appointment_lib/Appointment_lib.aod
+++ b/process/Appointment_lib/Appointment_lib.aod
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
<process 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/process/1.2.0">
- <name>Appointment_lib</name>
+<?xml version="1.0" encoding="UTF-8"?>
+<process 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/process/1.2.0">
+ <name>Appointment_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Appointment_lib/process.js</process>
<variants>
--
GitLab
From a1d1da6bd2e6b1d843f973fabbcf6e1d41a48e96 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 3 Apr 2019 10:34:12 +0200
Subject: [PATCH 170/250] Indexsearch: queries changed
---
.../Data_alias/indexsearchgroups/contract/query.js | 4 +++-
.../Data_alias/indexsearchgroups/offer/query.js | 6 ++++--
.../indexsearchgroups/organisation/query.js | 10 +++++++---
.../Data_alias/indexsearchgroups/person/query.js | 11 ++++++++---
.../Data_alias/indexsearchgroups/salesorder/query.js | 8 ++++++--
.../indexsearchgroups/salesproject/query.js | 5 +++--
.../AttributeUsage_entity/AttributeUsage_entity.aod | 6 ++++++
.../children/getallcontexts_param/valueProcess.js | 2 ++
entity/Attribute_entity/Attribute_entity.aod | 1 +
entity/Context_entity/Context_entity.aod | 5 +++++
.../recordcontainers/jdito/contentProcess.js | 4 +++-
process/JditoFilter_lib/process.js | 3 ++-
process/Sql_lib/process.js | 2 +-
13 files changed, 51 insertions(+), 16 deletions(-)
create mode 100644 entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js b/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
index d10d2a6fac..c80b55a38b 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.result");
import("system.vars");
import("system.calendars");
@@ -17,7 +18,8 @@ sqlHelper = new SqlMaskingUtils();
sqlQuery = "select CONTRACTID, "
+ sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ")
+ " as TITLECOLUMN, "
- + sqlHelper.concat(["ORGANISATION.NAME", "'| Contract Type: '", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) //TODO: translation in index?
+ + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")])
+ " as DESCCOLUMN, CONTRACTCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ " from CONTRACT "
+ " join CONTACT on CONTRACT.CONTACT_ID = CONTACTID "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
index 1244f85e0f..edc6c63a63 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
@@ -1,3 +1,5 @@
+import("system.SQLTYPES");
+import("system.translate");
import("system.result");
import("system.vars");
import("system.calendars");
@@ -15,9 +17,9 @@ if (vars.exists("$local.idvalue")) {
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select OFFERID, "
- + sqlHelper.concat(["cast(OFFERCODE as CHAR(10)) ", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ")
+ + sqlHelper.concat([sqlHelper.cast("OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ")
+ " as TITLECOLUMN, "
- + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
+ + sqlHelper.concat(["ORGANISATION.NAME"], " | ") // "'" + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 256)
+ " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ " from OFFER "
+ " join CONTACT on OFFER.CONTACT_ID = CONTACTID "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
index 0480b06a5f..791c356592 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
@@ -1,8 +1,10 @@
+import("system.translate");
import("system.result");
import("system.vars");
import("system.calendars");
import("system.db");
import("Sql_lib");
+import("Communication_lib");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
@@ -15,9 +17,11 @@ sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
- ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
- ], " - ") + " as DESCCOLUMN "
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
+ ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+ ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", CommUtil.getStandardSubSqlPhone("CONTACTID")])
+ ,sqlHelper.concat(["'" + translate.text("Email") + ":'", CommUtil.getStandardSubSqlMail("CONTACTID")])
+ ], " | ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from ORGANISATION "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
index 32e581b155..44981a5fe2 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
@@ -1,8 +1,11 @@
+import("system.translate");
import("system.result");
import("system.vars");
import("system.calendars");
import("system.db");
import("Sql_lib");
+import("Communication_lib");
+
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
@@ -14,9 +17,11 @@ sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
- ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
- ], " - ") + " as DESCCOLUMN "
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
+ ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+ ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", CommUtil.getStandardSubSqlPhone("CONTACTID")])
+ ,sqlHelper.concat(["'" + translate.text("Email") + ":'", CommUtil.getStandardSubSqlMail("CONTACTID")])
+ ], " | ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from PERSON "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
index 02db43bf56..b3953edcbd 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
@@ -1,8 +1,11 @@
+import("system.SQLTYPES");
import("system.result");
import("system.vars");
import("system.calendars");
import("system.db");
import("Sql_lib");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
queryCondition = "";
@@ -13,8 +16,9 @@ if (vars.exists("$local.idvalue")) {
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select SALESORDERID, "
- + " SALESORDERCODE as TITLECOLUMN, "
- + sqlHelper.concat(["ORGANISATION.NAME", "'| Kd-Nr.: '", "CUSTOMERCODE"])
+ + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ")
+ + " as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGANISATION.NAME"], " | ")
+ " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ " from SALESORDER "
+ " join CONTACT on SALESORDER.CONTACT_ID = CONTACTID "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
index e03985eafd..b5db958b18 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.result");
import("system.vars");
import("system.calendars");
@@ -16,8 +17,8 @@ if (vars.exists("$local.idvalue")) {
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select SALESPROJECTID, PROJECTTITLE as TITLECOLUMN, "
+ sqlHelper.concat([
- "'Status: '", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATE"),
- "'| Phase: '", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
+ "'" + translate.text("Status") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATE"),
+ "'| " + translate.text("Phase") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
])
+ " as DESCCOLUMN, PROJECTCODE "
+ " from SALESPROJECT "
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index daac2b16c1..1d04eaa1fa 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -70,6 +70,12 @@
<entityName>Context_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>GetAllContexts_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
</entityFields>
<recordContainers>
diff --git a/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js b/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js
new file mode 100644
index 0000000000..ed5935fc12
--- /dev/null
+++ b/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string(true);
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 4c48909625..7a53655d32 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -149,6 +149,7 @@
<entityField>
<name>ATTRIBUTE_LEVEL</name>
<title>Level</title>
+ <description>The level is required in the order-by to make sure that superordinate attributes come before their subordinates for the tree</description>
<contentType>NUMBER</contentType>
<state>INVISIBLE</state>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js</valueProcess>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 75c65e40e4..6b92f784aa 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -89,6 +89,11 @@
</entityParameter>
</children>
</entityProvider>
+ <entityParameter>
+ <name>GetAllContexts_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Context_entity/recordcontainers/jdito/contentProcess.js b/entity/Context_entity/recordcontainers/jdito/contentProcess.js
index 503f36da09..6ae2f8ad3c 100644
--- a/entity/Context_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Context_entity/recordcontainers/jdito/contentProcess.js
@@ -5,4 +5,6 @@ import("Context_lib");
var excludeContexts = vars.getString("$param.excludeContexts_param");
if (excludeContexts)
excludeContexts = JSON.parse(excludeContexts);
-result.object(ContextUtils.getContexts(true, excludeContexts));
+var filterContexts = !(vars.exists("$param.GetAllContexts_param") && vars.get("$param.GetAllContexts_param") == "true");
+
+result.object(ContextUtils.getContexts(filterContexts, excludeContexts));
\ No newline at end of file
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index f0331604c5..64d5ea5a31 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -80,7 +80,8 @@ JditoFilter.prototype._testValue = function (pRowValue, pFilterValue, pOperator)
}
/**
- * Provides functions for using the filter with jdito recordcontainers
+ * Provides functions for using the filter with jdito recordcontainers. You should only use this
+ * if there is no other, faster way to filter the records
*
* Do not instanciate this!
*
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 4a64fc6b37..0fe8c5e301 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -716,7 +716,7 @@ SqlMaskingUtils.prototype.castLob = function(field, targetLength) {
res = "DBMS_LOB.SUBSTR(" + field + ", " + targetLength + ", 1)";
break;
default:
- res = this.cast(field, "varchar", targetLength);
+ res = this.cast(field, SQLTYPES.VARCHAR, targetLength);
break;
}
return res;
--
GitLab
From c007cd47bd8aa1d65be54390498ce83986bac9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20H=C3=B6rmann?= <j.hoermann@adito.de>
Date: Wed, 3 Apr 2019 09:19:46 +0000
Subject: [PATCH 171/250] Object relation tree
---
aliasDefinition/Data_alias/Data_alias.aod | 144 +++--
.../AttributeRelationTree_entity.aod | 180 +++---
.../EmployeeRole_entity.aod | 112 ++--
.../recordcontainers/jdito/contentProcess.js | 20 +-
.../recordcontainers/jdito/onDelete.js | 36 +-
.../recordcontainers/jdito/onInsert.js | 44 +-
.../recordcontainers/jdito/onUpdate.js | 48 +-
entity/Employee_entity/Employee_entity.aod | 560 +++++++++---------
.../objectrowid_param/valueProcess.js | 6 +-
.../children/objecttype_param/valueProcess.js | 6 +-
.../objectrowid_param/valueProcess.js | 6 +-
.../children/objecttype_param/valueProcess.js | 6 +-
.../assignmentname_param/valueProcess.js | 4 +-
.../assignmentrowid_param/valueProcess.js | 6 +-
.../assignmenttable_param/valueProcess.js | 4 +-
.../children/usertitle_param/valueProcess.js | 6 +-
.../entityfields/firstname/valueProcess.js | 30 +-
.../entityfields/image/valueProcess.js | 30 +-
.../isactive/possibleItemsProcess.js | 12 +-
.../entityfields/isactive/valueProcess.js | 10 +-
.../entityfields/lastname/valueProcess.js | 30 +-
.../name_fieldgroup/valueProcess.js | 6 +-
.../setpassword/onActionProcess.js | 12 +-
.../base64string_param/valueProcess.js | 6 +-
entity/Employee_entity/onValidation.js | 10 +-
.../recordcontainers/jdito/contentProcess.js | 84 +--
.../recordcontainers/jdito/onDelete.js | 14 +-
.../recordcontainers/jdito/onInsert.js | 42 +-
.../recordcontainers/jdito/onUpdate.js | 76 +--
entity/Employee_entity/titleProcess.js | 6 +-
.../ObjectRelationType_entity.aod | 9 +
.../recordcontainers/jdito/contentProcess.js | 14 +-
.../ObjectTree_entity/ObjectTree_entity.aod | 59 +-
.../sourceobjecttype_param/valueProcess.js | 4 +
.../entityfields/selector/onValueChange.js | 3 +
.../recordcontainers/jdito/contentProcess.js | 245 +++++---
.../Organisation_entity.aod | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
entity/Person_entity/Person_entity.aod | 4 +
.../children/objecttype_param/valueProcess.js | 4 +
.../StoredSelection_entity.aod | 106 ++--
.../recordcontainers/jdito/contentProcess.js | 54 +-
neonContext/Employee/Employee.aod | 76 +--
neonContext/EmployeeRole/EmployeeRole.aod | 32 +-
.../StoredSelection/StoredSelection.aod | 24 +-
.../EmployeeEdit_view/EmployeeEdit_view.aod | 120 ++--
.../EmployeeFilter_view.aod | 78 +--
.../EmployeeMain_view/EmployeeMain_view.aod | 86 +--
.../EmployeePassword_view.aod | 54 +-
.../EmployeePreview_view.aod | 92 +--
.../EmployeeRoleFilter_view.aod | 46 +-
neonView/ObjectTree_view/ObjectTree_view.aod | 1 +
.../StoredSelectionFilter_view.aod | 52 +-
.../basic/2019.2/add_ObjectRelation_type.xml | 20 +
.../ObjectRelation_lib/ObjectRelation_lib.aod | 9 +
process/ObjectRelation_lib/process.js | 77 +++
56 files changed, 1553 insertions(+), 1280 deletions(-)
create mode 100644 entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/selector/onValueChange.js
create mode 100644 entity/Organisation_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js
create mode 100644 process/ObjectRelation_lib/ObjectRelation_lib.aod
create mode 100644 process/ObjectRelation_lib/process.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 43dd6f35da..4c3d0ca72f 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -108,9 +108,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -122,9 +122,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -253,7 +253,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -317,9 +317,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -345,9 +345,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -516,9 +516,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -544,9 +544,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -739,7 +739,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
<dependencies>
@@ -767,9 +767,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -795,9 +795,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -860,7 +860,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -873,7 +873,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
<dependencies>
@@ -1297,9 +1297,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1325,9 +1325,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -2138,9 +2138,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2166,9 +2166,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -3467,9 +3467,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3495,9 +3495,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -4047,7 +4047,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -4117,7 +4117,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -4706,9 +4706,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4734,9 +4734,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -4814,7 +4814,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -4837,9 +4837,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4851,9 +4851,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -4931,7 +4931,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -5137,7 +5137,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -5254,7 +5254,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -5419,7 +5419,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -5514,6 +5514,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>HIERARCHY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
index 8728871cf3..bb483a46ac 100644
--- a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
+++ b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
@@ -1,90 +1,90 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>AttributeRelationTree_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>PARENT_ID</name>
- </entityField>
- <entityField>
- <name>TITLE</name>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>TreeProvider</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
- <entityName>Person_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
- <entityName>Product_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
- <entityName>Activity_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
- <entityName>Contract_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
- <entityName>Employee_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT_ID.value</element>
- <element>TITLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>AttributeRelationTree_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>PARENT_ID</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>TreeProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>PARENT_ID.value</element>
+ <element>TITLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index bc87a35555..db73c36b4c 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,56 +1,56 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>EmployeeRole_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>EmployeeRoles</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
- <entityName>Employee_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>ROLE</name>
- <title>Role</title>
- <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ROLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>EmployeeRole_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>EmployeeRoles</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>ROLE</name>
+ <title>Role</title>
+ <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>ROLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
index 5e4ff916b0..d39a3cf15f 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -1,11 +1,11 @@
-import("system.result");
-import("system.vars");
-import("system.tools");
-
-var roles = [];
-var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-
-if (userTitle && tools.existUsers(userTitle))
- roles = tools.getRoles(userTitle).map(function (role) {return [role, role]});
-
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var roles = [];
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+
+if (userTitle && tools.existUsers(userTitle))
+ roles = tools.getRoles(userTitle).map(function (role) {return [role, role]});
+
result.object(roles);
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
index cb067aab68..1ac230e625 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
@@ -1,19 +1,19 @@
-import("system.result");
-import("system.vars");
-import("system.tools");
-
-var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var role = vars.get("$field.UID");
-
-if (userTitle)
-{
- var user = tools.getUser(userTitle);
- var roles = tools.getRoles(userTitle);
- roles = roles.filter(function (row)
- {
- return row != role;
- });
- user[tools.ROLES] = roles;
-
- tools.updateUser(user);
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+var role = vars.get("$field.UID");
+
+if (userTitle)
+{
+ var user = tools.getUser(userTitle);
+ var roles = tools.getRoles(userTitle);
+ roles = roles.filter(function (row)
+ {
+ return row != role;
+ });
+ user[tools.ROLES] = roles;
+
+ tools.updateUser(user);
}
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
index cd847798b8..258b145582 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
@@ -1,23 +1,23 @@
-import("system.result");
-import("system.vars");
-import("system.tools");
-
-var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var role = vars.get("$field.ROLE");
-
-if (userTitle)
-{
- var user = tools.getUser(userTitle);
- var roles = tools.getRoles(userTitle);
- var roleObj = {};
- roles = [role].concat(roles)
- .filter(function (role)
- {
- var exists = role in roleObj;
- roleObj[role] = true;
- return !exists;
- });
- user[tools.ROLES] = roles;
-
- tools.updateUser(user);
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+var role = vars.get("$field.ROLE");
+
+if (userTitle)
+{
+ var user = tools.getUser(userTitle);
+ var roles = tools.getRoles(userTitle);
+ var roleObj = {};
+ roles = [role].concat(roles)
+ .filter(function (role)
+ {
+ var exists = role in roleObj;
+ roleObj[role] = true;
+ return !exists;
+ });
+ user[tools.ROLES] = roles;
+
+ tools.updateUser(user);
}
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
index ae08df85d8..338f14eb03 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
@@ -1,25 +1,25 @@
-import("system.result");
-import("system.vars");
-import("system.tools");
-
-var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var oldRole = vars.get("$field.UID");
-var newRole = vars.get("$field.ROLE");
-
-if (userTitle && oldRole != newRole)
-{
- var user = tools.getUser(userTitle);
- var roles = tools.getRoles(userTitle);
- var roleObj = {};
- roleObj[oldRole] = true;
- roles = [newRole].concat(roles)
- .filter(function (role)
- {
- var exists = role in roleObj;
- roleObj[role] = true;
- return !exists;
- });
- user[tools.ROLES] = roles;
-
- tools.updateUser(user);
+import("system.result");
+import("system.vars");
+import("system.tools");
+
+var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
+var oldRole = vars.get("$field.UID");
+var newRole = vars.get("$field.ROLE");
+
+if (userTitle && oldRole != newRole)
+{
+ var user = tools.getUser(userTitle);
+ var roles = tools.getRoles(userTitle);
+ var roleObj = {};
+ roleObj[oldRole] = true;
+ roles = [newRole].concat(roles)
+ .filter(function (role)
+ {
+ var exists = role in roleObj;
+ roleObj[role] = true;
+ return !exists;
+ });
+ user[tools.ROLES] = roles;
+
+ tools.updateUser(user);
}
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 968d2fb2ed..6ec492b15b 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,280 +1,280 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>Employee_entity</name>
- <title>Employee</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
- <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
- <iconId>VAADIN:GROUP</iconId>
- <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <lookupIdfield>CONTACT_ID</lookupIdfield>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <title>Username</title>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/uid/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>TITLE_ORIGINAL</name>
- <description>the original username, this is required to update the correct user when the username is changed</description>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <title>Person</title>
- <consumer>Contacts</consumer>
- <linkedContext>Person</linkedContext>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>FIRSTNAME</name>
- <title>Firstname</title>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/firstname/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LASTNAME</name>
- <title>Lastname</title>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ISACTIVE</name>
- <title>Active</title>
- <contentType>BOOLEAN</contentType>
- <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>EMAIL_ADDRESS</name>
- <title>Email</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>PASSWORD</name>
- <title>Password</title>
- <contentType>PASSWORD</contentType>
- <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
- </entityField>
- <entityField>
- <name>CONFIRM_PASSWORD</name>
- <title>Confirm password</title>
- <contentType>PASSWORD</contentType>
- <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
- </entityField>
- <entityActionField>
- <name>setPassword</name>
- <fieldType>ACTION</fieldType>
- <title>Set password</title>
- <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PASSWORD</iconId>
- </entityActionField>
- <entityParameter>
- <name>PasswordChange_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Contacts</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Attributes</name>
- <title>Attributes</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityFieldGroup>
- <name>NAME_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
- <title>Name</title>
- <description>FIELDGROUP</description>
- <fields>
- <element>FIRSTNAME</element>
- <element>LASTNAME</element>
- </fields>
- </entityFieldGroup>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>DEPARTMENT</name>
- <title>Department</title>
- <state>INVISIBLE</state>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityField>
- <name>ROLES</name>
- </entityField>
- <entityConsumer>
- <name>EmployeeRoles</name>
- <title>Roles</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>EmployeeRole_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
- <title>Attribute Tree</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Documents</name>
- <title>Documents</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>StoredSelections</name>
- <title>Stored selections</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>StoredSelection_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Base64String_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>STORED_SELECTIONS</name>
- <searchable v="false" />
- </entityField>
- <entityProvider>
- <name>Employees</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>TITLE_ORIGINAL.value</element>
- <element>ISACTIVE.value</element>
- <element>FIRSTNAME.value</element>
- <element>LASTNAME.value</element>
- <element>EMAIL_ADDRESS.value</element>
- <element>DESCRIPTION.value</element>
- <element>CONTACT_ID.value</element>
- <element>CONTACT_ID.displayValue</element>
- <element>STORED_SELECTIONS.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>Employee_entity</name>
+ <title>Employee</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
+ <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
+ <iconId>VAADIN:GROUP</iconId>
+ <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <lookupIdfield>CONTACT_ID</lookupIdfield>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <title>Username</title>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/uid/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>TITLE_ORIGINAL</name>
+ <description>the original username, this is required to update the correct user when the username is changed</description>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <title>Person</title>
+ <consumer>Contacts</consumer>
+ <linkedContext>Person</linkedContext>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>FIRSTNAME</name>
+ <title>Firstname</title>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/firstname/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LASTNAME</name>
+ <title>Lastname</title>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EMAIL_ADDRESS</name>
+ <title>Email</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>PASSWORD</name>
+ <title>Password</title>
+ <contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
+ </entityField>
+ <entityField>
+ <name>CONFIRM_PASSWORD</name>
+ <title>Confirm password</title>
+ <contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
+ </entityField>
+ <entityActionField>
+ <name>setPassword</name>
+ <fieldType>ACTION</fieldType>
+ <title>Set password</title>
+ <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PASSWORD</iconId>
+ </entityActionField>
+ <entityParameter>
+ <name>PasswordChange_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Contacts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityFieldGroup>
+ <name>NAME_fieldGroup</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+ <title>Name</title>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>FIRSTNAME</element>
+ <element>LASTNAME</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DEPARTMENT</name>
+ <title>Department</title>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>ROLES</name>
+ </entityField>
+ <entityConsumer>
+ <name>EmployeeRoles</name>
+ <title>Roles</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>EmployeeRole_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <title>Documents</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>StoredSelections</name>
+ <title>Stored selections</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>StoredSelection_entity</entityName>
+ <fieldName>StoredSelections</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Base64String_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>STORED_SELECTIONS</name>
+ <searchable v="false" />
+ </entityField>
+ <entityProvider>
+ <name>Employees</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>TITLE_ORIGINAL.value</element>
+ <element>ISACTIVE.value</element>
+ <element>FIRSTNAME.value</element>
+ <element>LASTNAME.value</element>
+ <element>EMAIL_ADDRESS.value</element>
+ <element>DESCRIPTION.value</element>
+ <element>CONTACT_ID.value</element>
+ <element>CONTACT_ID.displayValue</element>
+ <element>STORED_SELECTIONS.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index 24b12e282d..ef0d5bcac5 100644
--- a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
index 5996e99db2..008915f61d 100644
--- a/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("Context_lib");
-
+import("system.result");
+import("Context_lib");
+
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
index 24b12e282d..ef0d5bcac5 100644
--- a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
index 5996e99db2..008915f61d 100644
--- a/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("Context_lib");
-
+import("system.result");
+import("Context_lib");
+
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
index f002ad73ad..3e4bf7585b 100644
--- a/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js
@@ -1,3 +1,3 @@
-import("system.result");
-
+import("system.result");
+
result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
index 24b12e282d..ef0d5bcac5 100644
--- a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
index d8e665c062..183fb18796 100644
--- a/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -1,3 +1,3 @@
-import("system.result");
-
+import("system.result");
+
result.string("EMPLOYEE");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
index 2c71e53a49..16c85500b5 100644
--- a/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/firstname/valueProcess.js b/entity/Employee_entity/entityfields/firstname/valueProcess.js
index 7558bfe949..310fb8ddc8 100644
--- a/entity/Employee_entity/entityfields/firstname/valueProcess.js
+++ b/entity/Employee_entity/entityfields/firstname/valueProcess.js
@@ -1,16 +1,16 @@
-import("system.result");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-
-var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
- && contactId)
-{
- var firstname = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", contactId)
- .buildSql("select FIRSTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
- );
- result.string(firstname);
+import("system.result");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var firstname = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select FIRSTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
+ );
+ result.string(firstname);
}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/image/valueProcess.js b/entity/Employee_entity/entityfields/image/valueProcess.js
index 4701975fe7..d36f4b5cb4 100644
--- a/entity/Employee_entity/entityfields/image/valueProcess.js
+++ b/entity/Employee_entity/entityfields/image/valueProcess.js
@@ -1,15 +1,15 @@
-import("system.db");
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Person_lib");
-import("Sql_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
- var personId = db.cell(SqlCondition.begin()
- .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
- .buildSql("select PERSON_ID from CONTACT")
- );
- result.string(PersUtils.getImage(personId, (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
-}
+import("system.db");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Person_lib");
+import("Sql_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+ var personId = db.cell(SqlCondition.begin()
+ .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
+ .buildSql("select PERSON_ID from CONTACT")
+ );
+ result.string(PersUtils.getImage(personId, (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
+}
diff --git a/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js b/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js
index 7ae1ab2b4f..2ce6bd157c 100644
--- a/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js
+++ b/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js
@@ -1,7 +1,7 @@
-import("system.translate");
-import("system.result");
-
-result.object({
- "true" : translate.text("Yes"),
- "false" : translate.text("No")
+import("system.translate");
+import("system.result");
+
+result.object({
+ "true" : translate.text("Yes"),
+ "false" : translate.text("No")
});
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/isactive/valueProcess.js b/entity/Employee_entity/entityfields/isactive/valueProcess.js
index d6c42ccf6d..7993af1a5f 100644
--- a/entity/Employee_entity/entityfields/isactive/valueProcess.js
+++ b/entity/Employee_entity/entityfields/isactive/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string("true");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/lastname/valueProcess.js b/entity/Employee_entity/entityfields/lastname/valueProcess.js
index 919ab80374..5913681662 100644
--- a/entity/Employee_entity/entityfields/lastname/valueProcess.js
+++ b/entity/Employee_entity/entityfields/lastname/valueProcess.js
@@ -1,16 +1,16 @@
-import("system.result");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-
-var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
- && contactId)
-{
- var lastname = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", contactId)
- .buildSql("select LASTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
- );
- result.string(lastname);
+import("system.result");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var lastname = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select LASTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
+ );
+ result.string(lastname);
}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js b/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js
index 2cb5fabc54..cfe8dbda01 100644
--- a/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js
+++ b/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim());
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/setpassword/onActionProcess.js b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
index bda0a6b48a..47df2ead20 100644
--- a/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
+++ b/entity/Employee_entity/entityfields/setpassword/onActionProcess.js
@@ -1,7 +1,7 @@
-import("system.vars");
-import("system.neon");
-
-var params = {
- "PasswordChange_param" : true
-};
+import("system.vars");
+import("system.neon");
+
+var params = {
+ "PasswordChange_param" : true
+};
neon.openContext("Employee", "EmployeePassword_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js b/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
index d3297d7eb8..8d34e510f8 100644
--- a/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.STORED_SELECTIONS"));
\ No newline at end of file
diff --git a/entity/Employee_entity/onValidation.js b/entity/Employee_entity/onValidation.js
index 1ade64458c..d10cbbc9b0 100644
--- a/entity/Employee_entity/onValidation.js
+++ b/entity/Employee_entity/onValidation.js
@@ -1,6 +1,6 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$field.PASSWORD") != vars.get("$field.CONFIRM_PASSWORD"))
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$field.PASSWORD") != vars.get("$field.CONFIRM_PASSWORD"))
result.string(translate.text("Password and confirmation must be the same!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index de090b22a0..bd4a9109ac 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -1,43 +1,43 @@
-import("system.vars");
-import("system.result");
-import("system.tools");
-import("Util_lib");
-import("Contact_lib");
-import("JditoFilter_lib");
-
-var users;
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
- users = [tools.getUser(vars.get("$local.idvalues"), tools.PROFILE_FULL)];
-else
-{
- var values = ["true", "false"];
- if (vars.exists("$param.OnlyActives_param") && vars.get("$param.OnlyActives_param") == "true")
- values = ["true"];
- users = tools.getUsersByAttribute(tools.ISACTIVE, values, tools.PROFILE_FULL);
-}
-
-users = users.map(function (user)
-{
- return [
- user[tools.TITLE],
- user[tools.TITLE],
- user[tools.PARAMS][tools.ISACTIVE],
- user[tools.PARAMS][tools.FIRSTNAME],
- user[tools.PARAMS][tools.LASTNAME],
- user[tools.PARAMS][tools.EMAIL],
- user[tools.DESCRIPTION],
- user[tools.PARAMS][tools.CONTACTID],
- ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
- user[tools.PARAMS][tools.FRAME_STOREDSEARCHES]
- ];
-});
-
-var filter = vars.exists("$local.filter") && vars.get("$local.filter");
-
-//TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
-users = JditoFilterUtils.filterRecords(["UID", "", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", "", ], users, filter);
-
-
-ArrayUtils.sort2d(users, 0, true, false); //sort by username
-
+import("system.vars");
+import("system.result");
+import("system.tools");
+import("Util_lib");
+import("Contact_lib");
+import("JditoFilter_lib");
+
+var users;
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ users = [tools.getUser(vars.get("$local.idvalues"), tools.PROFILE_FULL)];
+else
+{
+ var values = ["true", "false"];
+ if (vars.exists("$param.OnlyActives_param") && vars.get("$param.OnlyActives_param") == "true")
+ values = ["true"];
+ users = tools.getUsersByAttribute(tools.ISACTIVE, values, tools.PROFILE_FULL);
+}
+
+users = users.map(function (user)
+{
+ return [
+ user[tools.TITLE],
+ user[tools.TITLE],
+ user[tools.PARAMS][tools.ISACTIVE],
+ user[tools.PARAMS][tools.FIRSTNAME],
+ user[tools.PARAMS][tools.LASTNAME],
+ user[tools.PARAMS][tools.EMAIL],
+ user[tools.DESCRIPTION],
+ user[tools.PARAMS][tools.CONTACTID],
+ ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
+ user[tools.PARAMS][tools.FRAME_STOREDSEARCHES]
+ ];
+});
+
+var filter = vars.exists("$local.filter") && vars.get("$local.filter");
+
+//TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
+users = JditoFilterUtils.filterRecords(["UID", "", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", "", ], users, filter);
+
+
+ArrayUtils.sort2d(users, 0, true, false); //sort by username
+
result.object(users);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onDelete.js b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
index b3064b9528..0845913145 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
@@ -1,8 +1,8 @@
-import("system.neon");
-import("system.vars");
-import("system.tools");
-import("Employee_lib");
-
-//TODO: the current user should not delete himself, put this condition in grantDelete when available
-if (EmployeeUtils.getCurrentUserName() != vars.get("$field.UID"))
+import("system.neon");
+import("system.vars");
+import("system.tools");
+import("Employee_lib");
+
+//TODO: the current user should not delete himself, put this condition in grantDelete when available
+if (EmployeeUtils.getCurrentUserName() != vars.get("$field.UID"))
tools.deleteUser(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index 3693a103f6..21f772e8ce 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -1,22 +1,22 @@
-import("system.neon");
-import("system.vars");
-import("system.tools");
-
-var user = {};
-var params = []; //this has to be an array
-params[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
-params[tools.LASTNAME] = vars.get("$field.LASTNAME");
-params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
-params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
-params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
-params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-params[tools.ISACTIVE] = vars.get("$field.ISACTIVE");
-
-user[tools.TITLE] = vars.get("$field.UID");
-user[tools.PARAMS] = params;
-
-if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
-{
- user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
-}
+import("system.neon");
+import("system.vars");
+import("system.tools");
+
+var user = {};
+var params = []; //this has to be an array
+params[tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+params[tools.LASTNAME] = vars.get("$field.LASTNAME");
+params[tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
+params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
+params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
+params[tools.ISACTIVE] = vars.get("$field.ISACTIVE");
+
+user[tools.TITLE] = vars.get("$field.UID");
+user[tools.PARAMS] = params;
+
+if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
+{
+ user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
+}
tools.insertUser(user);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 5cc71867cd..03a003f263 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -1,39 +1,39 @@
-import("system.db");
-import("system.logging");
-import("system.vars");
-import("system.tools");
-import("Person_lib");
-import("Entity_lib");
-
-// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
-FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
-{
- var personId = db.cell(SqlCondition.begin()
- .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
- .buildSql("select PERSON_ID from CONTACT")
- );
- if (state == FieldChanges.STATE_CHANGED())
- PersUtils.setImage(personId, value);
- else
- PersUtils.removeImage(personId);
-});
-
-var user = {};
-user[tools.PARAMS] = [];
-
-user[tools.TITLE] = vars.get("$field.UID");
-user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
-user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
-user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
-user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
-user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
-user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
-user[tools.PARAMS][tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-
-if (vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param")
- && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
-{
- user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
-}
-
+import("system.db");
+import("system.logging");
+import("system.vars");
+import("system.tools");
+import("Person_lib");
+import("Entity_lib");
+
+// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
+FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
+{
+ var personId = db.cell(SqlCondition.begin()
+ .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
+ .buildSql("select PERSON_ID from CONTACT")
+ );
+ if (state == FieldChanges.STATE_CHANGED())
+ PersUtils.setImage(personId, value);
+ else
+ PersUtils.removeImage(personId);
+});
+
+var user = {};
+user[tools.PARAMS] = [];
+
+user[tools.TITLE] = vars.get("$field.UID");
+user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
+user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
+user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
+user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
+user[tools.PARAMS][tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
+
+if (vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param")
+ && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
+{
+ user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
+}
+
tools.updateUser(user);
\ No newline at end of file
diff --git a/entity/Employee_entity/titleProcess.js b/entity/Employee_entity/titleProcess.js
index 2cb5fabc54..cfe8dbda01 100644
--- a/entity/Employee_entity/titleProcess.js
+++ b/entity/Employee_entity/titleProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim());
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 27f8339b5b..7569f2f522 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -32,9 +32,18 @@
<entityProvider>
<name>ObjectRelationTypes</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>81f4567a-fc89-49fc-be86-77600cb66305</name>
+ <entityName>ObjectTree_entity</entityName>
+ <fieldName>ObjectRelationTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>SourceObjectType_param</name>
+ <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
index 853e49e1a5..23e43cb44c 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
@@ -1,14 +1,6 @@
-import("system.translate");
-import("system.db");
+import("system.logging");
import("system.result");
import("system.vars");
+import("ObjectRelation_lib");
-result.object(db.table(
-["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE \n\
- from AB_OBJECTRELATIONTYPE main \n\
- left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where case when type2.OBJECT_TYPE is null then ( ? = main.OBJECT_TYPE) else ( ? = type2.OBJECT_TYPE) end"
-, [
- [vars.get("$param.SourceObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- [vars.get("$param.SourceObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
-]]));
\ No newline at end of file
+result.object(ObjectRelationUtils.getPossibleRelationTypes(vars.get("$param.SourceObjectType_param")));
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 76ab8c7b04..a698685738 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -11,6 +11,8 @@
<entityProvider>
<name>TreeProvider</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>TARGET_ID</targetIdField>
<dependencies>
<entityDependency>
<name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
@@ -25,6 +27,18 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ObjectId_param</name>
@@ -49,6 +63,46 @@
<name>DESCRIPTION</name>
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/description/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>Selector</name>
+ <title>Relationtype</title>
+ <consumer>ObjectRelationTypes</consumer>
+ <state>EDITABLE</state>
+ <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/selector/onValueChange.js</onValueChange>
+ </entityField>
+ <entityConsumer>
+ <name>ObjectRelationTypes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectRelationType_entity</entityName>
+ <fieldName>ObjectRelationTypes</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>SourceObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>EXPANDED</name>
+ </entityField>
+ <entityField>
+ <name>NODEID</name>
+ </entityField>
+ <entityField>
+ <name>TARGET_ID</name>
+ </entityField>
+ <entityField>
+ <name>TARGET_CONTEXT</name>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -57,8 +111,11 @@
<contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFields>
<element>UID.value</element>
- <element>PARENT_ID.value</element>
<element>TITLE.value</element>
+ <element>PARENT_ID.value</element>
+ <element>EXPANDED.value</element>
+ <element>TARGET_ID.value</element>
+ <element>TARGET_CONTEXT.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js
new file mode 100644
index 0000000000..95c8514f3b
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/selector/onValueChange.js b/entity/ObjectTree_entity/entityfields/selector/onValueChange.js
new file mode 100644
index 0000000000..821651c14e
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/selector/onValueChange.js
@@ -0,0 +1,3 @@
+import("system.neon");
+
+neon.refresh()
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 34ef784773..267103d35e 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,107 +1,178 @@
+import("system.translate");
+import("system.util");
import("system.db");
-import("system.vars");
+import("system.text");
import("system.result");
-import("system.translate");
+import("system.vars");
+import("system.logging");
+import("ObjectRelation_lib");
import("Context_lib");
-import("Sql_lib")
-
-var thisObjectId = vars.get("$param.ObjectId_param");
-
-var objectRelations = fetchObjectRelations(thisObjectId);
-var mappedObjectRelations = mapObjectRelations(objectRelations);
+import("Sql_lib");
-var treeData = buildTreeData(mappedObjectRelations);
+var relationTypesCache = {};
+var tree = []
+_loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.ObjectType_param"), vars.get("$field.Selector"));
-result.object(treeData);
+result.object(tree);
-/**
- * Will fetch all objects relations which are in relation with the given
- * object ID. It will compare the given object ID with `OBJECT1_ROWID` and
- * `OBJECT2_ROWID`.
- *
- * It will always return the following array signature:
- * (0) OBJECT1_ROWID | (1) OBJECT2_ROWID | (2) AB_OBJECTRELATIONTYPE1 |(3) type1.OBJECT_TYPE | (4) type1.RELATION_TITLE
- * (5) AB_OBJECTRELATIONTYPE2 | (6) type2.OBJECT_TYPE | (7) type2.RELATION_TITLE | (8) Name of object 1 | (9) Name of object 2
- *
- * @return Will return the given schema above. You can assume, that there will always
- * be an array.
- */
-function fetchObjectRelations (pObjectID) {
- var databaseResult = db.table(
- "SELECT OBJECT1_ROWID, OBJECT2_ROWID, AB_OBJECTRELATIONTYPE1, type1.OBJECT_TYPE, type1.RELATION_TITLE, AB_OBJECTRELATIONTYPE2, type2.OBJECT_TYPE, type2.RELATION_TITLE, "
- + ContextUtils.getNameSubselectSql("type1.OBJECT_TYPE", "OBJECT1_ROWID") + ", " + ContextUtils.getNameSubselectSql("type2.OBJECT_TYPE", "OBJECT2_ROWID") + " "
- + "FROM ADITO.AB_OBJECTRELATION as relation "
- + "left join AB_OBJECTRELATIONTYPE as type1 on AB_OBJECTRELATIONTYPE1 = type1.AB_OBJECTRELATIONTYPEID "
- + "left join AB_OBJECTRELATIONTYPE as type2 on AB_OBJECTRELATIONTYPE2 = type2.AB_OBJECTRELATIONTYPEID "
- + "where OBJECT1_ROWID = '" + thisObjectId + "' or OBJECT2_ROWID = '" + thisObjectId + "'");
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, pNodeId, pLayer)
+{
+ if (pLayer == undefined)
+ pLayer = 0;
- return databaseResult;
+ if (pNodeId == undefined)
+ pNodeId = null;
+
+ var currentObjectId = pObjectId
+
+ if (currentObjectId && pObjectType)
+ {
+ if (pLayer == 0)
+ {
+ if (pObjectRelationType)
+ {
+ // if hirachy: get most top id else use the current currentObjectId
+ if (_getHierarchy(pObjectRelationType))
+ {
+ currentObjectId = _getRootID(currentObjectId, pObjectType);
+ // ??? set type also ???
+ }
+ }
+ else // no ObjectType chosen
+ {
+ // load all ObjectRelationTypes
+ var relationTypes = _getRelationTypes(pObjectType);
+
+ for (let i=0; i<relationTypes.length; i++)
+ {
+ var data = _getEntryData(currentObjectId, relationTypes[i][0], relationTypes[i][3], relationTypes[i][7], relationTypes[i][8]);
+
+ // if any subentry: show objectType
+ if (data.length > 0)
+ {
+ // TODO: Icons, BINDATA
+ // var icon = getIcon...
+ var uid = [currentObjectId, i, relationTypes[i]];
+ tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null]);
+
+ _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, uid, pLayer+1);
+ }
+ }
+ }
+ }
+ else if (pLayer >= 1)
+ {
+ var typeData = pNodeId[2];
+ var typeId = typeData[0];
+ var hierarchy = typeData[4];
+ var destObjectType = typeData[6];
+ var relationType1 = typeData[7];
+ var relationType2 = typeData[8];
+ var direction = typeData[3];
+
+ if (hierarchy == "1" && !pObjectRelationType)
+ {
+ var myData = _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2)
+
+ // wenn typ-side 1 dann die eine Richtung, sonnst die andere?
+ let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType, typeData)
+ for (let i = 0; i < uids.length; i++)
+ {
+ _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationType, uids[i], pLayer+1);
+ }
+ }
+ else
+ {
+ // get ObjectRelationType from nodeId
+ if (!pObjectRelationType)
+ {
+ _insertEntry(tree, _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2), pNodeId, pLayer, destObjectType, typeData)
+ }
+ // TODO: wenn relationtype selected
+ }
+ }
+ }
}
/**
- * Will map the given object relations into a valid schema for the tree.
- * The requried schema for the param can be found in function
- * {@link fetchObjectRelations}.
- * This function is required for additional filtering an mapping of the data.
- *
- * It will always return the following array signature:
- * (0) Object type ID | (1) Object type name | (2) Relation
- *
- *
- * @param pObjectRelations Array with object relations in specific schema.
- * @return Will return the given schema above. You can assume, that there will
- * always be an array.
-*
-* @return The mapped Array with object relations in the following format:
-* ObjectTypeID | ObjectType | RelationTitle | ObjectID
+ * load data for a relation.
+ * OBJECT_ROWID, AB_OBJECTRELATIONID, AB_OBJECTRELATIONTYPEID, RELATION_TITLE
*/
-function mapObjectRelations (pObjectRelations) {
- var resultSet = [];
+function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, pRelationType2, pRecursion)
+{
+ if (pRelationType1 == undefined || pRelationType2 == undefined)
+ return [];
- for (var i = 0; i < pObjectRelations.length; i++) {
- var currentRecord = pObjectRelations[i];
+ var myNum;
+ var otherNum;
+
+ if (pDirection == "normal")
+ {
+ otherNum = 1;
+ myNum = 2;
+ }
+ else
+ {
+ otherNum = 2;
+ myNum = 1;
+ }
- var objectRowId1 = currentRecord[0];
- var objectRowId2 = currentRecord[1];
+ // exclude previous node
+ var condition = " and AB_OBJECTRELATIONTYPE1 = '" + pRelationType1 + "' and AB_OBJECTRELATIONTYPE2 = '" + pRelationType2 + "' and OBJECT" + otherNum + "_ROWID";
+ if (!pRelationTypeId)
+ condition += " is not null ";
+ else
+ condition += " <> '" + pObjectId + "' ";
- if (objectRowId1 === thisObjectId) {
- resultSet.push([currentRecord[5], currentRecord[6], currentRecord[7], currentRecord[1], currentRecord[9]]);
- } else if (objectRowId2 === thisObjectId) {
- resultSet.push([currentRecord[2], currentRecord[3], currentRecord[4], currentRecord[0], currentRecord[8]]);
- }
+ // TODO: BINDATA?
+ // var image = getImageObject("Beziehung");
+
+ // TODO: RELDESC gibts noch nicht
+ var data = db.table("select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE"
+ + " from AB_OBJECTRELATION \n\
+ join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " \n\
+ and OBJECT" + myNum + "_ROWID = '" + pObjectId + "' " + condition
+ );
+
+ if (data.length == 0 && pDirection == "same" && !pRecursion)
+ {
+ return _getEntryData (pObjectId, pRelationTypeId, "normal", pRelationType1, pRelationType2, true)
}
- return resultSet
+ // TODO: BINDATA?
+ //for ( var i = 0; i < data.length; i++) data[i][2] = image[data[i][2]] == undefined ? "" : image[data[i][2]];
+ return data;
+}
+
+function _getRelationTypes(pObjectType)
+{
+ // TODO: load from entity when possible
+ if (relationTypesCache[pObjectType] == undefined)
+ relationTypesCache[pObjectType] = ObjectRelationUtils.getPossibleRelationTypes(pObjectType, true);
+
+ return relationTypesCache[pObjectType];
+}
+
+function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelationTypeData)
+{
+ var expanded = true;
+ if (pLayer > 10) expanded = false;
+ // TODO: display address (tooltip wird denke ich nicht benötigt, da preview vorhanden)
+ var uids = [];
+ for(let i = 0; i < pEntryData.length; i++)
+ {
+ var display = db.cell(ContextUtils.getNameSql(pObjectType, pEntryData[i][0]));
+ // TODO: Icon
+ var uid = [pEntryData[i][0], i, pRelationTypeData, pObjectType, pNodeId, pEntryData[i][2]]
+ uids.push(uid);
+ pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType]);
+ }
+ return uids;
}
-function buildTreeData (pObjectRelations) {
- // Group each relation type
- var relationTypeMapping = {}
-
- var i = 0;
- for (i = 0; i < pObjectRelations.length; i++) {
- let currentRelation = pObjectRelations[i];
-
- if (relationTypeMapping[currentRelation[0]] === undefined)
- relationTypeMapping[currentRelation[0]] = currentRelation[2];
- }
-
- var treeRows = []
- for (i = 0; i < pObjectRelations.length; i++) {
- let currentRelation = pObjectRelations[i];
-
- treeRows.push([currentRelation[3], currentRelation[0], currentRelation[4]]);
- }
-
- // Root elements
- for (i = 0 ; i < Object.keys(relationTypeMapping).length; i++) {
- var currentKey = Object.keys(relationTypeMapping)[i];
-
- var translatedTitle = translate.text(relationTypeMapping[currentKey])
-
- treeRows.push([currentKey, null, translatedTitle]);
- }
-
- return treeRows;
+function _getHierarchy(pObjectRelationType)
+{
+ return db.cell(SqlCondition.begin().andPrepare("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", pObjectRelationType)
+ .buildSql("select HIERARCHY from AB_OBJECTRELATIONTYPE", "1=2")) == "1";
}
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 8130dfa766..783f0caa29 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -609,6 +609,10 @@
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityActionField>
diff --git a/entity/Organisation_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..008915f61d
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9317d1cf6f..44bc063e4a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -657,6 +657,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Person_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js b/entity/Person_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..008915f61d
--- /dev/null
+++ b/entity/Person_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/StoredSelection_entity/StoredSelection_entity.aod b/entity/StoredSelection_entity/StoredSelection_entity.aod
index e782b82bd5..66698e0d50 100644
--- a/entity/StoredSelection_entity/StoredSelection_entity.aod
+++ b/entity/StoredSelection_entity/StoredSelection_entity.aod
@@ -1,53 +1,53 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>StoredSelection_entity</name>
- <title>Stored selections</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>Base64String_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>StoredSelections</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>1386345f-0ed8-4c82-b96d-a249775314ee</name>
- <entityName>Employee_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CONTEXT_NAME</name>
- <title>Module</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>SELECTION_TITLE</name>
- <title>Name</title>
- <state>READONLY</state>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <contentProcess>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>CONTEXT_NAME.value</element>
- <element>SELECTION_TITLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>StoredSelection_entity</name>
+ <title>Stored selections</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>Base64String_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>StoredSelections</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>1386345f-0ed8-4c82-b96d-a249775314ee</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>StoredSelections</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CONTEXT_NAME</name>
+ <title>Module</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>SELECTION_TITLE</name>
+ <title>Name</title>
+ <state>READONLY</state>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <contentProcess>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>CONTEXT_NAME.value</element>
+ <element>SELECTION_TITLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js b/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
index cc4302b632..d92a27b39c 100644
--- a/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
@@ -1,28 +1,28 @@
-import("system.result");
-import("system.pack");
-import("system.util");
-import("system.vars");
-
-var records = [];
-if (vars.exists("$param.Base64String_param") && vars.get("$param.Base64String_param"))
-{
- var codedSelections = pack.gunzip(vars.get("$param.Base64String_param"));
-
- var selections = new XML(util.decodeBase64String(codedSelections));
- selections = selections.FRAME;
- for (let i in selections)
- {
- context = selections[i];
- var contextName = context.NAME;
- if (contextName)
- {
- var title = context.STORE.(ID == "#STORE_SAVED").ELEMENT.TITLE;
- for (let ii in title)
- {
- records.push([(contextName + title[ii]), contextName, title[ii]]);
- }
- }
- }
-}
-
+import("system.result");
+import("system.pack");
+import("system.util");
+import("system.vars");
+
+var records = [];
+if (vars.exists("$param.Base64String_param") && vars.get("$param.Base64String_param"))
+{
+ var codedSelections = pack.gunzip(vars.get("$param.Base64String_param"));
+
+ var selections = new XML(util.decodeBase64String(codedSelections));
+ selections = selections.FRAME;
+ for (let i in selections)
+ {
+ context = selections[i];
+ var contextName = context.NAME;
+ if (contextName)
+ {
+ var title = context.STORE.(ID == "#STORE_SAVED").ELEMENT.TITLE;
+ for (let ii in title)
+ {
+ records.push([(contextName + title[ii]), contextName, title[ii]]);
+ }
+ }
+ }
+}
+
result.object(records);
\ No newline at end of file
diff --git a/neonContext/Employee/Employee.aod b/neonContext/Employee/Employee.aod
index 1d7640c187..9dd4dd642b 100644
--- a/neonContext/Employee/Employee.aod
+++ b/neonContext/Employee/Employee.aod
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Employee</name>
- <title>Employee</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>EmployeeMain_view</mainview>
- <filterview>EmployeeFilter_view</filterview>
- <editview>EmployeeEdit_view</editview>
- <preview>EmployeePreview_view</preview>
- <lookupview>EmployeeLookup_view</lookupview>
- <entity>Employee_entity</entity>
- <references>
- <neonViewReference>
- <name>51816f14-17da-4c96-80d8-f3b5280863b8</name>
- <view>EmployeeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>91c2bbc7-89fb-4688-881e-6fa21e96b211</name>
- <view>EmployeeEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6a36e3cf-5918-4c60-94d9-a3a7ed50ffce</name>
- <view>EmployeePreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>215e8e26-662f-45f6-9c61-c0b0b1129e66</name>
- <view>EmployeeMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>a01b0910-cd32-4fa7-a739-0b9eb19debc2</name>
- <view>EmployeePassword_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>3427f53f-9201-495c-a37c-b2c9b33eb123</name>
- <view>EmployeeLookup_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Employee</name>
+ <title>Employee</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>EmployeeMain_view</mainview>
+ <filterview>EmployeeFilter_view</filterview>
+ <editview>EmployeeEdit_view</editview>
+ <preview>EmployeePreview_view</preview>
+ <lookupview>EmployeeLookup_view</lookupview>
+ <entity>Employee_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>51816f14-17da-4c96-80d8-f3b5280863b8</name>
+ <view>EmployeeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>91c2bbc7-89fb-4688-881e-6fa21e96b211</name>
+ <view>EmployeeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6a36e3cf-5918-4c60-94d9-a3a7ed50ffce</name>
+ <view>EmployeePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>215e8e26-662f-45f6-9c61-c0b0b1129e66</name>
+ <view>EmployeeMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a01b0910-cd32-4fa7-a739-0b9eb19debc2</name>
+ <view>EmployeePassword_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3427f53f-9201-495c-a37c-b2c9b33eb123</name>
+ <view>EmployeeLookup_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/EmployeeRole/EmployeeRole.aod b/neonContext/EmployeeRole/EmployeeRole.aod
index 28bfe0b0c7..436cf33ca9 100644
--- a/neonContext/EmployeeRole/EmployeeRole.aod
+++ b/neonContext/EmployeeRole/EmployeeRole.aod
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>EmployeeRole</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>EmployeeRole_entity</entity>
- <references>
- <neonViewReference>
- <name>fd4de342-238b-494e-a85b-ff08e3f065b9</name>
- <view>EmployeeRoleFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6ec0af90-47aa-4f94-8e05-7c535bd4c965</name>
- <view>EmployeeRoleEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>EmployeeRole</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>EmployeeRole_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>fd4de342-238b-494e-a85b-ff08e3f065b9</name>
+ <view>EmployeeRoleFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6ec0af90-47aa-4f94-8e05-7c535bd4c965</name>
+ <view>EmployeeRoleEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/StoredSelection/StoredSelection.aod b/neonContext/StoredSelection/StoredSelection.aod
index cda8fb5311..b758aed2aa 100644
--- a/neonContext/StoredSelection/StoredSelection.aod
+++ b/neonContext/StoredSelection/StoredSelection.aod
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>StoredSelection</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>StoredSelection_entity</entity>
- <references>
- <neonViewReference>
- <name>8ab7727b-5dc7-47bb-9034-079d84ede3a3</name>
- <view>StoredSelectionFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>StoredSelection</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>StoredSelection_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>8ab7727b-5dc7-47bb-9034-079d84ede3a3</name>
+ <view>StoredSelectionFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index 5dfcad7f88..9d89615fa4 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -1,60 +1,60 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeeEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Generic</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>fdd5320e-a8c0-4043-a88e-aeba1ca02cd1</name>
- <entityField>UID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
- <entityField>FIRSTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
- <entityField>LASTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
- <entityField>EMAIL_ADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4ad9c1aa-37a9-46f9-a566-94e5be5c2a7f</name>
- <entityField>PASSWORD</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5381db3a-762d-439a-b41b-e4e67edc2099</name>
- <entityField>CONFIRM_PASSWORD</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>af8112a3-78d3-436f-b665-ebce595a7c24</name>
- <entityField>EmployeeRoles</entityField>
- <view>EmployeeRoleEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>fdd5320e-a8c0-4043-a88e-aeba1ca02cd1</name>
+ <entityField>UID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
+ <entityField>FIRSTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
+ <entityField>LASTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4ad9c1aa-37a9-46f9-a566-94e5be5c2a7f</name>
+ <entityField>PASSWORD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5381db3a-762d-439a-b41b-e4e67edc2099</name>
+ <entityField>CONFIRM_PASSWORD</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>af8112a3-78d3-436f-b665-ebce595a7c24</name>
+ <entityField>EmployeeRoles</entityField>
+ <view>EmployeeRoleEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index f25bea5ddd..a11de42475 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -1,39 +1,39 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeeFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Employees</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>15185ef0-5402-43c4-b5c9-1e0e836ef1c3</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
- <entityField>UID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
- <entityField>ISACTIVE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>18b974f1-81ea-4ca0-83bf-a1505f763446</name>
- <entityField>FIRSTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>27c4199c-157a-4c3e-a851-01aa1d82dfd2</name>
- <entityField>LASTNAME</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Employees</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>15185ef0-5402-43c4-b5c9-1e0e836ef1c3</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
+ <entityField>UID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
+ <entityField>ISACTIVE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>18b974f1-81ea-4ca0-83bf-a1505f763446</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>27c4199c-157a-4c3e-a851-01aa1d82dfd2</name>
+ <entityField>LASTNAME</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index da3c34385d..ce9851ad9a 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -1,43 +1,43 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeeMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>f9ae631b-48ad-4d7c-a3a1-6cb00230e5c7</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>f9ae631b-48ad-4d7c-a3a1-6cb00230e5c7</name>
- <entityField>#ENTITY</entityField>
- <view>EmployeePreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>79a01c28-1eaa-4974-babd-fb6e4d59471b</name>
- <entityField>EmployeeRoles</entityField>
- <view>EmployeeRoleFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>7164f8cd-3892-4694-92ad-fc45afac68f1</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>68e54801-e68f-4797-97d2-368b4b82a7e4</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>169d3ae7-d688-42fd-9097-77bbd9bfb81f</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>aaca4c8c-7953-43d8-9390-53b78d86863a</name>
- <entityField>StoredSelections</entityField>
- <view>StoredSelectionFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeeMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>f9ae631b-48ad-4d7c-a3a1-6cb00230e5c7</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>f9ae631b-48ad-4d7c-a3a1-6cb00230e5c7</name>
+ <entityField>#ENTITY</entityField>
+ <view>EmployeePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>79a01c28-1eaa-4974-babd-fb6e4d59471b</name>
+ <entityField>EmployeeRoles</entityField>
+ <view>EmployeeRoleFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7164f8cd-3892-4694-92ad-fc45afac68f1</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>68e54801-e68f-4797-97d2-368b4b82a7e4</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>169d3ae7-d688-42fd-9097-77bbd9bfb81f</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>aaca4c8c-7953-43d8-9390-53b78d86863a</name>
+ <entityField>StoredSelections</entityField>
+ <view>StoredSelectionFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/EmployeePassword_view/EmployeePassword_view.aod b/neonView/EmployeePassword_view/EmployeePassword_view.aod
index 7a3c199fcc..731d112028 100644
--- a/neonView/EmployeePassword_view/EmployeePassword_view.aod
+++ b/neonView/EmployeePassword_view/EmployeePassword_view.aod
@@ -1,27 +1,27 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeePassword_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Password</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>632294e8-f9ec-4bd1-afe4-87e3b5fc84c4</name>
- <entityField>PASSWORD</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>66a7726a-c226-4d74-95a4-ea88950920bf</name>
- <entityField>CONFIRM_PASSWORD</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeePassword_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Password</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>632294e8-f9ec-4bd1-afe4-87e3b5fc84c4</name>
+ <entityField>PASSWORD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>66a7726a-c226-4d74-95a4-ea88950920bf</name>
+ <entityField>CONFIRM_PASSWORD</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index 57ce49321e..cbad666710 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -1,46 +1,46 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeePreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>NAME_fieldGroup</titleField>
- <subtitleField>UID</subtitleField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>68755289-a351-4915-8626-52f023e237f8</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a5f8b519-26d8-4824-b9cf-9119c03b1bd8</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0bda9209-1437-49eb-98b7-6edea9c6836a</name>
- <entityField>DEPARTMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d9786e3d-5364-4075-a08d-0d4ea91c4728</name>
- <entityField>EMAIL_ADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>79cd6a97-6caf-4acb-81af-028b94f33e8f</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>NAME_fieldGroup</titleField>
+ <subtitleField>UID</subtitleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>68755289-a351-4915-8626-52f023e237f8</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a5f8b519-26d8-4824-b9cf-9119c03b1bd8</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0bda9209-1437-49eb-98b7-6edea9c6836a</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d9786e3d-5364-4075-a08d-0d4ea91c4728</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>79cd6a97-6caf-4acb-81af-028b94f33e8f</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
index 9fc81ddf21..80d5076129 100644
--- a/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
+++ b/neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod
@@ -1,23 +1,23 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeeRoleFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Table</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>ab1c8d39-fc29-42e8-8b8e-3557d544b272</name>
- <entityField>ROLE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeeRoleFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ab1c8d39-fc29-42e8-8b8e-3557d544b272</name>
+ <entityField>ROLE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTree_view/ObjectTree_view.aod
index d2be4d640d..4395ff3960 100644
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTree_view/ObjectTree_view.aod
@@ -11,6 +11,7 @@
<treeViewTemplate>
<name>ObjectRelations</name>
<parentField>PARENT_ID</parentField>
+ <nodeExpandedField>EXPANDED</nodeExpandedField>
<titleField>TITLE</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>ICON</iconField>
diff --git a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
index f9352814ab..0fc464bb78 100644
--- a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
+++ b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
@@ -1,26 +1,26 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>StoredSelectionFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Table</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>713574de-2d9c-4006-93a3-3860fb145c26</name>
- <entityField>CONTEXT_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc4d5ff-24cf-46d9-9941-cda11e445a17</name>
- <entityField>SELECTION_TITLE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>StoredSelectionFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>713574de-2d9c-4006-93a3-3860fb145c26</name>
+ <entityField>CONTEXT_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4cc4d5ff-24cf-46d9-9941-cda11e445a17</name>
+ <entityField>SELECTION_TITLE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml b/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
index 1fe970cb97..89d9e3cf4a 100644
--- a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
@@ -17,6 +17,9 @@
<column name="SIDE" type="INTEGER">
<constraints nullable="false"/>
</column>
+ <column name="HIERARCHY" type="INTEGER">
+ <constraints nullable="false"/>
+ </column>
</createTable>
<addColumn tableName="AB_OBJECTRELATION">
@@ -38,6 +41,7 @@
<column name="RELATION_TITLE" value="parent company"/>
<column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
@@ -45,6 +49,7 @@
<column name="RELATION_TITLE" value="subsidiary"/>
<column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
<column name="SIDE" valueNumeric="2"/>
+ <column name="HIERARCHY" valueNumeric="1"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -53,6 +58,7 @@
<column name="RELATION_TITLE" value="parent of"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
@@ -60,6 +66,7 @@
<column name="RELATION_TITLE" value="child of"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
<column name="SIDE" valueNumeric="2"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -68,6 +75,7 @@
<column name="RELATION_TITLE" value="supports"/>
<column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="a51e23c0-d44a-4e39-a79b-7a357fb79cc2"/>
@@ -75,6 +83,7 @@
<column name="RELATION_TITLE" value="supported by"/>
<column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
<column name="SIDE" valueNumeric="2"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -83,6 +92,7 @@
<column name="RELATION_TITLE" value="supervisor of"/>
<column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="0a47c346-9b6f-4cdd-8c38-77800d7012f5"/>
@@ -90,6 +100,7 @@
<column name="RELATION_TITLE" value="reports to"/>
<column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
<column name="SIDE" valueNumeric="2"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -98,6 +109,7 @@
<column name="RELATION_TITLE" value="promotion target of"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="e397b595-38ae-4365-908e-75ee388838eb"/>
@@ -105,6 +117,7 @@
<column name="RELATION_TITLE" value="solicits"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
<column name="SIDE" valueNumeric="2"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -113,6 +126,7 @@
<column name="RELATION_TITLE" value="competitor"/>
<column name="RELATION_TYPE" value="032ebe0a-7204-4eec-82a2-cb13b65850d7"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -121,6 +135,7 @@
<column name="RELATION_TITLE" value="society"/>
<column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
@@ -128,6 +143,7 @@
<column name="RELATION_TITLE" value="member"/>
<column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
<column name="SIDE" valueNumeric="2"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -136,6 +152,7 @@
<column name="RELATION_TITLE" value="acquainted with"/>
<column name="RELATION_TYPE" value="84120fad-e7a2-4961-8c29-d00da41efe48"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -144,6 +161,7 @@
<column name="RELATION_TITLE" value="collaboration with"/>
<column name="RELATION_TYPE" value="091d866f-67e8-4fd6-afdc-e40d0f2be224"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
@@ -152,6 +170,7 @@
<column name="RELATION_TITLE" value="grandparents of"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
<column name="SIDE" valueNumeric="1"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="a2296f93-2371-4ab8-9f29-ef0795d1e9b2"/>
@@ -159,6 +178,7 @@
<column name="RELATION_TITLE" value="ankle of"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
<column name="SIDE" valueNumeric="2"/>
+ <column name="HIERARCHY" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/process/ObjectRelation_lib/ObjectRelation_lib.aod b/process/ObjectRelation_lib/ObjectRelation_lib.aod
new file mode 100644
index 0000000000..c3d8d41218
--- /dev/null
+++ b/process/ObjectRelation_lib/ObjectRelation_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process 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/process/1.2.0">
+ <name>ObjectRelation_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
new file mode 100644
index 0000000000..1220a10c17
--- /dev/null
+++ b/process/ObjectRelation_lib/process.js
@@ -0,0 +1,77 @@
+import("system.logging");
+import("system.db");
+
+/**
+ * Class containing utility functions for ObjectRelations
+ * do not create an instance of this
+ *
+ * @class
+ */
+function ObjectRelationUtils() {}
+
+/**
+ * Get all possible relationTypes by a objectType.
+ * Normally it only returns the id and title. If you set pFullInfo to true, you will get additional information, too.
+ *
+ * @param {String} pObjectType the object type to load the relation types for.]
+ * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side
+ *
+ * @return {String[][]}
+ */
+ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
+{
+ var sql = " from AB_OBJECTRELATIONTYPE main \n\
+ left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
+ where case when type2.OBJECT_TYPE is null then ( ? = main.OBJECT_TYPE) else ( ? = type2.OBJECT_TYPE) end"
+
+ // only id and title:
+ if (pFullInfo == undefined || pFullInfo == false)
+ {
+ pFullInfo = [];
+
+ return (db.table(
+ ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE" + sql,
+ [
+ [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
+ [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
+ ]
+ ]));
+
+ }
+
+ // full info:
+ // TODO: add hierarchy
+ var relationTypes = (db.table(
+ ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
+ case when type2.AB_OBJECTRELATIONTYPEID is null then 'same' \n\
+ when main.SIDE = 1 then 'normal'\n\
+ else 'reverse'\n\
+ end direction,\n\
+ main.HIERARCHY, \n\
+ type2.OBJECT_TYPE objectType, \n\
+ main.OBJECT_TYPE objectType, \n\
+ -- typeId of Object2\n\
+ case when main.SIDE = 1 then main.AB_OBJECTRELATIONTYPEID\n\
+ else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId1,\n\
+ -- typeId of Object1\n\
+ case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
+ else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
+ main.SIDE" + sql,
+ [
+ [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
+ [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
+ ]
+ ]));
+
+ // switch the object types, if the direction is normal so that the first one is dest and the second one is source.
+ return relationTypes;
+ /*.map(function(relationType)
+ {
+ if (relationType[3] == "normal")
+ {
+ return relationType.slice(0, 6).concat(relationType[7], relationType[6]);
+ }
+
+ return relationType;
+ });*/
+}
\ No newline at end of file
--
GitLab
From 9d4b8b47aec52fe8619661225823f569d4760246 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 3 Apr 2019 12:59:27 +0200
Subject: [PATCH 172/250] angebot: Lieferbedingungen / Zahlungsbedingungen
vorbelegen
---
.../deliveryterms/valueProcess.js | 11 +++++++++-
.../entityfields/paymentterms/valueProcess.js | 22 ++++++++++++++-----
.../data/example_attribute/Attribute.xml | 4 ++--
3 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
index 911cd325a0..c3d8c920ee 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -1,8 +1,17 @@
-import("system.logging");
+import("system.neon");
import("system.result");
import("system.vars");
+import("Attribute_lib");
if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
{
result.string(vars.get("$param.OfferDeliveryTerm_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var contactId = vars.getString("$field.CONTACT_ID");
+ if (contactId)
+ { // Lieferkondition
+ result.string(AttributeRelationUtils.getAttribute("3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb", contactId));
+ }
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
index 298cb1a859..35d02f62ca 100644
--- a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
@@ -1,7 +1,17 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param"))
-{
- result.string(vars.get("$param.OfferPaymentTerm_param"));
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param"))
+{
+ result.string(vars.get("$param.OfferPaymentTerm_param"));
+}
+else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var contactId = vars.getString("$field.CONTACT_ID");
+ if (contactId)
+ { // Zahlungskondition
+ result.string(AttributeRelationUtils.getAttribute("292fae38-6557-466d-8843-3b1b4a1f6599", contactId));
+ }
}
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 28ca84e85f..632b9c9749 100644
--- a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -871,7 +871,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Zahlungskondition"/>
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
@@ -880,7 +880,7 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Lieferkondition"/>
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
--
GitLab
From fdf019a5da397641d70f3e6ebe228462d00efc1e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 3 Apr 2019 14:00:48 +0200
Subject: [PATCH 173/250] object tree choose type
---
.../ObjectRelationType_entity/titleProcess.js | 3 +-
.../recordcontainers/jdito/contentProcess.js | 57 +++++++++++++------
neonView/ObjectTree_view/ObjectTree_view.aod | 11 ++++
process/ObjectRelation_lib/process.js | 51 +++++++++++++----
4 files changed, 94 insertions(+), 28 deletions(-)
diff --git a/entity/ObjectRelationType_entity/titleProcess.js b/entity/ObjectRelationType_entity/titleProcess.js
index 6a95b85f75..71a9111fb4 100644
--- a/entity/ObjectRelationType_entity/titleProcess.js
+++ b/entity/ObjectRelationType_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("system.translate");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.RELATION_TITLE"))
\ No newline at end of file
+result.string(translate.text(vars.get("$field.RELATION_TITLE")))
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 267103d35e..824c27dc86 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -16,7 +16,7 @@ _loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.Obje
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, pNodeId, pLayer)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer)
{
if (pLayer == undefined)
pLayer = 0;
@@ -30,14 +30,22 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, pN
{
if (pLayer == 0)
{
- if (pObjectRelationType)
+ if (pObjectRelationTypeId)
{
+ var relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
+ relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
// if hirachy: get most top id else use the current currentObjectId
- if (_getHierarchy(pObjectRelationType))
+ if (relationTypeData[4] == "1")
{
- currentObjectId = _getRootID(currentObjectId, pObjectType);
- // ??? set type also ???
+ currentObjectId = _getRootID(currentObjectId, relationTypeData);
}
+
+ let uids = _insertEntry(tree, [[currentObjectId, "", "", "", ""]], pNodeId, pLayer, pObjectType, relationTypeData)
+ for (let i = 0; i < uids.length; i++)
+ {
+ _loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1);
+ }
+
}
else // no ObjectType chosen
{
@@ -53,10 +61,10 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, pN
{
// TODO: Icons, BINDATA
// var icon = getIcon...
- var uid = [currentObjectId, i, relationTypes[i]];
+ let uid = [currentObjectId, i, relationTypes[i]];
tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null]);
- _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, uid, pLayer+1);
+ _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1);
}
}
}
@@ -71,7 +79,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, pN
var relationType2 = typeData[8];
var direction = typeData[3];
- if (hierarchy == "1" && !pObjectRelationType)
+ if (hierarchy == "1")
{
var myData = _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2)
@@ -79,16 +87,16 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, pN
let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType, typeData)
for (let i = 0; i < uids.length; i++)
{
- _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationType, uids[i], pLayer+1);
+ _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1);
}
}
else
{
// get ObjectRelationType from nodeId
- if (!pObjectRelationType)
- {
+ //if (!pObjectRelationTypeId)
+ //{
_insertEntry(tree, _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2), pNodeId, pLayer, destObjectType, typeData)
- }
+ //}
// TODO: wenn relationtype selected
}
}
@@ -97,7 +105,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationType, pN
/**
* load data for a relation.
- * OBJECT_ROWID, AB_OBJECTRELATIONID, AB_OBJECTRELATIONTYPEID, RELATION_TITLE
+ * OBJECT_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE
*/
function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, pRelationType2, pRecursion)
{
@@ -171,8 +179,25 @@ function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelatio
return uids;
}
-function _getHierarchy(pObjectRelationType)
+/*
+* get most top root of a node
+*
+* @param {String} pObjectId
+* @param {String[]} pObjectRelationTypeData
+*
+* @return {String} RootObjectId
+*/
+function _getRootID(pObjectId, pObjectRelationTypeData)
{
- return db.cell(SqlCondition.begin().andPrepare("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", pObjectRelationType)
- .buildSql("select HIERARCHY from AB_OBJECTRELATIONTYPE", "1=2")) == "1";
+ var sourceid = pObjectId;
+ var max = 100;
+ do
+ {
+ var rootid = sourceid;
+ max--;
+ sourceid = db.cell("select OBJECT1_ROWID from AB_OBJECTRELATION where OBJECT2_ROWID = '" + sourceid + "' and AB_OBJECTRELATIONTYPE1 = '" + pObjectRelationTypeData[7] + "' and AB_OBJECTRELATIONTYPE2 = '" + pObjectRelationTypeData[8] + "'");
+ }
+ while( sourceid != "" && max > 0 );
+ return rootid;
+ return currentObjectId;
}
\ No newline at end of file
diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTree_view/ObjectTree_view.aod
index 4395ff3960..ca08618677 100644
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTree_view/ObjectTree_view.aod
@@ -8,6 +8,17 @@
</boxLayout>
</layout>
<children>
+ <genericViewTemplate>
+ <name>Selector</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>50eef5d6-418b-411b-a585-8633119b2fb0</name>
+ <entityField>Selector</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
<treeViewTemplate>
<name>ObjectRelations</name>
<parentField>PARENT_ID</parentField>
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
index 1220a10c17..a3d375d5c3 100644
--- a/process/ObjectRelation_lib/process.js
+++ b/process/ObjectRelation_lib/process.js
@@ -40,7 +40,6 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
}
// full info:
- // TODO: add hierarchy
var relationTypes = (db.table(
["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
case when type2.AB_OBJECTRELATIONTYPEID is null then 'same' \n\
@@ -63,15 +62,45 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
]
]));
- // switch the object types, if the direction is normal so that the first one is dest and the second one is source.
return relationTypes;
- /*.map(function(relationType)
- {
- if (relationType[3] == "normal")
- {
- return relationType.slice(0, 6).concat(relationType[7], relationType[6]);
- }
-
- return relationType;
- });*/
+}
+
+/**
+ * Get all possible relationTypes by a objectType.
+ * returns the id, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side
+ *
+ * @param {String} pObjectTypeId the object type to load the relation types for.]
+ *
+ * @return {String[][]}
+ */
+ObjectRelationUtils.getRelationType = function(pObjectTypeId)
+{
+ // TODO: funktionen evtl. zusammenfassen
+ var sql = " from AB_OBJECTRELATIONTYPE main \n\
+ left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
+ where main.AB_OBJECTRELATIONTYPEID = ?"
+
+ // full info:
+ var relationType = (db.array(db.ROW,
+ ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
+ case when type2.AB_OBJECTRELATIONTYPEID is null then 'same' \n\
+ when main.SIDE = 1 then 'normal'\n\
+ else 'reverse'\n\
+ end direction,\n\
+ main.HIERARCHY, \n\
+ type2.OBJECT_TYPE objectType, \n\
+ main.OBJECT_TYPE objectType, \n\
+ -- typeId of Object2\n\
+ case when main.SIDE = 1 then main.AB_OBJECTRELATIONTYPEID\n\
+ else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId1,\n\
+ -- typeId of Object1\n\
+ case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
+ else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
+ main.SIDE" + sql,
+ [
+ [pObjectTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]],
+ ]
+ ]));
+
+ return relationType;
}
\ No newline at end of file
--
GitLab
From 53dd96e5715284b8f7d0cdea03af849c88c215c9 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 3 Apr 2019 11:14:01 +0200
Subject: [PATCH 174/250] Angebot neuanlage: Nur offene Vertriebsproj. mit
passender Firma
---
entity/Offer_entity/Offer_entity.aod | 8 ++++-
.../entityfields/contact_id/onValueChange.js | 32 ++++++++++--------
.../children/contactid_param/valueProcess.js | 7 ++++
.../Salesproject_entity.aod | 30 +++++++++++++----
.../children/state_param/valueProcess.js | 4 +++
.../children/state_param/valueProcess.js | 5 +++
.../recordcontainers/db/conditionProcess.js | 33 ++++++++++++++-----
process/Contact_lib/process.js | 5 ++-
8 files changed, 92 insertions(+), 32 deletions(-)
create mode 100644 entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index c1bf480be6..64409fcaa9 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -336,8 +336,14 @@
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>openSalesprojects</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityField>
<name>ADDRESS</name>
diff --git a/entity/Offer_entity/entityfields/contact_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
index 96af6855c0..98ae338e18 100644
--- a/entity/Offer_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
@@ -1,14 +1,20 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("Util_lib");
-import("Entity_lib");
-
-var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
-if(contactid != "")
-{
- var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
-
- if(relData[0] != "")
- neon.setFieldValue("field.LANGUAGE", relData[0]);
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("Util_lib");
+import("Entity_lib");
+import("Contact_lib");
+
+var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
+if(contactid != "")
+{
+ //Language Preset
+ var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
+ if(relData[0] != "")
+ neon.setFieldValue("field.LANGUAGE", relData[0]);
+
+ // set $field.CONTATCT_ORG_ID per contactid
+ var orgid = ContactUtils.getPersOrgIds(contactid);
+ neon.setFieldValue("$field.CONTACT_ORG_ID", orgid[2]);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000..2b24f74fc8
--- /dev/null
+++ b/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Entity_lib");
+
+var contact = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ORG_ID"));
+result.string(contact);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 556054ab8e..33b930ad5b 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -11,12 +11,6 @@
<entityProvider>
<name>#PROVIDER</name>
<dependencies>
- <entityDependency>
- <name>525fd920-ea50-45d6-97a8-20e0aaaa830c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>497657f7-ebd7-4c9c-b8ab-da447a1556e5</name>
<entityName>Order_entity</entityName>
@@ -521,6 +515,30 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>openSalesprojects</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>State_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>State_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js
new file mode 100644
index 0000000000..9074d4eece
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+//The Id for the salesproject state keyword OPEN
+result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
new file mode 100644
index 0000000000..e593be26ec
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+
+
+//KeywordId for SalesprojectCompetitionState OPEN
+result.string("25b0ac77-ef92-4809-802e-bb9d8782f865")
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
index 6500b695cd..a710bd959e 100644
--- a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
@@ -1,9 +1,24 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Sql_lib");
-
-result.string(db.translateCondition(
- SqlCondition.begin()
- .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
- .build("1 = 1")));
\ No newline at end of file
+import("system.logging");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+logging.log("state: " + vars.get("$param.State_param"));
+logging.log("contact: " + vars.get("$param.ContactId_param"));
+
+if(vars.exists("$param.State_param") && vars.get("$param.State_param") && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+{
+ result.string(db.translateCondition(
+ SqlCondition.begin()
+ .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
+ .andPrepareVars("SALESPROJECT.STATE", "$param.State_param")
+ .build("1 = 2")));
+}
+else
+{
+ result.string(db.translateCondition(
+ SqlCondition.begin()
+ .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
+ .build("1 = 1")));
+}
\ No newline at end of file
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index f4d5068268..9650bbacd2 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -190,7 +190,7 @@ ContactUtils.getContextByContactId = function(pContactId)
* get the person- and org-id from a contact as array
*
* @param {String} pContactId
- * @return {String[]} result as [persid, orgid] if one of them is null in the db, "" will be returned as the id.
+ * @return {String[]} result as [contactid, persid, orgid] if one of them is null in the db, "" will be returned as the id.
*/
ContactUtils.getPersOrgIds = function(pContactId)
{
@@ -201,8 +201,7 @@ ContactUtils.getPersOrgIds = function(pContactId)
.buildSql("select CONTACTID, PERSON_ID, ORGANISATION_ID from CONTACT", "1=0"));
}
-
- return ["", ""];
+ return [];
}
/**
--
GitLab
From a497c7e1d6d020deeb1642c623c614fd644c2884 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 3 Apr 2019 11:45:37 +0200
Subject: [PATCH 175/250] Angebot Neuanlage: Vertriebsproj. READONLY solange
kein Contact + condProc
---
.../salesproject_id/stateProcess.js | 30 +++++++++++--------
.../Salesproject_entity.aod | 1 +
.../recordcontainers/db/conditionProcess.js | 3 --
.../OfferitemFilter_view.aod | 4 ---
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
index a88395a1cc..1a1eb537b9 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
@@ -1,13 +1,19 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-
-switch (vars.get("$sys.recordstate"))
-{
- case neon.OPERATINGSTATE_NEW:
- result.object(neon.COMPONENTSTATE_EDITABLE);
- break;
- default:
- result.object(neon.COMPONENTSTATE_READONLY);
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Entity_lib");
+
+
+switch (vars.get("$sys.recordstate"))
+{
+ case neon.OPERATINGSTATE_NEW:
+ //only EDITABLE if $field.CONTACT_ID is set
+ if(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID")))
+ result.object(neon.COMPONENTSTATE_EDITABLE);
+ else
+ result.object(neon.COMPONENTSTATE_READONLY);
+ break;
+ default:
+ result.object(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 33b930ad5b..b1499464e8 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -70,6 +70,7 @@
<entityField>
<name>SALESPROJECTID</name>
<searchable v="false" />
+ <state>AUTO</state>
</entityField>
<entityField>
<name>STARTDATE</name>
diff --git a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
index a710bd959e..49d846ad22 100644
--- a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
@@ -4,9 +4,6 @@ import("system.result");
import("system.vars");
import("Sql_lib");
-logging.log("state: " + vars.get("$param.State_param"));
-logging.log("contact: " + vars.get("$param.ContactId_param"));
-
if(vars.exists("$param.State_param") && vars.get("$param.State_param") && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
{
result.string(db.translateCondition(
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index faeaabafb0..782aa68ca1 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -46,10 +46,6 @@
<name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>a31fd16c-4237-4cd9-a9de-2267f186d342</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>60a36c38-103f-4fdb-9e8a-b8fd6d441f14</name>
<entityField>TotalPrice</entityField>
--
GitLab
From 9325384db6159365e6d8ee9e78069ee841b186d6 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 3 Apr 2019 14:53:37 +0200
Subject: [PATCH 176/250] object relation tree: verwende Filter
---
entity/ObjectTree_entity/ObjectTree_entity.aod | 11 +++++++++++
.../recordcontainers/jdito/contentProcess.js | 15 ++++++++++++---
neonView/ObjectTree_view/ObjectTree_view.aod | 12 +-----------
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index a698685738..abb4084655 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -48,25 +48,31 @@
</entityParameter>
<entityField>
<name>UID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>PARENT_ID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>TITLE</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>ICON</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/description/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>Selector</name>
<title>Relationtype</title>
<consumer>ObjectRelationTypes</consumer>
+ <searchable v="true" />
<state>EDITABLE</state>
<onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/selector/onValueChange.js</onValueChange>
</entityField>
@@ -93,15 +99,19 @@
</entityParameter>
<entityField>
<name>EXPANDED</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>NODEID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>TARGET_ID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>TARGET_CONTEXT</name>
+ <searchable v="false" />
</entityField>
</entityFields>
<recordContainers>
@@ -116,6 +126,7 @@
<element>EXPANDED.value</element>
<element>TARGET_ID.value</element>
<element>TARGET_CONTEXT.value</element>
+ <element>Selector.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 824c27dc86..a167caa248 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -11,9 +11,18 @@ import("Sql_lib");
var relationTypesCache = {};
var tree = []
+var filter = JSON.parse(vars.get("$local.filter"))
+var selectedRelationType = null;
-_loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.ObjectType_param"), vars.get("$field.Selector"));
+if (filter)
+{
+ if (filter.childs.length > 0)
+ {
+ selectedRelationType = filter.childs[0].value;
+ }
+}
+_loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.ObjectType_param"), selectedRelationType);
result.object(tree);
function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer)
@@ -62,7 +71,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// TODO: Icons, BINDATA
// var icon = getIcon...
let uid = [currentObjectId, i, relationTypes[i]];
- tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null]);
+ tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, ""]);
_loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1);
}
@@ -174,7 +183,7 @@ function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelatio
// TODO: Icon
var uid = [pEntryData[i][0], i, pRelationTypeData, pObjectType, pNodeId, pEntryData[i][2]]
uids.push(uid);
- pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType]);
+ pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, ""]);
}
return uids;
}
diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTree_view/ObjectTree_view.aod
index ca08618677..a6e80e32a7 100644
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTree_view/ObjectTree_view.aod
@@ -2,23 +2,13 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ObjectTree_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
- <genericViewTemplate>
- <name>Selector</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>50eef5d6-418b-411b-a585-8633119b2fb0</name>
- <entityField>Selector</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
<treeViewTemplate>
<name>ObjectRelations</name>
<parentField>PARENT_ID</parentField>
--
GitLab
From 0da12c1eef09e81da9187478fa92835de71cde77 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 3 Apr 2019 15:12:05 +0200
Subject: [PATCH 177/250] offer use consumer for possible addresses
---
entity/Address_entity/Address_entity.aod | 10 ++++++++++
entity/Offer_entity/Offer_entity.aod | 17 ++++++++++++++++-
.../chosenaddress/possibleItemsProcess.js | 5 -----
.../children/contactid_param/valueProcess.js | 4 ++++
entity/Person_entity/Person_entity.aod | 4 ----
.../organisationid_param/valueProcess.js | 4 ----
6 files changed, 30 insertions(+), 14 deletions(-)
delete mode 100644 entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js
create mode 100644 entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js
delete mode 100644 entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 334ba18c64..3feac2b6cf 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -141,6 +141,10 @@
<name>DefaultAddressId_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OrganisationId_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityProvider>
@@ -210,6 +214,12 @@
<fieldName>ContactAndOrganisationAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>PossibleAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 64409fcaa9..2e9ed00405 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -357,7 +357,7 @@
<entityField>
<name>ChosenAddress</name>
<title>Choose address</title>
- <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>PossibleAddresses</consumer>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js</stateProcess>
<onValueChange>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -700,6 +700,21 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js</valueProcess>
</entityField>
+ <entityConsumer>
+ <name>PossibleAddresses</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAndContactAddresses</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js b/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js
deleted file mode 100644
index c45999248f..0000000000
--- a/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.result");
-import("PostalAddress_lib");
-
-result.object(AddressUtils.getAllPossibleAddresses(vars.get("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000..7e0951d02b
--- /dev/null
+++ b/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 44bc063e4a..10a779eccd 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -698,10 +698,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
- <entityParameter>
- <name>OrganisationId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js</valueProcess>
- </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js b/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js
deleted file mode 100644
index a3b647281e..0000000000
--- a/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.ORGANISATION_ID"));
\ No newline at end of file
--
GitLab
From 32e3f2437e8daf7297d3cd9c6f37357dde55a85a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 3 Apr 2019 15:22:53 +0200
Subject: [PATCH 178/250] fix objectrelation tree
---
.../recordcontainers/jdito/contentProcess.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index a167caa248..490e03a269 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -42,10 +42,12 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
if (pObjectRelationTypeId)
{
var relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
- relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
+
// if hirachy: get most top id else use the current currentObjectId
if (relationTypeData[4] == "1")
{
+ // use always reverse-type
+ relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
currentObjectId = _getRootID(currentObjectId, relationTypeData);
}
@@ -54,7 +56,6 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
{
_loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1);
}
-
}
else // no ObjectType chosen
{
--
GitLab
From 5a57c55f0ca3c189f1b47c268e51c6baf9aa9140 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 3 Apr 2019 15:36:58 +0200
Subject: [PATCH 179/250] objectrelation tree: use prepared statements
---
.../recordcontainers/jdito/contentProcess.js | 28 ++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 490e03a269..24743025b7 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -136,22 +136,26 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
myNum = 1;
}
+
+ var cond = SqlCondition.begin()
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2)
+ .andPrepare("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId);
+
// exclude previous node
- var condition = " and AB_OBJECTRELATIONTYPE1 = '" + pRelationType1 + "' and AB_OBJECTRELATIONTYPE2 = '" + pRelationType2 + "' and OBJECT" + otherNum + "_ROWID";
if (!pRelationTypeId)
- condition += " is not null ";
- else
- condition += " <> '" + pObjectId + "' ";
+ cond.and("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID is not null");
+ else
+ cond.andPrepare("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID", pObjectId, "# <> ?");
// TODO: BINDATA?
// var image = getImageObject("Beziehung");
// TODO: RELDESC gibts noch nicht
- var data = db.table("select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE"
- + " from AB_OBJECTRELATION \n\
- join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " \n\
- and OBJECT" + myNum + "_ROWID = '" + pObjectId + "' " + condition
- );
+ var data = db.table(cond.buildSql(
+ "select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE \n\
+ from AB_OBJECTRELATION \n\
+ join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " and ","1=2", "", false));
if (data.length == 0 && pDirection == "same" && !pRecursion)
{
@@ -205,7 +209,11 @@ function _getRootID(pObjectId, pObjectRelationTypeData)
{
var rootid = sourceid;
max--;
- sourceid = db.cell("select OBJECT1_ROWID from AB_OBJECTRELATION where OBJECT2_ROWID = '" + sourceid + "' and AB_OBJECTRELATIONTYPE1 = '" + pObjectRelationTypeData[7] + "' and AB_OBJECTRELATIONTYPE2 = '" + pObjectRelationTypeData[8] + "'");
+ sourceid = db.cell(SqlCondition.begin()
+ .andPrepare("AB_OBJECTRELATION.OBJECT2_ROWID", sourceid)
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pObjectRelationTypeData[7])
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pObjectRelationTypeData[8])
+ .buildSql("select OBJECT1_ROWID from AB_OBJECTRELATION", "1=2"))
}
while( sourceid != "" && max > 0 );
return rootid;
--
GitLab
From 38c1367e10fd24296884a06c3e2e6d601824c2ce Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 2 Apr 2019 13:39:21 +0200
Subject: [PATCH 180/250] only set ORGANISATION_ID to
private-dummy-organisation on save
---
entity/Contact_entity/Contact_entity.aod | 2 +-
.../organisation_id/onValidation.js | 13 ++++++----
.../organisation_id/onValueChange.js | 8 +------
.../organisation_id/valueProcess.js | 8 -------
entity/Contact_entity/onValidation.js | 8 +++++++
entity/Person_entity/Person_entity.aod | 2 +-
.../organisation_id/onValueChange.js | 7 ------
.../organisation_id/valueProcess.js | 4 ----
entity/Person_entity/onValidation.js | 3 +++
.../_____LANGUAGE_EXTRA.aod | 21 +++-------------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 24 ++++---------------
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 21 +++-------------
12 files changed, 33 insertions(+), 88 deletions(-)
delete mode 100644 entity/Contact_entity/entityfields/organisation_id/valueProcess.js
create mode 100644 entity/Contact_entity/onValidation.js
delete mode 100644 entity/Person_entity/entityfields/organisation_id/onValueChange.js
create mode 100644 entity/Person_entity/onValidation.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 6192516f60..2b6cdcfe10 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -4,6 +4,7 @@
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
+ <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
<recordContainer>db</recordContainer>
<entityFields>
@@ -26,7 +27,6 @@
<title>Company</title>
<consumer>Organisations</consumer>
<mandatory v="false" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValidation.js b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
index 1f8c6d2abe..7d398c0152 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValidation.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
@@ -5,21 +5,26 @@ import("system.vars");
import("Entity_lib");
import("Sql_lib");
-var personId = vars.get("$field.PERSON_ID");
+var personId = vars.getString("$field.PERSON_ID");
var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISATION_ID");
//workaround for organisationId: $local.value will return the name of the organisation which is not what we want
//but the field already contains the changed value; so let's load the field instead of the $local.value-variable
//this is a bug within the ADITO-kernel
//TODO: change the workaround behaviour when $local.value is retrieved correct
-organisationId = vars.get("$field.ORGANISATION_ID")
+organisationId = vars.getString("$field.ORGANISATION_ID")
-if (personId && organisationId)
+if (personId)
{
+ if (organisationId == "")
+ organisationId = "0";
var alreadyExistantContactId = db.cell(SqlCondition.begin()
.andPrepare("CONTACT.PERSON_ID", personId)
.andPrepare("CONTACT.ORGANISATION_ID", organisationId)
.buildSql("select CONTACT.CONTACTID from CONTACT"));
if (alreadyExistantContactId != "")
- result.string(translate.text("This combination of person and organisation does already exist and can not be created once more."));
+ if (organisationId.trim() == "0")
+ result.string(translate.text("This private person doeas already exist and can not be created once more."));
+ else
+ result.string(translate.text("This combination of person and organisation does already exist and can not be created once more."));
}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
index 80f1e97c87..0347a3d2d5 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
@@ -1,10 +1,4 @@
import("system.vars");
-import("system.neon");
//since the standard address can be only values of org the standard address has to be reset on org change
-vars.set("$field.ADDRESS_ID", "");
-
-if(vars.exists("$local.value") && !vars.get("$local.value"))
-{
- neon.setFieldValue("$field.ORGANISATION_ID", "0");
-}
+vars.set("$field.ADDRESS_ID", "");
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/organisation_id/valueProcess.js b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
deleted file mode 100644
index 008844fbe5..0000000000
--- a/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.neon");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.getString("$field.ORGANISATION_ID") == "")
-{
- result.string("0");
-}
\ No newline at end of file
diff --git a/entity/Contact_entity/onValidation.js b/entity/Contact_entity/onValidation.js
new file mode 100644
index 0000000000..ef3e299e67
--- /dev/null
+++ b/entity/Contact_entity/onValidation.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.neon");
+
+//TODO: workaround till there exists somtehing that can be done "beforeSave"; a validation of the whole entity is done before saving so let's use this process at the moment
+if(!vars.get("$field.ORGANISATION_ID"))
+{
+ neon.setFieldValue("$field.ORGANISATION_ID", "0");
+}
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 10a779eccd..9965dfe93c 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -5,6 +5,7 @@
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Person_entity/documentation.adoc</documentation>
+ <onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
<imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
<titleProcess>%aditoprj%/entity/Person_entity/titleProcess.js</titleProcess>
@@ -156,7 +157,6 @@
<searchable v="true" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Person_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>PersAddresses</name>
diff --git a/entity/Person_entity/entityfields/organisation_id/onValueChange.js b/entity/Person_entity/entityfields/organisation_id/onValueChange.js
deleted file mode 100644
index d24b292520..0000000000
--- a/entity/Person_entity/entityfields/organisation_id/onValueChange.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-
-if(vars.exists("$local.value") && !vars.get("$local.value"))
-{
- neon.setFieldValue("$field.ORGANISATION_ID", "0");
-}
diff --git a/entity/Person_entity/entityfields/organisation_id/valueProcess.js b/entity/Person_entity/entityfields/organisation_id/valueProcess.js
index b570e18125..6f44e6e6c6 100644
--- a/entity/Person_entity/entityfields/organisation_id/valueProcess.js
+++ b/entity/Person_entity/entityfields/organisation_id/valueProcess.js
@@ -8,8 +8,4 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.
{
result.string(vars.get("$param.OrgId_param"));
}
- else if(!vars.get("$field.ORGANISATION_ID"))
- {
- result.string("0")
- }
}
\ No newline at end of file
diff --git a/entity/Person_entity/onValidation.js b/entity/Person_entity/onValidation.js
new file mode 100644
index 0000000000..41a2e1e251
--- /dev/null
+++ b/entity/Person_entity/onValidation.js
@@ -0,0 +1,3 @@
+import("system.vars");
+if (!vars.get("$field.ORGANISATION_ID"))
+ vars.set("$field.ORGANISATION_ID", "0");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 4c77d30255..6c31d77bfa 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1020,9 +1020,6 @@
<entry>
<key>Seite</key>
</entry>
- <entry>
- <key>Note</key>
- </entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
@@ -2646,9 +2643,6 @@
<entry>
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
</entry>
- <entry>
- <key>The title already exists!</key>
- </entry>
<entry>
<key>Password</key>
</entry>
@@ -2661,15 +2655,6 @@
<entry>
<key>Email</key>
</entry>
- <entry>
- <key>Test</key>
- </entry>
- <entry>
- <key>testV</key>
- </entry>
- <entry>
- <key>test</key>
- </entry>
<entry>
<key>{$OBJECTLINK_TYPE}</key>
</entry>
@@ -2682,9 +2667,6 @@
<entry>
<key>Password and confirmation must be the same!</key>
</entry>
- <entry>
- <key>Login</key>
- </entry>
<entry>
<key>Begin</key>
</entry>
@@ -2703,6 +2685,9 @@
<entry>
<key>Username already exists!</key>
</entry>
+ <entry>
+ <key>This private person doeas already exist and can not be created once more.</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 8a7f5281e5..816ec30255 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -142,10 +142,6 @@
<key>Medium</key>
<value>Medium</value>
</entry>
- <entry>
- <key>The title already exists!</key>
- <value>Der Titel existiert bereits!</value>
- </entry>
<entry>
<key>Internet</key>
<value>Internet</value>
@@ -1497,10 +1493,6 @@
<entry>
<key>Seite</key>
</entry>
- <entry>
- <key>Note</key>
- <value>Notiz</value>
- </entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
@@ -3446,15 +3438,6 @@
<key>Email</key>
<value>E-Mail</value>
</entry>
- <entry>
- <key>Test</key>
- </entry>
- <entry>
- <key>testV</key>
- </entry>
- <entry>
- <key>test</key>
- </entry>
<entry>
<key>{$OBJECTLINK_TYPE}</key>
<value>Art</value>
@@ -3467,9 +3450,6 @@
<key>Password and confirmation must be the same!</key>
<value>Die Passwörter stimmen nicht überein!</value>
</entry>
- <entry>
- <key>Login</key>
- </entry>
<entry>
<key>Begin</key>
<value>Beginn</value>
@@ -3478,6 +3458,10 @@
<key>Maturity</key>
<value>Fällig</value>
</entry>
+ <entry>
+ <key>This private person doeas already exist and can not be created once more.</key>
+ <value>Diese Privatperson existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
+ </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 898fc6da0a..c35bab99b6 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1038,9 +1038,6 @@
<entry>
<key>Seite</key>
</entry>
- <entry>
- <key>Note</key>
- </entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
@@ -2674,9 +2671,6 @@
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
<value>%0 has to be between %2 and %3.</value>
</entry>
- <entry>
- <key>The title already exists!</key>
- </entry>
<entry>
<key>Password</key>
</entry>
@@ -2689,15 +2683,6 @@
<entry>
<key>Email</key>
</entry>
- <entry>
- <key>Test</key>
- </entry>
- <entry>
- <key>testV</key>
- </entry>
- <entry>
- <key>test</key>
- </entry>
<entry>
<key>{$OBJECTLINK_TYPE}</key>
<value>Type</value>
@@ -2712,9 +2697,6 @@
<entry>
<key>Password and confirmation must be the same!</key>
</entry>
- <entry>
- <key>Login</key>
- </entry>
<entry>
<key>Begin</key>
</entry>
@@ -2733,6 +2715,9 @@
<entry>
<key>Username already exists!</key>
</entry>
+ <entry>
+ <key>This private person doeas already exist and can not be created once more.</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 01b8c716672e65ade8c4bf0030e99635156c7b89 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 3 Apr 2019 13:16:28 +0200
Subject: [PATCH 181/250] prevent duplicate contacts (same ORGANISATION and
PERSON)
---
.../organisation_id/onValidation.js | 2 +-
.../Organisation_entity.aod | 12 ++---
entity/Person_entity/Person_entity.aod | 7 ++-
.../organisation_id/onValidation.js | 52 +++++++++++++++++++
.../valueProcess.js | 7 +++
process/Sql_lib/process.js | 40 ++++++++++++++
6 files changed, 112 insertions(+), 8 deletions(-)
create mode 100644 entity/Person_entity/entityfields/organisation_id/onValidation.js
create mode 100644 entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValidation.js b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
index 7d398c0152..320f78dc97 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValidation.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
@@ -12,7 +12,7 @@ var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISAT
//but the field already contains the changed value; so let's load the field instead of the $local.value-variable
//this is a bug within the ADITO-kernel
//TODO: change the workaround behaviour when $local.value is retrieved correct
-organisationId = vars.getString("$field.ORGANISATION_ID")
+organisationId = vars.getString("$field.ORGANISATION_ID");
if (personId)
{
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 783f0caa29..9034940ae2 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -129,12 +129,6 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>19a28531-bec6-49e2-b00d-aae3816e6690</name>
- <entityName>Person_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -656,6 +650,12 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>a80c3db0-29db-433c-8f7c-4ebf6639ad6d</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9965dfe93c..3390ce5317 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -157,6 +157,7 @@
<searchable v="true" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Person_entity/entityfields/organisation_id/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>PersAddresses</name>
@@ -208,12 +209,16 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
+ <fieldName>WithPersonIdFilter</fieldName>
</dependency>
<children>
<entityParameter>
<name>WithPrivate_param</name>
</entityParameter>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/Person_entity/entityfields/organisation_id/onValidation.js b/entity/Person_entity/entityfields/organisation_id/onValidation.js
new file mode 100644
index 0000000000..ae01ddc13b
--- /dev/null
+++ b/entity/Person_entity/entityfields/organisation_id/onValidation.js
@@ -0,0 +1,52 @@
+import("system.logging");
+import("system.translate");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("Entity_lib");
+import("Contact_lib");
+import("Sql_lib");
+
+//TODO: comment
+//TODO: into lib
+//TODO: use in Contact
+ContactUtils.validateOrganisationId = function(pPersonId, pOrganisationId, pOwnContactId)
+{
+ if (!pPersonId)
+ return null;
+ if (pOrganisationId == "")
+ pOrganisationId = "0";
+ var cond = SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPersonId)
+ .andPrepare("CONTACT.ORGANISATION_ID", pOrganisationId)
+ //exclude the own since we do not want a "is not valid"-message for our own entry (on EDIT-mode)
+ .andPrepareIfSet("CONTACT.CONTACTID", pOwnContactId, "# != ?");
+
+ var sql = cond.buildSql("select CONTACT.CONTACTID from CONTACT");
+ var alreadyExistantContactId = db.cell(sql);
+ if (alreadyExistantContactId)
+ if (pOrganisationId.trim() == "0")
+ return translate.text("This private person doeas already exist and can not be created once more.");
+ else
+ return translate.text("This combination of person and organisation does already exist and can not be created once more.");
+
+ return null;
+};
+
+
+var personId = vars.getString("$field.PERSONID");
+var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISATION_ID");
+var contactId;//in EDIT we have to exclude our own CONTACTID since we do not want a message for our own contactentry
+if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
+ contactId = vars.get("$field.CONTACTID");
+
+//workaround for organisationId: $local.value will return the name of the organisation which is not what we want
+//but the field already contains the changed value; so let's load the field instead of the $local.value-variable
+//this is a bug within the ADITO-kernel
+//TODO: change the workaround behaviour when $local.value is retrieved correct
+organisationId = vars.getString("$field.ORGANISATION_ID");
+
+var validationMsg = ContactUtils.validateOrganisationId(personId, organisationId, contactId);
+if (validationMsg)
+ result.string(validationMsg);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js b/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js
new file mode 100644
index 0000000000..03e286d947
--- /dev/null
+++ b/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+//in mode NEW no record with that PERSONID exists that could be excluded by a database query, so let's ignore that (which means do not pass a value)
+if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
+ result.object(vars.get("$field.PERSONID"));
\ No newline at end of file
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 0fe8c5e301..ffeaa776d3 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -204,6 +204,46 @@ SqlCondition.prototype.orPrepare = function(field, value, cond, fieldType) {
return this.or(cond);
}
+/**
+ * same as the "andPrepare"-function but only applied if the passed "value" is truely
+ * @param {String | String[]} field the database field as "tablename.columnname"; e.g. "ORGANISATION.NAME" or as array with column-alias: ["ORGANISATION", "NAME", "myorgAlias"]
+ * @param {String} value the value that shall be set into the prepared statement
+ * @param {String} [cond="# = ?"] the strucutre of the SQL condition as preparedString, you can use a number sign "#" as placeholder for you fieldname;
+ * e.g. "# > ?"; escaping the number sign is possible with a backslash "\"
+ * @param {Numeric | Boolean} [fieldType] SQL-column-type; if the fieldType is not given it's loaded automatically;
+ * The loaded type is cached if no type is given. So it is also safe to use this in a loop.
+ * e.g.
+ * for (...) {
+ * cond.andPrepare("SALESPROJECT_CLASSIFICATION.TYPE", entry, "# <> ?")
+ * }
+ * @return {SqlCondition} current SqlCondition-object
+ */
+SqlCondition.prototype.andPrepareIfSet = function(field, value, cond, fieldType) {
+ if (value)
+ return this.andPrepare(field, value, cond, fieldType);
+ return this;
+}
+
+/**
+ * same as the "orPrepare"-function but only applied if the passed "value" is truely
+ * @param {String | String[]} field the database field as "tablename.columnname"; e.g. "ORGANISATION.NAME" or as array with column-alias: ["ORGANISATION", "NAME", "myorgAlias"]
+ * @param {String} value the value that shall be set into the prepared statement
+ * @param {String} [cond="# = ?"] the strucutre of the SQL condition as preparedString, you can use a number sign "#" as placeholder for you fieldname;
+ * e.g. "# > ?"; escaping the number sign is possible with a backslash "\"
+ * @param {Numeric | Boolean} [fieldType] SQL-column-type; if the fieldType is not given it's loaded automatically;
+ * The loaded type is cached if no type is given. So it is also safe to use this in a loop.
+ * e.g.
+ * for (...) {
+ * cond.andPrepare("SALESPROJECT_CLASSIFICATION.TYPE", entry, "# <> ?")
+ * }
+ * @return {SqlCondition} current SqlCondition-object
+ */
+SqlCondition.prototype.orPrepareIfSet = function(field, value, cond, fieldType) {
+ if (value)
+ return this.orPrepare(field, value, cond, fieldType);
+ return this;
+}
+
/**
* same as the "andPrepare"-function but with validation of adito-variables functionality
* @param {String | String[]} field the database field as "tablename.columnname"; e.g. "ORGANISATION.NAME" or as array with column-alias: ["ORGANISATION", "NAME", "myorgAlias"]
--
GitLab
From e4819e7ea30813fd0675184f3ce4b9b11b5ca222 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 07:55:48 +0200
Subject: [PATCH 182/250] upgrade project: 5.1.10 -> 5.1.11
---
.aditoprj/project.version | 4 ++--
process/ActivityTask_lib/ActivityTask_lib.aod | 3 ++-
.../AddressEntity_lib/AddressEntity_lib.aod | 3 ++-
process/Appointment_lib/Appointment_lib.aod | 3 ++-
process/Attribute_lib/Attribute_lib.aod | 3 ++-
process/Binary_lib/Binary_lib.aod | 3 ++-
process/Calendar_lib/Calendar_lib.aod | 3 ++-
.../Communication_lib/Communication_lib.aod | 3 ++-
process/Contact_lib/Contact_lib.aod | 3 ++-
process/Context_lib/Context_lib.aod | 3 ++-
process/Contract_lib/Contract_lib.aod | 3 ++-
process/Data_lib/Data_lib.aod | 3 ++-
process/Date_lib/Date_lib.aod | 3 ++-
process/Document_lib/Document_lib.aod | 3 ++-
process/Employee_lib/Employee_lib.aod | 19 ++++++++++---------
process/Entity_lib/Entity_lib.aod | 3 ++-
process/IndexSearch_lib/IndexSearch_lib.aod | 3 ++-
process/JditoFilter_lib/JditoFilter_lib.aod | 19 ++++++++++---------
.../KeywordRegistry_basic.aod | 6 +++++-
process/Keyword_lib/Keyword_lib.aod | 3 ++-
process/Money_lib/Money_lib.aod | 3 ++-
process/Neon_lib/Neon_lib.aod | 3 ++-
.../ObjectRelation_lib/ObjectRelation_lib.aod | 3 ++-
process/OfferOrder_lib/OfferOrder_lib.aod | 3 ++-
process/Offer_lib/Offer_lib.aod | 3 ++-
process/Order_lib/Order_lib.aod | 3 ++-
process/Organisation_lib/Organisation_lib.aod | 3 ++-
process/Person_lib/Person_lib.aod | 3 ++-
.../PostalAddress_lib/PostalAddress_lib.aod | 3 ++-
process/Product_lib/Product_lib.aod | 3 ++-
process/Proto_lib/Proto_lib.aod | 6 +++++-
process/Report_lib/Report_lib.aod | 3 ++-
process/Salesproject_lib/Salesproject_lib.aod | 3 ++-
process/Sql_lib/Sql_lib.aod | 3 ++-
.../StandardObject_lib/StandardObject_lib.aod | 3 ++-
process/Timetracking_lib/Timetracking_lib.aod | 3 ++-
process/Util_lib/Util_lib.aod | 3 ++-
.../_test_clientProcess.aod | 6 +++++-
process/autostartNeon/autostartNeon.aod | 6 +++++-
.../indexsearch_patternextension.aod | 6 +++++-
process/runIndexer_ws/runIndexer_ws.aod | 6 +++++-
41 files changed, 116 insertions(+), 58 deletions(-)
diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 8174646658..e2deba5a71 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Wed Apr 03 07:50:41 CEST 2019
-version=5.1.10
+#Thu Apr 04 07:54:23 CEST 2019
+version=5.1.11
diff --git a/process/ActivityTask_lib/ActivityTask_lib.aod b/process/ActivityTask_lib/ActivityTask_lib.aod
index 679ece6671..7d01cda6f7 100644
--- a/process/ActivityTask_lib/ActivityTask_lib.aod
+++ b/process/ActivityTask_lib/ActivityTask_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>ActivityTask_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ActivityTask_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/AddressEntity_lib/AddressEntity_lib.aod b/process/AddressEntity_lib/AddressEntity_lib.aod
index adae9b0940..de356629db 100644
--- a/process/AddressEntity_lib/AddressEntity_lib.aod
+++ b/process/AddressEntity_lib/AddressEntity_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>AddressEntity_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/AddressEntity_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Appointment_lib/Appointment_lib.aod b/process/Appointment_lib/Appointment_lib.aod
index 20497c5ba1..db268712a0 100644
--- a/process/Appointment_lib/Appointment_lib.aod
+++ b/process/Appointment_lib/Appointment_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Appointment_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Appointment_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Attribute_lib/Attribute_lib.aod b/process/Attribute_lib/Attribute_lib.aod
index 5cc0e19791..2d6a04c3c3 100644
--- a/process/Attribute_lib/Attribute_lib.aod
+++ b/process/Attribute_lib/Attribute_lib.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Attribute_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Attribute_lib/process.js</process>
<alias>Data_alias</alias>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Binary_lib/Binary_lib.aod b/process/Binary_lib/Binary_lib.aod
index 69dcbbe139..bf77c96a98 100644
--- a/process/Binary_lib/Binary_lib.aod
+++ b/process/Binary_lib/Binary_lib.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Binary_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Binary_lib/process.js</process>
<alias>_____SYSTEMALIAS</alias>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Calendar_lib/Calendar_lib.aod b/process/Calendar_lib/Calendar_lib.aod
index e3951f99b3..f693c32933 100644
--- a/process/Calendar_lib/Calendar_lib.aod
+++ b/process/Calendar_lib/Calendar_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Calendar_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Calendar_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Communication_lib/Communication_lib.aod b/process/Communication_lib/Communication_lib.aod
index b1b3026148..ea51bfaa9d 100644
--- a/process/Communication_lib/Communication_lib.aod
+++ b/process/Communication_lib/Communication_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Communication_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Communication_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Contact_lib/Contact_lib.aod b/process/Contact_lib/Contact_lib.aod
index 3a466ec8e6..7bee08bc54 100644
--- a/process/Contact_lib/Contact_lib.aod
+++ b/process/Contact_lib/Contact_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Contact_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Contact_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Context_lib/Context_lib.aod b/process/Context_lib/Context_lib.aod
index 830f1c4215..0ff636035d 100644
--- a/process/Context_lib/Context_lib.aod
+++ b/process/Context_lib/Context_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Context_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Context_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Contract_lib/Contract_lib.aod b/process/Contract_lib/Contract_lib.aod
index 380228efe3..93435e8d82 100644
--- a/process/Contract_lib/Contract_lib.aod
+++ b/process/Contract_lib/Contract_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Contract_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Contract_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Data_lib/Data_lib.aod b/process/Data_lib/Data_lib.aod
index 31c110aa44..ca60729050 100644
--- a/process/Data_lib/Data_lib.aod
+++ b/process/Data_lib/Data_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Data_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Data_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Date_lib/Date_lib.aod b/process/Date_lib/Date_lib.aod
index 1414654125..fea9abd42d 100644
--- a/process/Date_lib/Date_lib.aod
+++ b/process/Date_lib/Date_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Date_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Date_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Document_lib/Document_lib.aod b/process/Document_lib/Document_lib.aod
index f4e3b53c41..6fc78e9a60 100644
--- a/process/Document_lib/Document_lib.aod
+++ b/process/Document_lib/Document_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Document_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Document_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Employee_lib/Employee_lib.aod b/process/Employee_lib/Employee_lib.aod
index 9c77c83eb0..8f25741e0b 100644
--- a/process/Employee_lib/Employee_lib.aod
+++ b/process/Employee_lib/Employee_lib.aod
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
- <name>Employee_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Employee_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>Employee_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Employee_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/Entity_lib/Entity_lib.aod b/process/Entity_lib/Entity_lib.aod
index 39459cd9cc..119444322b 100644
--- a/process/Entity_lib/Entity_lib.aod
+++ b/process/Entity_lib/Entity_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Entity_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Entity_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/IndexSearch_lib/IndexSearch_lib.aod b/process/IndexSearch_lib/IndexSearch_lib.aod
index a584c2b2b8..b01c6469bd 100644
--- a/process/IndexSearch_lib/IndexSearch_lib.aod
+++ b/process/IndexSearch_lib/IndexSearch_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>IndexSearch_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/IndexSearch_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/JditoFilter_lib/JditoFilter_lib.aod b/process/JditoFilter_lib/JditoFilter_lib.aod
index fcd05c04ee..393e409204 100644
--- a/process/JditoFilter_lib/JditoFilter_lib.aod
+++ b/process/JditoFilter_lib/JditoFilter_lib.aod
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
- <name>JditoFilter_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/JditoFilter_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>JditoFilter_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/JditoFilter_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
index eddf2366e9..bee31e709f 100644
--- a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
+++ b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>KeywordRegistry_basic</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/KeywordRegistry_basic/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
</process>
diff --git a/process/Keyword_lib/Keyword_lib.aod b/process/Keyword_lib/Keyword_lib.aod
index f835319ec0..3fd8ae7e5c 100644
--- a/process/Keyword_lib/Keyword_lib.aod
+++ b/process/Keyword_lib/Keyword_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Keyword_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Keyword_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Money_lib/Money_lib.aod b/process/Money_lib/Money_lib.aod
index e374a767e3..06754c9fff 100644
--- a/process/Money_lib/Money_lib.aod
+++ b/process/Money_lib/Money_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Money_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Money_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Neon_lib/Neon_lib.aod b/process/Neon_lib/Neon_lib.aod
index 7434f563e7..fe38e58b98 100644
--- a/process/Neon_lib/Neon_lib.aod
+++ b/process/Neon_lib/Neon_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Neon_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Neon_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/ObjectRelation_lib/ObjectRelation_lib.aod b/process/ObjectRelation_lib/ObjectRelation_lib.aod
index c3d8d41218..72a87d51c0 100644
--- a/process/ObjectRelation_lib/ObjectRelation_lib.aod
+++ b/process/ObjectRelation_lib/ObjectRelation_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>ObjectRelation_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/OfferOrder_lib/OfferOrder_lib.aod b/process/OfferOrder_lib/OfferOrder_lib.aod
index dc358ccc3b..c115c6614e 100644
--- a/process/OfferOrder_lib/OfferOrder_lib.aod
+++ b/process/OfferOrder_lib/OfferOrder_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>OfferOrder_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/OfferOrder_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Offer_lib/Offer_lib.aod b/process/Offer_lib/Offer_lib.aod
index ab430b8f76..dc15d8402d 100644
--- a/process/Offer_lib/Offer_lib.aod
+++ b/process/Offer_lib/Offer_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Offer_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Offer_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Order_lib/Order_lib.aod b/process/Order_lib/Order_lib.aod
index 9704443eca..594a7071bf 100644
--- a/process/Order_lib/Order_lib.aod
+++ b/process/Order_lib/Order_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Order_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Order_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Organisation_lib/Organisation_lib.aod b/process/Organisation_lib/Organisation_lib.aod
index 258d3dcfe7..4e058400b0 100644
--- a/process/Organisation_lib/Organisation_lib.aod
+++ b/process/Organisation_lib/Organisation_lib.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Organisation_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Organisation_lib/process.js</process>
<alias>Data_alias</alias>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Person_lib/Person_lib.aod b/process/Person_lib/Person_lib.aod
index 53a4220efa..cd638e09d8 100644
--- a/process/Person_lib/Person_lib.aod
+++ b/process/Person_lib/Person_lib.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Person_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Person_lib/process.js</process>
<alias>_____SYSTEMALIAS</alias>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/PostalAddress_lib/PostalAddress_lib.aod b/process/PostalAddress_lib/PostalAddress_lib.aod
index 71e373b8f5..76fc147e9f 100644
--- a/process/PostalAddress_lib/PostalAddress_lib.aod
+++ b/process/PostalAddress_lib/PostalAddress_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>PostalAddress_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/PostalAddress_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Product_lib/Product_lib.aod b/process/Product_lib/Product_lib.aod
index 3f15eda57c..e02eb2aba3 100644
--- a/process/Product_lib/Product_lib.aod
+++ b/process/Product_lib/Product_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Product_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Product_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Proto_lib/Proto_lib.aod b/process/Proto_lib/Proto_lib.aod
index 99585a3435..86f04ebbb2 100644
--- a/process/Proto_lib/Proto_lib.aod
+++ b/process/Proto_lib/Proto_lib.aod
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Proto_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Proto_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
</process>
diff --git a/process/Report_lib/Report_lib.aod b/process/Report_lib/Report_lib.aod
index b19c68dfbd..91c4528ffb 100644
--- a/process/Report_lib/Report_lib.aod
+++ b/process/Report_lib/Report_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Report_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Report_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Salesproject_lib/Salesproject_lib.aod b/process/Salesproject_lib/Salesproject_lib.aod
index 13d8c745ea..bb4aac0563 100644
--- a/process/Salesproject_lib/Salesproject_lib.aod
+++ b/process/Salesproject_lib/Salesproject_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Salesproject_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Salesproject_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Sql_lib/Sql_lib.aod b/process/Sql_lib/Sql_lib.aod
index 87263713d4..a41ad0693f 100644
--- a/process/Sql_lib/Sql_lib.aod
+++ b/process/Sql_lib/Sql_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Sql_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Sql_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/StandardObject_lib/StandardObject_lib.aod b/process/StandardObject_lib/StandardObject_lib.aod
index ae58a214e8..12ef1e055e 100644
--- a/process/StandardObject_lib/StandardObject_lib.aod
+++ b/process/StandardObject_lib/StandardObject_lib.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>StandardObject_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/StandardObject_lib/documentation.adoc</documentation>
<process>%aditoprj%/process/StandardObject_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Timetracking_lib/Timetracking_lib.aod b/process/Timetracking_lib/Timetracking_lib.aod
index f993357a86..49d8d26cb7 100644
--- a/process/Timetracking_lib/Timetracking_lib.aod
+++ b/process/Timetracking_lib/Timetracking_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Timetracking_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Timetracking_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Util_lib/Util_lib.aod b/process/Util_lib/Util_lib.aod
index c366112be9..3f0c054428 100644
--- a/process/Util_lib/Util_lib.aod
+++ b/process/Util_lib/Util_lib.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Util_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Util_lib/process.js</process>
<variants>
<element>LIBRARY</element>
+ <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/_test_clientProcess/_test_clientProcess.aod b/process/_test_clientProcess/_test_clientProcess.aod
index 71b66312f6..4fdbfec0ae 100644
--- a/process/_test_clientProcess/_test_clientProcess.aod
+++ b/process/_test_clientProcess/_test_clientProcess.aod
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>_test_clientProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/_test_clientProcess/process.js</process>
<alias>Data_alias</alias>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
</process>
diff --git a/process/autostartNeon/autostartNeon.aod b/process/autostartNeon/autostartNeon.aod
index 6db0d823bd..380c018cff 100644
--- a/process/autostartNeon/autostartNeon.aod
+++ b/process/autostartNeon/autostartNeon.aod
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>autostartNeon</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/autostartNeon/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
</process>
diff --git a/process/indexsearch_patternextension/indexsearch_patternextension.aod b/process/indexsearch_patternextension/indexsearch_patternextension.aod
index 21e2ac8d88..ceebbf0ecf 100644
--- a/process/indexsearch_patternextension/indexsearch_patternextension.aod
+++ b/process/indexsearch_patternextension/indexsearch_patternextension.aod
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>indexsearch_patternextension</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
</process>
diff --git a/process/runIndexer_ws/runIndexer_ws.aod b/process/runIndexer_ws/runIndexer_ws.aod
index a3c2f51db7..39b075aeb9 100644
--- a/process/runIndexer_ws/runIndexer_ws.aod
+++ b/process/runIndexer_ws/runIndexer_ws.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>runIndexer_ws</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/runIndexer_ws/process.js</process>
@@ -8,4 +8,8 @@
<loginTypeId>internal.none</loginTypeId>
<restrictedRoles />
<alias>Data_alias</alias>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
</process>
--
GitLab
From dc7c57f80961938ce27db0536ad1e56c1abbaefd Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 07:59:36 +0200
Subject: [PATCH 183/250] set process-variants after project upgrade
---
process/ActivityTask_lib/ActivityTask_lib.aod | 1 -
process/AddressEntity_lib/AddressEntity_lib.aod | 1 -
process/Appointment_lib/Appointment_lib.aod | 1 -
process/Attribute_lib/Attribute_lib.aod | 1 -
process/Binary_lib/Binary_lib.aod | 1 -
process/Calendar_lib/Calendar_lib.aod | 1 -
process/Communication_lib/Communication_lib.aod | 1 -
process/Contact_lib/Contact_lib.aod | 1 -
process/Context_lib/Context_lib.aod | 1 -
process/Contract_lib/Contract_lib.aod | 1 -
process/Data_lib/Data_lib.aod | 1 -
process/Date_lib/Date_lib.aod | 1 -
process/Document_lib/Document_lib.aod | 1 -
process/Employee_lib/Employee_lib.aod | 1 -
process/Entity_lib/Entity_lib.aod | 1 -
process/IndexSearch_lib/IndexSearch_lib.aod | 1 -
process/JditoFilter_lib/JditoFilter_lib.aod | 1 -
process/KeywordRegistry_basic/KeywordRegistry_basic.aod | 1 -
process/Keyword_lib/Keyword_lib.aod | 1 -
process/Money_lib/Money_lib.aod | 1 -
process/Neon_lib/Neon_lib.aod | 1 -
process/ObjectRelation_lib/ObjectRelation_lib.aod | 1 -
process/OfferOrder_lib/OfferOrder_lib.aod | 1 -
process/Offer_lib/Offer_lib.aod | 1 -
process/Order_lib/Order_lib.aod | 1 -
process/Organisation_lib/Organisation_lib.aod | 1 -
process/Person_lib/Person_lib.aod | 1 -
process/PostalAddress_lib/PostalAddress_lib.aod | 1 -
process/Product_lib/Product_lib.aod | 1 -
process/Proto_lib/Proto_lib.aod | 1 -
process/Report_lib/Report_lib.aod | 1 -
process/Salesproject_lib/Salesproject_lib.aod | 1 -
process/Sql_lib/Sql_lib.aod | 1 -
process/StandardObject_lib/StandardObject_lib.aod | 1 -
process/Timetracking_lib/Timetracking_lib.aod | 1 -
process/Util_lib/Util_lib.aod | 1 -
process/_test_clientProcess/_test_clientProcess.aod | 1 -
process/autostartNeon/autostartNeon.aod | 4 ----
.../indexsearch_patternextension.aod | 4 ----
process/runIndexer_ws/runIndexer_ws.aod | 4 ----
40 files changed, 49 deletions(-)
diff --git a/process/ActivityTask_lib/ActivityTask_lib.aod b/process/ActivityTask_lib/ActivityTask_lib.aod
index 7d01cda6f7..141c9c3f93 100644
--- a/process/ActivityTask_lib/ActivityTask_lib.aod
+++ b/process/ActivityTask_lib/ActivityTask_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/ActivityTask_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/AddressEntity_lib/AddressEntity_lib.aod b/process/AddressEntity_lib/AddressEntity_lib.aod
index de356629db..4ecf49e2e7 100644
--- a/process/AddressEntity_lib/AddressEntity_lib.aod
+++ b/process/AddressEntity_lib/AddressEntity_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/AddressEntity_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Appointment_lib/Appointment_lib.aod b/process/Appointment_lib/Appointment_lib.aod
index db268712a0..5b832c601a 100644
--- a/process/Appointment_lib/Appointment_lib.aod
+++ b/process/Appointment_lib/Appointment_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Appointment_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Attribute_lib/Attribute_lib.aod b/process/Attribute_lib/Attribute_lib.aod
index 2d6a04c3c3..7d9936e818 100644
--- a/process/Attribute_lib/Attribute_lib.aod
+++ b/process/Attribute_lib/Attribute_lib.aod
@@ -6,6 +6,5 @@
<alias>Data_alias</alias>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Binary_lib/Binary_lib.aod b/process/Binary_lib/Binary_lib.aod
index bf77c96a98..39de483b5c 100644
--- a/process/Binary_lib/Binary_lib.aod
+++ b/process/Binary_lib/Binary_lib.aod
@@ -6,6 +6,5 @@
<alias>_____SYSTEMALIAS</alias>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Calendar_lib/Calendar_lib.aod b/process/Calendar_lib/Calendar_lib.aod
index f693c32933..ba466c5bf5 100644
--- a/process/Calendar_lib/Calendar_lib.aod
+++ b/process/Calendar_lib/Calendar_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Calendar_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Communication_lib/Communication_lib.aod b/process/Communication_lib/Communication_lib.aod
index ea51bfaa9d..a69299aa2a 100644
--- a/process/Communication_lib/Communication_lib.aod
+++ b/process/Communication_lib/Communication_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Communication_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Contact_lib/Contact_lib.aod b/process/Contact_lib/Contact_lib.aod
index 7bee08bc54..ea8e502001 100644
--- a/process/Contact_lib/Contact_lib.aod
+++ b/process/Contact_lib/Contact_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Contact_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Context_lib/Context_lib.aod b/process/Context_lib/Context_lib.aod
index 0ff636035d..88f0211eac 100644
--- a/process/Context_lib/Context_lib.aod
+++ b/process/Context_lib/Context_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Context_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Contract_lib/Contract_lib.aod b/process/Contract_lib/Contract_lib.aod
index 93435e8d82..f7e066be34 100644
--- a/process/Contract_lib/Contract_lib.aod
+++ b/process/Contract_lib/Contract_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Contract_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Data_lib/Data_lib.aod b/process/Data_lib/Data_lib.aod
index ca60729050..7e6dc0e007 100644
--- a/process/Data_lib/Data_lib.aod
+++ b/process/Data_lib/Data_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Data_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Date_lib/Date_lib.aod b/process/Date_lib/Date_lib.aod
index fea9abd42d..9833cb86c5 100644
--- a/process/Date_lib/Date_lib.aod
+++ b/process/Date_lib/Date_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Date_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Document_lib/Document_lib.aod b/process/Document_lib/Document_lib.aod
index 6fc78e9a60..9f2ede3e40 100644
--- a/process/Document_lib/Document_lib.aod
+++ b/process/Document_lib/Document_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Document_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Employee_lib/Employee_lib.aod b/process/Employee_lib/Employee_lib.aod
index 8f25741e0b..1a08f91b6e 100644
--- a/process/Employee_lib/Employee_lib.aod
+++ b/process/Employee_lib/Employee_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Employee_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Entity_lib/Entity_lib.aod b/process/Entity_lib/Entity_lib.aod
index 119444322b..d106b77a16 100644
--- a/process/Entity_lib/Entity_lib.aod
+++ b/process/Entity_lib/Entity_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Entity_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/IndexSearch_lib/IndexSearch_lib.aod b/process/IndexSearch_lib/IndexSearch_lib.aod
index b01c6469bd..bfc314526e 100644
--- a/process/IndexSearch_lib/IndexSearch_lib.aod
+++ b/process/IndexSearch_lib/IndexSearch_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/IndexSearch_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/JditoFilter_lib/JditoFilter_lib.aod b/process/JditoFilter_lib/JditoFilter_lib.aod
index 393e409204..39f93d7408 100644
--- a/process/JditoFilter_lib/JditoFilter_lib.aod
+++ b/process/JditoFilter_lib/JditoFilter_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/JditoFilter_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
index bee31e709f..f16c2160c9 100644
--- a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
+++ b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/KeywordRegistry_basic/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Keyword_lib/Keyword_lib.aod b/process/Keyword_lib/Keyword_lib.aod
index 3fd8ae7e5c..2dd2a647ff 100644
--- a/process/Keyword_lib/Keyword_lib.aod
+++ b/process/Keyword_lib/Keyword_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Keyword_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Money_lib/Money_lib.aod b/process/Money_lib/Money_lib.aod
index 06754c9fff..9c27e1c6de 100644
--- a/process/Money_lib/Money_lib.aod
+++ b/process/Money_lib/Money_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Money_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Neon_lib/Neon_lib.aod b/process/Neon_lib/Neon_lib.aod
index fe38e58b98..ace4a1e8ec 100644
--- a/process/Neon_lib/Neon_lib.aod
+++ b/process/Neon_lib/Neon_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Neon_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/ObjectRelation_lib/ObjectRelation_lib.aod b/process/ObjectRelation_lib/ObjectRelation_lib.aod
index 72a87d51c0..e5a4d95eb3 100644
--- a/process/ObjectRelation_lib/ObjectRelation_lib.aod
+++ b/process/ObjectRelation_lib/ObjectRelation_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/OfferOrder_lib/OfferOrder_lib.aod b/process/OfferOrder_lib/OfferOrder_lib.aod
index c115c6614e..0df9d9a624 100644
--- a/process/OfferOrder_lib/OfferOrder_lib.aod
+++ b/process/OfferOrder_lib/OfferOrder_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/OfferOrder_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Offer_lib/Offer_lib.aod b/process/Offer_lib/Offer_lib.aod
index dc15d8402d..41247d6242 100644
--- a/process/Offer_lib/Offer_lib.aod
+++ b/process/Offer_lib/Offer_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Offer_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Order_lib/Order_lib.aod b/process/Order_lib/Order_lib.aod
index 594a7071bf..3e225851b1 100644
--- a/process/Order_lib/Order_lib.aod
+++ b/process/Order_lib/Order_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Order_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Organisation_lib/Organisation_lib.aod b/process/Organisation_lib/Organisation_lib.aod
index 4e058400b0..47bca65245 100644
--- a/process/Organisation_lib/Organisation_lib.aod
+++ b/process/Organisation_lib/Organisation_lib.aod
@@ -6,6 +6,5 @@
<alias>Data_alias</alias>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Person_lib/Person_lib.aod b/process/Person_lib/Person_lib.aod
index cd638e09d8..04c0795c9a 100644
--- a/process/Person_lib/Person_lib.aod
+++ b/process/Person_lib/Person_lib.aod
@@ -6,6 +6,5 @@
<alias>_____SYSTEMALIAS</alias>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/PostalAddress_lib/PostalAddress_lib.aod b/process/PostalAddress_lib/PostalAddress_lib.aod
index 76fc147e9f..f7af81f2c9 100644
--- a/process/PostalAddress_lib/PostalAddress_lib.aod
+++ b/process/PostalAddress_lib/PostalAddress_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/PostalAddress_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Product_lib/Product_lib.aod b/process/Product_lib/Product_lib.aod
index e02eb2aba3..9c72fa0f0c 100644
--- a/process/Product_lib/Product_lib.aod
+++ b/process/Product_lib/Product_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Product_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Proto_lib/Proto_lib.aod b/process/Proto_lib/Proto_lib.aod
index 86f04ebbb2..dd8841dc7a 100644
--- a/process/Proto_lib/Proto_lib.aod
+++ b/process/Proto_lib/Proto_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Proto_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Report_lib/Report_lib.aod b/process/Report_lib/Report_lib.aod
index 91c4528ffb..b847e04de6 100644
--- a/process/Report_lib/Report_lib.aod
+++ b/process/Report_lib/Report_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Report_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Salesproject_lib/Salesproject_lib.aod b/process/Salesproject_lib/Salesproject_lib.aod
index bb4aac0563..06956e4270 100644
--- a/process/Salesproject_lib/Salesproject_lib.aod
+++ b/process/Salesproject_lib/Salesproject_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Salesproject_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Sql_lib/Sql_lib.aod b/process/Sql_lib/Sql_lib.aod
index a41ad0693f..be614f7e82 100644
--- a/process/Sql_lib/Sql_lib.aod
+++ b/process/Sql_lib/Sql_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Sql_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/StandardObject_lib/StandardObject_lib.aod b/process/StandardObject_lib/StandardObject_lib.aod
index 12ef1e055e..94c1fcc045 100644
--- a/process/StandardObject_lib/StandardObject_lib.aod
+++ b/process/StandardObject_lib/StandardObject_lib.aod
@@ -6,6 +6,5 @@
<process>%aditoprj%/process/StandardObject_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Timetracking_lib/Timetracking_lib.aod b/process/Timetracking_lib/Timetracking_lib.aod
index 49d8d26cb7..b514721991 100644
--- a/process/Timetracking_lib/Timetracking_lib.aod
+++ b/process/Timetracking_lib/Timetracking_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Timetracking_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/Util_lib/Util_lib.aod b/process/Util_lib/Util_lib.aod
index 3f0c054428..18ccba5128 100644
--- a/process/Util_lib/Util_lib.aod
+++ b/process/Util_lib/Util_lib.aod
@@ -5,6 +5,5 @@
<process>%aditoprj%/process/Util_lib/process.js</process>
<variants>
<element>LIBRARY</element>
- <element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/_test_clientProcess/_test_clientProcess.aod b/process/_test_clientProcess/_test_clientProcess.aod
index 4fdbfec0ae..fed7f21f22 100644
--- a/process/_test_clientProcess/_test_clientProcess.aod
+++ b/process/_test_clientProcess/_test_clientProcess.aod
@@ -5,7 +5,6 @@
<process>%aditoprj%/process/_test_clientProcess/process.js</process>
<alias>Data_alias</alias>
<variants>
- <element>LIBRARY</element>
<element>EXECUTABLE</element>
</variants>
</process>
diff --git a/process/autostartNeon/autostartNeon.aod b/process/autostartNeon/autostartNeon.aod
index 380c018cff..348fc7c6ca 100644
--- a/process/autostartNeon/autostartNeon.aod
+++ b/process/autostartNeon/autostartNeon.aod
@@ -3,8 +3,4 @@
<name>autostartNeon</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/autostartNeon/process.js</process>
- <variants>
- <element>LIBRARY</element>
- <element>EXECUTABLE</element>
- </variants>
</process>
diff --git a/process/indexsearch_patternextension/indexsearch_patternextension.aod b/process/indexsearch_patternextension/indexsearch_patternextension.aod
index ceebbf0ecf..44786e9868 100644
--- a/process/indexsearch_patternextension/indexsearch_patternextension.aod
+++ b/process/indexsearch_patternextension/indexsearch_patternextension.aod
@@ -2,8 +2,4 @@
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>indexsearch_patternextension</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <variants>
- <element>LIBRARY</element>
- <element>EXECUTABLE</element>
- </variants>
</process>
diff --git a/process/runIndexer_ws/runIndexer_ws.aod b/process/runIndexer_ws/runIndexer_ws.aod
index 39b075aeb9..3264bb28ba 100644
--- a/process/runIndexer_ws/runIndexer_ws.aod
+++ b/process/runIndexer_ws/runIndexer_ws.aod
@@ -8,8 +8,4 @@
<loginTypeId>internal.none</loginTypeId>
<restrictedRoles />
<alias>Data_alias</alias>
- <variants>
- <element>LIBRARY</element>
- <element>EXECUTABLE</element>
- </variants>
</process>
--
GitLab
From ca341c2db4e1a2a2b7e40c5828a77556910a84d3 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 08:25:16 +0200
Subject: [PATCH 184/250] prevent duplicate contacts (same ORGANISATION and
PERSON) (2)
---
.../organisation_id/onValidation.js | 20 ++-----
.../organisation_id/onValidation.js | 58 +++++--------------
process/Contact_lib/process.js | 39 +++++++++++++
3 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValidation.js b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
index 320f78dc97..414972ba58 100644
--- a/entity/Contact_entity/entityfields/organisation_id/onValidation.js
+++ b/entity/Contact_entity/entityfields/organisation_id/onValidation.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
import("system.translate");
import("system.result");
import("system.db");
@@ -14,17 +15,8 @@ var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISAT
//TODO: change the workaround behaviour when $local.value is retrieved correct
organisationId = vars.getString("$field.ORGANISATION_ID");
-if (personId)
-{
- if (organisationId == "")
- organisationId = "0";
- var alreadyExistantContactId = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.PERSON_ID", personId)
- .andPrepare("CONTACT.ORGANISATION_ID", organisationId)
- .buildSql("select CONTACT.CONTACTID from CONTACT"));
- if (alreadyExistantContactId != "")
- if (organisationId.trim() == "0")
- result.string(translate.text("This private person doeas already exist and can not be created once more."));
- else
- result.string(translate.text("This combination of person and organisation does already exist and can not be created once more."));
-}
\ No newline at end of file
+//a entry within the Contact_enity can never be edited only created (it's edited within the Person_entity)
+//so no need to provide our own CONTACTID since it does not exist in the database right now => provide null instead
+var validationMsg = ContactUtils.validateIfAlreadyExists(personId, organisationId, null);
+if (validationMsg)
+ result.string(validationMsg);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisation_id/onValidation.js b/entity/Person_entity/entityfields/organisation_id/onValidation.js
index ae01ddc13b..daba90e666 100644
--- a/entity/Person_entity/entityfields/organisation_id/onValidation.js
+++ b/entity/Person_entity/entityfields/organisation_id/onValidation.js
@@ -1,52 +1,22 @@
-import("system.logging");
-import("system.translate");
import("system.result");
-import("system.db");
-import("system.vars");
import("system.neon");
+import("system.vars");
import("Entity_lib");
import("Contact_lib");
-import("Sql_lib");
-//TODO: comment
-//TODO: into lib
-//TODO: use in Contact
-ContactUtils.validateOrganisationId = function(pPersonId, pOrganisationId, pOwnContactId)
+if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
- if (!pPersonId)
- return null;
- if (pOrganisationId == "")
- pOrganisationId = "0";
- var cond = SqlCondition.begin()
- .andPrepare("CONTACT.PERSON_ID", pPersonId)
- .andPrepare("CONTACT.ORGANISATION_ID", pOrganisationId)
- //exclude the own since we do not want a "is not valid"-message for our own entry (on EDIT-mode)
- .andPrepareIfSet("CONTACT.CONTACTID", pOwnContactId, "# != ?");
-
- var sql = cond.buildSql("select CONTACT.CONTACTID from CONTACT");
- var alreadyExistantContactId = db.cell(sql);
- if (alreadyExistantContactId)
- if (pOrganisationId.trim() == "0")
- return translate.text("This private person doeas already exist and can not be created once more.");
- else
- return translate.text("This combination of person and organisation does already exist and can not be created once more.");
+ var personId = vars.getString("$field.PERSONID");
+ var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISATION_ID");
+ var contactId = vars.get("$field.CONTACTID");//in EDIT we have to exclude our own CONTACTID since we do not want a message for our own contactentry
- return null;
-};
-
-
-var personId = vars.getString("$field.PERSONID");
-var organisationId = ProcessHandlingUtils.getOnValidationValue("$field.ORGANISATION_ID");
-var contactId;//in EDIT we have to exclude our own CONTACTID since we do not want a message for our own contactentry
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
- contactId = vars.get("$field.CONTACTID");
-
-//workaround for organisationId: $local.value will return the name of the organisation which is not what we want
-//but the field already contains the changed value; so let's load the field instead of the $local.value-variable
-//this is a bug within the ADITO-kernel
-//TODO: change the workaround behaviour when $local.value is retrieved correct
-organisationId = vars.getString("$field.ORGANISATION_ID");
+ //workaround for organisationId: $local.value will return the name of the organisation which is not what we want
+ //but the field already contains the changed value; so let's load the field instead of the $local.value-variable
+ //this is a bug within the ADITO-kernel
+ //TODO: change the workaround behaviour when $local.value is retrieved correct
+ organisationId = vars.getString("$field.ORGANISATION_ID");
-var validationMsg = ContactUtils.validateOrganisationId(personId, organisationId, contactId);
-if (validationMsg)
- result.string(validationMsg);
\ No newline at end of file
+ var validationMsg = ContactUtils.validateIfAlreadyExists(personId, organisationId, contactId);
+ if (validationMsg)
+ result.string(validationMsg);
+}
\ No newline at end of file
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 9650bbacd2..7539546b86 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.neon");
import("system.vars");
import("system.result");
@@ -34,6 +35,44 @@ OrganisationUtils.getNameByOrganisationId = function(pOrganisationId)
*/
function ContactUtils() {}
+/*
+ * validates if a ORGANISATION_ID in a person-contact is correct [=>does not already exist] or not [=>does already exist]
+ * this is done by checking the database for entires that do already exist with this combination of ORGANISATIONID and PERSONID
+ * gives different messages for private persons and contacts that do already exist
+ *
+ * @param {String} pPersonId the ID of the person that shall be searched in the database
+ * @param {String} pOrganisationId the ID of the organisation that shall be searched in the database;
+ * if this is an empty string it will be treated as private-dummy-organisation
+ * @param {String} [pOwnContactId] the CONTACTID of your current record; this is only needed when in EDIT-mode since you don't want to get a message
+ * for your own CONTACT;
+ * (if you do a lookup if a organisation-person-combination does already exist you'l get your own contact which you want to exclude)
+ *
+ * @return {String} translated text that describes whats the problem or null if there was no problem and everything is fine
+ *
+ */
+ContactUtils.validateIfAlreadyExists = function(pPersonId, pOrganisationId, pOwnContactId)
+{
+ if (!pPersonId)
+ return null;
+ if (pOrganisationId == "")
+ pOrganisationId = "0";
+ var cond = SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPersonId)
+ .andPrepare("CONTACT.ORGANISATION_ID", pOrganisationId)
+ //exclude the own since we do not want a "is not valid"-message for our own entry (on EDIT-mode)
+ .andPrepareIfSet("CONTACT.CONTACTID", pOwnContactId, "# != ?");
+
+ var sql = cond.buildSql("select CONTACT.CONTACTID from CONTACT");
+ var alreadyExistantContactId = db.cell(sql);
+ if (alreadyExistantContactId)
+ if (pOrganisationId.trim() == "0")
+ return translate.text("This private person doeas already exist and can not be created once more.");
+ else
+ return translate.text("This combination of person and organisation does already exist and can not be created once more.");
+
+ return null;
+};
+
/**
* Get the type of contact. <br>
* In recordstate NEW or EDIT it loads the person- / orgid from the db.<br>
--
GitLab
From 917f01157d39d24cc5e257f24531a6d45426aeae Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 09:23:12 +0200
Subject: [PATCH 185/250] Organisation: params in provider more clear
---
entity/Organisation_entity/Organisation_entity.aod | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 9034940ae2..50e97a34e4 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -672,6 +672,18 @@
<name>WithPrivate_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeKeyId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
--
GitLab
From 858f1fbe84e88b7d6417c5f032a284032b70a4bb Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 09:25:35 +0200
Subject: [PATCH 186/250] AnyContact: removed all consumers since they are
unused
---
.../AnyContact_entity/AnyContact_entity.aod | 62 -------------------
.../children/contactid_param/valueProcess.js | 4 --
.../children/contactid_param/valueProcess.js | 4 --
.../children/contactid_param/valueProcess.js | 4 --
.../children/contactid_param/valueProcess.js | 4 --
.../Communication_entity.aod | 12 ----
.../Organisation_entity.aod | 8 ---
entity/Person_entity/Person_entity.aod | 6 --
8 files changed, 104 deletions(-)
delete mode 100644 entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js
delete mode 100644 entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js
delete mode 100644 entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js
delete mode 100644 entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 72bf6904f8..3cad25e214 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -62,36 +62,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
</entityField>
- <entityConsumer>
- <name>Contact</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contact</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Organisations</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityField>
<name>ORGANISATION_NAME</name>
<title>Organisation name</title>
@@ -110,38 +80,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
- <entityConsumer>
- <name>EmailCommunications</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>PhoneCommunications</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>standard email</title>
diff --git a/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js
deleted file mode 100644
index 7b6137b4d1..0000000000
--- a/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js
deleted file mode 100644
index 7b6137b4d1..0000000000
--- a/entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js
deleted file mode 100644
index 7b6137b4d1..0000000000
--- a/entity/AnyContact_entity/entityfields/organisations/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js b/entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js
deleted file mode 100644
index 7b6137b4d1..0000000000
--- a/entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 5bf31e7e5f..8c7e0e773a 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -111,12 +111,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>ddcd3c3d-f305-4ced-a8ac-ffb510474aa4</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -150,12 +144,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>c6e2631a-896f-4689-b254-0091ed25f705</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 50e97a34e4..0f950f13c9 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -122,14 +122,6 @@
<name>Organisations</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 3390ce5317..9d70fe16b1 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -354,12 +354,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
- <entityDependency>
- <name>0b209ee1-3c13-4660-91c4-4d2a2c6cea77</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>Contact</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>12c5350a-3159-449b-a94e-d57658b4c124</name>
<entityName>SalesprojectMember_entity</entityName>
--
GitLab
From ce0636029ba6f613e23c0a2a4ee3e10012a503c3 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 09:28:46 +0200
Subject: [PATCH 187/250] Organisation: removed unused param
---
entity/Organisation_entity/Organisation_entity.aod | 7 -------
.../recordcontainers/db/conditionProcess.js | 3 +--
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 0f950f13c9..db55fdd66a 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -278,13 +278,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
<entityActionField>
<name>openEditDefaultsView</name>
<fieldType>ACTION</fieldType>
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index a42eafd440..8743459e60 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -4,8 +4,7 @@ import("system.result");
import("Sql_lib");
import("Context_lib");
-var cond = SqlCondition.begin()
- .andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param");
+var cond = SqlCondition.begin();
// filter privat company if it is not needed
if (vars.getString("$param.WithPrivate_param") != "true")
--
GitLab
From cffed996df902f88cd96f8a78a2dc0d6c92b2ec6 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 4 Apr 2019 10:01:12 +0200
Subject: [PATCH 188/250] =?UTF-8?q?loggings=20raus=20und=20=C3=9Cbersetzun?=
=?UTF-8?q?gen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../objectid/displayValueProcess.js | 13 +++--
entity/Appointment_entity/afterUiInit.js | 43 ++++++++-------
.../entityfields/summary/valueProcess.js | 54 ++++++++++++-------
entity/Offer_entity/Offer_entity.aod | 2 +-
4 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
index 48efd9fecb..844708f89d 100644
--- a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
@@ -1,8 +1,7 @@
-import("system.logging");
-import("system.db");
-import("system.vars");
-import("system.result");
-import("Context_lib")
-
-logging.log("name??")
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Context_lib")
+
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECTTYPE"), vars.get("$field.OBJECTID"))));
\ No newline at end of file
diff --git a/entity/Appointment_entity/afterUiInit.js b/entity/Appointment_entity/afterUiInit.js
index c47e48d231..4e420da402 100644
--- a/entity/Appointment_entity/afterUiInit.js
+++ b/entity/Appointment_entity/afterUiInit.js
@@ -1,23 +1,22 @@
-import("system.util");
-import("system.neon");
-import("system.logging");
-import("system.vars");
-
-
-
-
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
- var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
- if(entry["AppLinkContext"] && entry["AppLinkId"])
- {
- logging.log("hier geht lohos... " + vars.get("$field.UID") + " id");
- neon.addRecord(null, "AppointmentLinks",
- {
- "AB_APPOINTMENTLINKID" : util.getNewUUID(),
- "OBJECTID" : entry["AppLinkId"],
- "OBJECTTYPE" : entry["AppLinkContext"]
- });
- }
+import("system.util");
+import("system.neon");
+import("system.logging");
+import("system.vars");
+
+
+
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+ var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(entry["AppLinkContext"] && entry["AppLinkId"])
+ {
+ neon.addRecord(null, "AppointmentLinks",
+ {
+ "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+ "OBJECTID" : entry["AppLinkId"],
+ "OBJECTTYPE" : entry["AppLinkContext"]
+ });
+ }
}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/summary/valueProcess.js b/entity/Appointment_entity/entityfields/summary/valueProcess.js
index 72d7fc725d..8fd3d347ca 100644
--- a/entity/Appointment_entity/entityfields/summary/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/summary/valueProcess.js
@@ -1,18 +1,36 @@
-import("system.logging");
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-import("system.result");
-
-/**
- * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
- */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
-{
- logging.log()
-
- var event = JSON.parse(vars.getString("$param.Entry_param"));
-
- if(event[calendars.SUMMARY])
- result.string(event[calendars.SUMMARY]);
-}
\ No newline at end of file
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ logging.log()
+
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.SUMMARY])
+ result.string(event[calendars.SUMMARY]);
+}
+
+
+
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+//{
+// var uiVal = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SUMMARY"));
+// var paramVal = JSON.parse(vars.getString("$param.Entry_param"))[calendars.SUMMARY];
+//
+// logging.log("os: " + vars.get("$sys.operatingstate"));
+// logging.log("rs: " + vars.get("$sys.recordstate"));
+// logging.log("paramVal: " + paramVal);
+// logging.log("uiVal: " + uiVal);
+//
+// if(uiVal === paramVal || !uiVal)
+// result.string(paramVal);
+// else if(uiVal && !uiVal.equals(paramVal))
+// result.string(uiVal);
+//}
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 2e9ed00405..26ca463bb4 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -37,7 +37,7 @@
</entityField>
<entityField>
<name>OFFERDATE</name>
- <title>Creation date</title>
+ <title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
--
GitLab
From 66f755e94f626034f9491ed504447d66e9ed03ef Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 3 Apr 2019 13:35:36 +0200
Subject: [PATCH 189/250] Attribute: type memo removed
---
aliasDefinition/Data_alias/Data_alias.aod | 44 +-
.../AttributeRelation_entity.aod | 20 +-
.../ab_attribute_id/onValueChange.js | 3 +-
.../{bool_value => int_value}/valueProcess.js | 2 +-
.../entityfields/valueproxy/valueProcess.js | 3 +-
.../EmployeeRole_entity.aod | 114 ++--
.../entityfields/role/possibleItemsProcess.js | 15 +-
entity/Employee_entity/Employee_entity.aod | 565 +++++++++---------
.../children/username_param/valueProcess.js | 4 +
.../StoredSelection_entity.aod | 112 ++--
.../recordcontainers/jdito/onDelete.js | 29 +
.../StoredSelectionFilter_view.aod | 53 +-
.../2019.2/AditoBasic/init_AttributeType.xml | 15 -
.../basic/2019.2/AttributeKeyword.xml | 10 +-
process/Attribute_lib/process.js | 16 +-
15 files changed, 509 insertions(+), 496 deletions(-)
rename entity/AttributeRelation_entity/entityfields/{bool_value => int_value}/valueProcess.js (65%)
create mode 100644 entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js
create mode 100644 entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 4c3d0ca72f..0c33b0d95f 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4576,20 +4576,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>BOOL_VALUE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_VALUE</name>
<dbName></dbName>
@@ -4651,7 +4637,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="63" />
+ <size v="512" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -4688,20 +4674,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>MEMO_VALUE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
@@ -4758,6 +4730,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>INT_VALUE</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/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index e6588fbe36..d06a6101b3 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -131,10 +131,10 @@
<description>PARAMETER</description>
</entityParameter>
<entityField>
- <name>BOOL_VALUE</name>
+ <name>INT_VALUE</name>
<contentType>BOOLEAN</contentType>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ID_VALUE</name>
@@ -169,10 +169,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>MEMO_VALUE</name>
- <searchable v="false" />
- </entityField>
<entityParameter>
<name>FilteredAttributeIds_param</name>
<expose v="true" />
@@ -278,10 +274,6 @@
<name>NUMBER_VALUE.value</name>
<recordfield>AB_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>BOOL_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ID_VALUE.value</name>
<recordfield>AB_ATTRIBUTERELATION.ID_VALUE</recordfield>
@@ -290,10 +282,6 @@
<name>ATTRIBUTE_PARENT_ID.value</name>
<recordfield>AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MEMO_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.MEMO_VALUE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>AB_ATTRIBUTERELATION.USER_NEW</recordfield>
@@ -310,6 +298,10 @@
<name>DATE_EDIT.value</name>
<recordfield>AB_ATTRIBUTERELATION.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INT_VALUE.value</name>
+ <recordfield>AB_ATTRIBUTERELATION.INT_VALUE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
index 9347efa6c0..132c9bbe34 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
@@ -3,10 +3,9 @@ import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
- neon.setFieldValue("$field.BOOL_VALUE", null);
+ neon.setFieldValue("$field.INT_VALUE", null);
neon.setFieldValue("$field.CHAR_VALUE", null);
neon.setFieldValue("$field.DATE_VALUE", null);
neon.setFieldValue("$field.ID_VALUE", null);
neon.setFieldValue("$field.NUMBER_VALUE", null);
- neon.setFieldValue("$field.MEMO_VALUE", null);
}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
similarity index 65%
rename from entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js
rename to entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
index c5937313ed..91ca68074f 100644
--- a/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-if(!vars.get("$field.BOOL_VALUE"))
+if(!vars.get("$field.INT_VALUE"))
result.string("0");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
index f1d1025828..bea46eecb1 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
@@ -6,9 +6,8 @@ import("Attribute_lib");
"$field.CHAR_VALUE";
"$field.DATE_VALUE";
"$field.NUMBER_VALUE";
-"$field.BOOL_VALUE";
+"$field.INT_VALUE";
"$field.ID_VALUE";
-"$field.MEMO_VALUE";
if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index db73c36b4c..634f8e557f 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,56 +1,58 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>EmployeeRole_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>EmployeeRoles</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
- <entityName>Employee_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>ROLE</name>
- <title>Role</title>
- <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ROLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>EmployeeRole_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>EmployeeRoles</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>ROLE</name>
+ <title>Role</title>
+ <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>ROLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js b/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
index a9b4b9a616..6c9d51db74 100644
--- a/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
+++ b/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
@@ -1,10 +1,23 @@
+import("system.vars");
import("system.result");
import("system.tools");
var roles = [];
var allRoles = tools.getAllRoles([tools.ROLE_INTERNAL, tools.ROLE_PROJECT, tools.ROLE_XMPP]);
+var excludeRoles = {
+ "INTERNAL_GROUPWARE" : true,
+ "INTERNAL_SNMP" : true,
+ "INTERNAL_DESIGNER" : true,
+ "INTERNAL_TECHNICAL" : true
+};
+
+var userRoles = tools.getRoles(vars.get("$param.UserTitle_param"));
+for (let i in userRoles)
+ if (vars.get("$field.ROLE") != userRoles[i])
+ excludeRoles[userRoles[i]] = true;
for (let roleId in allRoles)
- roles.push([roleId, allRoles[roleId][0]])
+ if (!excludeRoles[roleId])
+ roles.push([roleId, allRoles[roleId][0]]);
result.object(roles);
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 6ec492b15b..c4d400c893 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,280 +1,285 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>Employee_entity</name>
- <title>Employee</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
- <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
- <iconId>VAADIN:GROUP</iconId>
- <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <lookupIdfield>CONTACT_ID</lookupIdfield>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <title>Username</title>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/uid/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>TITLE_ORIGINAL</name>
- <description>the original username, this is required to update the correct user when the username is changed</description>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <title>Person</title>
- <consumer>Contacts</consumer>
- <linkedContext>Person</linkedContext>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>FIRSTNAME</name>
- <title>Firstname</title>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/firstname/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LASTNAME</name>
- <title>Lastname</title>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ISACTIVE</name>
- <title>Active</title>
- <contentType>BOOLEAN</contentType>
- <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>EMAIL_ADDRESS</name>
- <title>Email</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>PASSWORD</name>
- <title>Password</title>
- <contentType>PASSWORD</contentType>
- <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
- </entityField>
- <entityField>
- <name>CONFIRM_PASSWORD</name>
- <title>Confirm password</title>
- <contentType>PASSWORD</contentType>
- <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
- </entityField>
- <entityActionField>
- <name>setPassword</name>
- <fieldType>ACTION</fieldType>
- <title>Set password</title>
- <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PASSWORD</iconId>
- </entityActionField>
- <entityParameter>
- <name>PasswordChange_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Contacts</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Attributes</name>
- <title>Attributes</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityFieldGroup>
- <name>NAME_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
- <title>Name</title>
- <description>FIELDGROUP</description>
- <fields>
- <element>FIRSTNAME</element>
- <element>LASTNAME</element>
- </fields>
- </entityFieldGroup>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>DEPARTMENT</name>
- <title>Department</title>
- <state>INVISIBLE</state>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityField>
- <name>ROLES</name>
- </entityField>
- <entityConsumer>
- <name>EmployeeRoles</name>
- <title>Roles</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>EmployeeRole_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
- <title>Attribute Tree</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Documents</name>
- <title>Documents</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>StoredSelections</name>
- <title>Stored selections</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>StoredSelection_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Base64String_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>STORED_SELECTIONS</name>
- <searchable v="false" />
- </entityField>
- <entityProvider>
- <name>Employees</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>TITLE_ORIGINAL.value</element>
- <element>ISACTIVE.value</element>
- <element>FIRSTNAME.value</element>
- <element>LASTNAME.value</element>
- <element>EMAIL_ADDRESS.value</element>
- <element>DESCRIPTION.value</element>
- <element>CONTACT_ID.value</element>
- <element>CONTACT_ID.displayValue</element>
- <element>STORED_SELECTIONS.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>Employee_entity</name>
+ <title>Employee</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
+ <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
+ <iconId>VAADIN:GROUP</iconId>
+ <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <lookupIdfield>CONTACT_ID</lookupIdfield>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <title>Username</title>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/uid/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>TITLE_ORIGINAL</name>
+ <description>the original username, this is required to update the correct user when the username is changed</description>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <title>Person</title>
+ <consumer>Contacts</consumer>
+ <linkedContext>Person</linkedContext>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>FIRSTNAME</name>
+ <title>Firstname</title>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/firstname/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LASTNAME</name>
+ <title>Lastname</title>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EMAIL_ADDRESS</name>
+ <title>Email</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>PASSWORD</name>
+ <title>Password</title>
+ <contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
+ </entityField>
+ <entityField>
+ <name>CONFIRM_PASSWORD</name>
+ <title>Confirm password</title>
+ <contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
+ </entityField>
+ <entityActionField>
+ <name>setPassword</name>
+ <fieldType>ACTION</fieldType>
+ <title>Set password</title>
+ <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PASSWORD</iconId>
+ </entityActionField>
+ <entityParameter>
+ <name>PasswordChange_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Contacts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityFieldGroup>
+ <name>NAME_fieldGroup</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+ <title>Name</title>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>FIRSTNAME</element>
+ <element>LASTNAME</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DEPARTMENT</name>
+ <title>Department</title>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>ROLES</name>
+ </entityField>
+ <entityConsumer>
+ <name>EmployeeRoles</name>
+ <title>Roles</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>EmployeeRole_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <title>Documents</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>StoredSelections</name>
+ <title>Stored selections</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>StoredSelection_entity</entityName>
+ <fieldName>StoredSelections</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Base64String_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>UserName_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>STORED_SELECTIONS</name>
+ <searchable v="false" />
+ </entityField>
+ <entityProvider>
+ <name>Employees</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <lookupIdfield>CONTACT_ID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>TITLE_ORIGINAL.value</element>
+ <element>ISACTIVE.value</element>
+ <element>FIRSTNAME.value</element>
+ <element>LASTNAME.value</element>
+ <element>EMAIL_ADDRESS.value</element>
+ <element>DESCRIPTION.value</element>
+ <element>CONTACT_ID.value</element>
+ <element>CONTACT_ID.displayValue</element>
+ <element>STORED_SELECTIONS.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js b/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js
new file mode 100644
index 0000000000..2c71e53a49
--- /dev/null
+++ b/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/StoredSelection_entity/StoredSelection_entity.aod b/entity/StoredSelection_entity/StoredSelection_entity.aod
index 66698e0d50..59114c2e09 100644
--- a/entity/StoredSelection_entity/StoredSelection_entity.aod
+++ b/entity/StoredSelection_entity/StoredSelection_entity.aod
@@ -1,53 +1,59 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>StoredSelection_entity</name>
- <title>Stored selections</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>Base64String_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>StoredSelections</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>1386345f-0ed8-4c82-b96d-a249775314ee</name>
- <entityName>Employee_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CONTEXT_NAME</name>
- <title>Module</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>SELECTION_TITLE</name>
- <title>Name</title>
- <state>READONLY</state>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <contentProcess>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>CONTEXT_NAME.value</element>
- <element>SELECTION_TITLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>StoredSelection_entity</name>
+ <title>Stored selections</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>Base64String_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>StoredSelections</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>1386345f-0ed8-4c82-b96d-a249775314ee</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>StoredSelections</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CONTEXT_NAME</name>
+ <title>Module</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>SELECTION_TITLE</name>
+ <title>Name</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityParameter>
+ <name>UserName_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <contentProcess>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onDelete>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>CONTEXT_NAME.value</element>
+ <element>SELECTION_TITLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js b/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000..cf864004f9
--- /dev/null
+++ b/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,29 @@
+import("system.util");
+import("system.pack");
+import("system.vars");
+import("system.tools");
+import("Employee_lib");
+
+var userName = vars.exists("$param.UserName_param") && vars.get("$param.UserName_param");
+var contextName = vars.get("$field.CONTEXT_NAME");
+var selectionTitle = vars.get("$field.SELECTION_TITLE");
+
+if (vars.exists("$param.Base64String_param") && vars.get("$param.Base64String_param") && user && tools.existUsers(user))
+{
+ var user;
+ if (userName == EmployeeUtils.getCurrentUserName())
+ user = tools.getCurrentUser();
+ else
+ user = tools.getUser(userName, tools.PROFILE_FULL);
+
+ var codedSelections = pack.gunzip(vars.get("$param.Base64String_param"));
+ var selections = new XML(util.decodeBase64String(codedSelections));
+ delete selections.FRAME.(NAME == contextName).STORE.(ID == "#STORE_SAVED").ELEMENT.(TITLE == selectionTitle)[0];
+
+ user[tools.PARAMS][tools.FRAME_STOREDSEARCHES] = pack.gzip(util.encodeBase64String(selections.toString()));
+
+ if (userName == EmployeeUtils.getCurrentUserName())
+ tools.updateCurrentUser(user)
+ else
+ tools.updateUser(user);
+}
\ No newline at end of file
diff --git a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
index 0fc464bb78..9974513f1b 100644
--- a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
+++ b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
@@ -1,26 +1,27 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>StoredSelectionFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Table</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>713574de-2d9c-4006-93a3-3860fb145c26</name>
- <entityField>CONTEXT_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc4d5ff-24cf-46d9-9941-cda11e445a17</name>
- <entityField>SELECTION_TITLE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>StoredSelectionFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <isEditable v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>713574de-2d9c-4006-93a3-3860fb145c26</name>
+ <entityField>CONTEXT_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4cc4d5ff-24cf-46d9-9941-cda11e445a17</name>
+ <entityField>SELECTION_TITLE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
index 99852b24f7..d9d8b0d5c9 100644
--- a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
@@ -17,15 +17,6 @@
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="1fa94dc3-b875-4e95-9ec1-8cb714f058fb"/>
- <column name="KEYID" value="MEMO"/>
- <column name="TITLE" value="Memo"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="8"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="1"/>
- </insert>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
@@ -33,12 +24,6 @@
<param value="9d2f9605-1a5e-47d3-8920-168f5637e37f"/>
</whereParams>
</delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="1fa94dc3-b875-4e95-9ec1-8cb714f058fb"/>
- </whereParams>
- </delete>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml b/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
index 0186627b55..272ae0c6a2 100644
--- a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
@@ -3,16 +3,16 @@
<changeSet author="s.listl" id="f527a5cc-f1e5-497f-a069-33aee944d421">
<addColumn tableName="AB_ATTRIBUTE">
<column name="KEYWORD_CONTAINER" type="VARCHAR(80)"/>
- </addColumn>
- <addColumn tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_INFO" type="NCLOB"/>
- </addColumn>
- <addColumn tableName="AB_ATTRIBUTE">
<column name="SORTING" type="INTEGER"/>
</addColumn>
<addColumn tableName="AB_ATTRIBUTERELATION">
- <column name="MEMO_VALUE" type="NCLOB"/>
+ <column name="INT_VALUE" type="INTEGER"/>
</addColumn>
+ <dropColumn tableName="AB_ATTRIBUTERELATION">
+ <column name="BOOL_VALUE"/>
+ </dropColumn>
+ <modifyDataType tableName="AB_ATTRIBUTERELATION" columnName="CHAR_VALUE" newDataType="NVARCHAR(512)"/>
<createIndex indexName="IDX_ATTRPARENT" tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_PARENT_ID"/>
</createIndex>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 08b0fba8f9..1427b7f21a 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -51,8 +51,8 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
attrCond.andSqlCondition(filteredIdsCondition);
}
- if (!pIncludeGroups)
- attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
+// if (!pIncludeGroups)
+// attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql));
@@ -377,8 +377,8 @@ $AttributeTypes.BOOLEAN = {
toString : function () {return this.keyword},
keyword : "BOOLEAN",
contentType : "BOOLEAN",
- databaseField : "BOOL_VALUE",
- entityField : "BOOL_VALUE",
+ databaseField : "INT_VALUE",
+ entityField : "INT_VALUE",
getViewValue : function (pValue)
{
return pValue == "1" ? translate.text("Yes") : translate.text("No");
@@ -416,14 +416,6 @@ $AttributeTypes.KEYWORD = {
return KeywordUtils.getViewValue(pKeyword, pValue);
}
};
-$AttributeTypes.MEMO = {
- toString : function () {return this.keyword},
- keyword : "MEMO",
- contentType : "TEXT",
- databaseField : "MEMO_VALUE",
- entityField : "MEMO_VALUE"
-};
-
function AttributeTypeUtil () {}
--
GitLab
From 4a2b3a4c41a64c748be70dd86b12911d775c2009 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 4 Apr 2019 11:56:39 +0200
Subject: [PATCH 190/250] Employee preset email, roles added
---
.../entityfields/role/possibleItemsProcess.js | 14 ++--
entity/Employee_entity/Employee_entity.aod | 48 ++++-------
.../objectrowid_param/valueProcess.js | 2 +-
.../objectrowid_param/valueProcess.js | 2 +-
.../assignmentrowid_param/valueProcess.js | 2 +-
.../email_address/onValidation.js | 10 +++
.../email_address/possibleItemsProcess.js | 30 +++++++
.../email_address/valueProcess.js | 17 ++++
.../entityfields/firstname/valueProcess.js | 4 +-
.../entityfields/isactive/valueProcess.js | 2 +-
.../entityfields/lastname/valueProcess.js | 4 +-
.../base64string_param/valueProcess.js | 4 -
.../children/username_param/valueProcess.js | 4 -
.../{uid => title}/onValidation.js | 4 +-
.../entityfields/title/valueProcess.js | 7 ++
.../entityfields/uid/valueProcess.js | 7 ++
.../recordcontainers/jdito/contentProcess.js | 5 +-
.../recordcontainers/jdito/onDelete.js | 4 +-
.../recordcontainers/jdito/onInsert.js | 3 +-
.../recordcontainers/jdito/onUpdate.js | 5 +-
.../StoredSelection_entity.aod | 59 -------------
.../recordcontainers/jdito/contentProcess.js | 28 -------
.../recordcontainers/jdito/onDelete.js | 29 -------
.../_____LANGUAGE_EXTRA.aod | 30 +++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 41 +++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 30 +++++++
.../StoredSelection/StoredSelection.aod | 12 ---
.../EmployeeEdit_view/EmployeeEdit_view.aod | 12 +--
.../EmployeeFilter_view.aod | 2 +-
.../EmployeeMain_view/EmployeeMain_view.aod | 5 --
.../EmployeePreview_view.aod | 2 +-
.../StoredSelectionFilter_view.aod | 27 ------
process/Employee_lib/process.js | 83 +++++++++++++++++++
.../PROJECT_Administrator.aod | 6 ++
role/PROJECT_Everyone/PROJECT_Everyone.aod | 6 ++
.../PROJECT_FieldStaff/PROJECT_FieldStaff.aod | 6 ++
.../PROJECT_HumanResources.aod | 6 ++
role/PROJECT_Marketing/PROJECT_Marketing.aod | 6 ++
.../PROJECT_OfficeStaff.aod | 6 ++
role/PROJECT_Project/PROJECT_Project.aod | 6 ++
.../PROJECT_ProjectManagement.aod | 6 ++
role/PROJECT_Resource/PROJECT_Resource.aod | 6 ++
role/PROJECT_Service/PROJECT_Service.aod | 6 ++
role/PROJECT_Support/PROJECT_Support.aod | 6 ++
44 files changed, 376 insertions(+), 228 deletions(-)
create mode 100644 entity/Employee_entity/entityfields/email_address/onValidation.js
create mode 100644 entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
create mode 100644 entity/Employee_entity/entityfields/email_address/valueProcess.js
delete mode 100644 entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
delete mode 100644 entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js
rename entity/Employee_entity/entityfields/{uid => title}/onValidation.js (69%)
create mode 100644 entity/Employee_entity/entityfields/title/valueProcess.js
create mode 100644 entity/Employee_entity/entityfields/uid/valueProcess.js
delete mode 100644 entity/StoredSelection_entity/StoredSelection_entity.aod
delete mode 100644 entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
delete mode 100644 entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js
delete mode 100644 neonContext/StoredSelection/StoredSelection.aod
delete mode 100644 neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
create mode 100644 role/PROJECT_Administrator/PROJECT_Administrator.aod
create mode 100644 role/PROJECT_Everyone/PROJECT_Everyone.aod
create mode 100644 role/PROJECT_FieldStaff/PROJECT_FieldStaff.aod
create mode 100644 role/PROJECT_HumanResources/PROJECT_HumanResources.aod
create mode 100644 role/PROJECT_Marketing/PROJECT_Marketing.aod
create mode 100644 role/PROJECT_OfficeStaff/PROJECT_OfficeStaff.aod
create mode 100644 role/PROJECT_Project/PROJECT_Project.aod
create mode 100644 role/PROJECT_ProjectManagement/PROJECT_ProjectManagement.aod
create mode 100644 role/PROJECT_Resource/PROJECT_Resource.aod
create mode 100644 role/PROJECT_Service/PROJECT_Service.aod
create mode 100644 role/PROJECT_Support/PROJECT_Support.aod
diff --git a/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js b/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
index 6c9d51db74..e52145c801 100644
--- a/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
+++ b/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
@@ -1,7 +1,9 @@
+import("system.translate");
import("system.vars");
import("system.result");
import("system.tools");
+var selectedRole = vars.get("$field.ROLE");
var roles = [];
var allRoles = tools.getAllRoles([tools.ROLE_INTERNAL, tools.ROLE_PROJECT, tools.ROLE_XMPP]);
var excludeRoles = {
@@ -11,13 +13,15 @@ var excludeRoles = {
"INTERNAL_TECHNICAL" : true
};
-var userRoles = tools.getRoles(vars.get("$param.UserTitle_param"));
-for (let i in userRoles)
- if (vars.get("$field.ROLE") != userRoles[i])
+if (tools.existUsers(vars.get("$param.UserTitle_param")))
+{
+ var userRoles = tools.getRoles(vars.get("$param.UserTitle_param"));
+ for (let i in userRoles)
excludeRoles[userRoles[i]] = true;
+}
for (let roleId in allRoles)
- if (!excludeRoles[roleId])
- roles.push([roleId, allRoles[roleId][0]]);
+ if (!excludeRoles[roleId] || roleId == selectedRole)
+ roles.push([roleId, translate.text(allRoles[roleId][0])]);
result.object(roles);
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index c4d400c893..c1a5ae6a1c 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -15,14 +15,15 @@
</entityProvider>
<entityField>
<name>UID</name>
- <title>Username</title>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/uid/onValidation.js</onValidation>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/uid/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>TITLE_ORIGINAL</name>
- <description>the original username, this is required to update the correct user when the username is changed</description>
- <searchable v="false" />
+ <name>TITLE</name>
+ <title>Username</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/title/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/title/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CONTACT_ID</name>
@@ -40,6 +41,7 @@
<entityField>
<name>LASTNAME</name>
<title>Lastname</title>
+ <mandatory v="false" />
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -53,6 +55,10 @@
<name>EMAIL_ADDRESS</name>
<title>Email</title>
<mandatory v="true" />
+ <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/email_address/onValidation.js</onValidation>
</entityField>
<entityField>
<name>PASSWORD</name>
@@ -210,30 +216,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>StoredSelections</name>
- <title>Stored selections</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>StoredSelection_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Base64String_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>UserName_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>STORED_SELECTIONS</name>
- <searchable v="false" />
- </entityField>
<entityProvider>
<name>Employees</name>
<fieldType>DEPENDENCY_IN</fieldType>
@@ -259,6 +241,10 @@
</entityParameter>
</children>
</entityProvider>
+ <entityField>
+ <name>TITLE_ORIGINAL</name>
+ <searchable v="false" />
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -270,11 +256,13 @@
<onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
+ <element>TITLE.value</element>
<element>TITLE_ORIGINAL.value</element>
<element>ISACTIVE.value</element>
<element>FIRSTNAME.value</element>
<element>LASTNAME.value</element>
<element>EMAIL_ADDRESS.value</element>
+ <element>EMAIL_ADDRESS.displayValue</element>
<element>DESCRIPTION.value</element>
<element>CONTACT_ID.value</element>
<element>CONTACT_ID.displayValue</element>
diff --git a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index ef0d5bcac5..16c85500b5 100644
--- a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
index ef0d5bcac5..16c85500b5 100644
--- a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
index ef0d5bcac5..16c85500b5 100644
--- a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/onValidation.js b/entity/Employee_entity/entityfields/email_address/onValidation.js
new file mode 100644
index 0000000000..f6a829134c
--- /dev/null
+++ b/entity/Employee_entity/entityfields/email_address/onValidation.js
@@ -0,0 +1,10 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("system.tools");
+import("Entity_lib");
+
+var email = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.EMAIL_ADDRESS"));
+if (email != "" && tools.getUsersByAttribute(tools.EMAIL, [email]).length)
+ result.string(translate.text("Email must be unique!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js b/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
new file mode 100644
index 0000000000..a171cd824e
--- /dev/null
+++ b/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
@@ -0,0 +1,30 @@
+import("Communication_lib");
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("COMMUNICATION.CONTACT_ID", contactId)
+ .and("COMMUNICATION.MEDIUM_ID in ('" + CommUtil.getMediumIdsByCategory("EMAIL").join("', '") + "')")
+ .buildSql("select ADDR, ADDR from COMMUNICATION");
+
+ var addresses = db.table(sql);
+
+ //include the currently set email address
+ var currentAddress = vars.get("$field.EMAIL_ADDRESS");
+ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && currentAddress
+ && !addresses.some(function (row) {return row[0] == currentAddress;}))
+ {
+ addresses.push([currentAddress, currentAddress]);
+ }
+
+ result.object(addresses);
+}
+else
+ result.object([])
diff --git a/entity/Employee_entity/entityfields/email_address/valueProcess.js b/entity/Employee_entity/entityfields/email_address/valueProcess.js
new file mode 100644
index 0000000000..7931dce1d6
--- /dev/null
+++ b/entity/Employee_entity/entityfields/email_address/valueProcess.js
@@ -0,0 +1,17 @@
+import("system.result");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+import("Communication_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId && !vars.get("$field.EMAIL_ADDRESS"))
+{
+ var defaultMail = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select (" + CommUtil.getStandardSubSqlMail() + ") from CONTACT")
+ );
+ result.string(defaultMail);
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/firstname/valueProcess.js b/entity/Employee_entity/entityfields/firstname/valueProcess.js
index 310fb8ddc8..f118b02d96 100644
--- a/entity/Employee_entity/entityfields/firstname/valueProcess.js
+++ b/entity/Employee_entity/entityfields/firstname/valueProcess.js
@@ -5,8 +5,8 @@ import("system.vars");
import("Sql_lib");
var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
- && contactId)
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId && !vars.get("$field.FIRSTNAME"))
{
var firstname = db.cell(SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", contactId)
diff --git a/entity/Employee_entity/entityfields/isactive/valueProcess.js b/entity/Employee_entity/entityfields/isactive/valueProcess.js
index 7993af1a5f..86ff56f08f 100644
--- a/entity/Employee_entity/entityfields/isactive/valueProcess.js
+++ b/entity/Employee_entity/entityfields/isactive/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
import("system.vars");
import("system.result");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("true");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/lastname/valueProcess.js b/entity/Employee_entity/entityfields/lastname/valueProcess.js
index 5913681662..d0f5d394fa 100644
--- a/entity/Employee_entity/entityfields/lastname/valueProcess.js
+++ b/entity/Employee_entity/entityfields/lastname/valueProcess.js
@@ -5,8 +5,8 @@ import("system.vars");
import("Sql_lib");
var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
- && contactId)
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId && !vars.get("$field.LASTNAME"))
{
var lastname = db.cell(SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", contactId)
diff --git a/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js b/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
deleted file mode 100644
index 8d34e510f8..0000000000
--- a/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.STORED_SELECTIONS"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js b/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js
deleted file mode 100644
index 2c71e53a49..0000000000
--- a/entity/Employee_entity/entityfields/storedselections/children/username_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/uid/onValidation.js b/entity/Employee_entity/entityfields/title/onValidation.js
similarity index 69%
rename from entity/Employee_entity/entityfields/uid/onValidation.js
rename to entity/Employee_entity/entityfields/title/onValidation.js
index e6c2cc26a8..b7a2177b02 100644
--- a/entity/Employee_entity/entityfields/uid/onValidation.js
+++ b/entity/Employee_entity/entityfields/title/onValidation.js
@@ -5,7 +5,7 @@ import("system.vars");
import("system.tools");
import("Entity_lib");
-var title = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.UID"));
-if (!(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && title == vars.get("$field.TITLE_ORIGINAL"))
+var title = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.TITLE"));
+if (!(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && title == vars.get("$field.TITLE_ORIGINAL"))
&& title != "" && tools.existUsers(title))
result.string(translate.text("Username already exists!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/title/valueProcess.js b/entity/Employee_entity/entityfields/title/valueProcess.js
new file mode 100644
index 0000000000..058b37c3c1
--- /dev/null
+++ b/entity/Employee_entity/entityfields/title/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$field.TITLE"))
+ result.string(EmployeeUtils.generateUserName(vars.get("$field.FIRSTNAME"), vars.get("$field.LASTNAME"), "f.l+"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/uid/valueProcess.js b/entity/Employee_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000..4e2c2abf86
--- /dev/null
+++ b/entity/Employee_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && vars.get("$field.TITLE"))
+ result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index bd4a9109ac..f40cbd25c0 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -4,6 +4,7 @@ import("system.tools");
import("Util_lib");
import("Contact_lib");
import("JditoFilter_lib");
+import("Employee_lib");
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -19,12 +20,14 @@ else
users = users.map(function (user)
{
return [
+ user[tools.TITLE],
user[tools.TITLE],
user[tools.TITLE],
user[tools.PARAMS][tools.ISACTIVE],
user[tools.PARAMS][tools.FIRSTNAME],
user[tools.PARAMS][tools.LASTNAME],
user[tools.PARAMS][tools.EMAIL],
+ user[tools.PARAMS][tools.EMAIL],
user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
@@ -35,7 +38,7 @@ users = users.map(function (user)
var filter = vars.exists("$local.filter") && vars.get("$local.filter");
//TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
-users = JditoFilterUtils.filterRecords(["UID", "", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", "", ], users, filter);
+users = JditoFilterUtils.filterRecords(["UID", "TITLE", "TITLE_ORIGINAL", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", ""], users, filter);
ArrayUtils.sort2d(users, 0, true, false); //sort by username
diff --git a/entity/Employee_entity/recordcontainers/jdito/onDelete.js b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
index 0845913145..212b6d2313 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
@@ -4,5 +4,5 @@ import("system.tools");
import("Employee_lib");
//TODO: the current user should not delete himself, put this condition in grantDelete when available
-if (EmployeeUtils.getCurrentUserName() != vars.get("$field.UID"))
- tools.deleteUser(vars.get("$field.UID"));
\ No newline at end of file
+if (EmployeeUtils.getCurrentUserName() != vars.get("$field.TITLE") && !EmployeeUtils.hasRelations(vars.get("$field.CONTACT_ID")))
+ tools.deleteUser(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index 21f772e8ce..9d7e0fddbe 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -1,6 +1,7 @@
import("system.neon");
import("system.vars");
import("system.tools");
+import("Employee_lib");
var user = {};
var params = []; //this has to be an array
@@ -12,7 +13,7 @@ params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
params[tools.ISACTIVE] = vars.get("$field.ISACTIVE");
-user[tools.TITLE] = vars.get("$field.UID");
+user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS] = params;
if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 03a003f263..6818acfd62 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -18,10 +18,9 @@ FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
PersUtils.removeImage(personId);
});
-var user = {};
-user[tools.PARAMS] = [];
+var user = tools.getUser(vars.get("$field.TITLE_ORIGINAL"));
-user[tools.TITLE] = vars.get("$field.UID");
+user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
diff --git a/entity/StoredSelection_entity/StoredSelection_entity.aod b/entity/StoredSelection_entity/StoredSelection_entity.aod
deleted file mode 100644
index 59114c2e09..0000000000
--- a/entity/StoredSelection_entity/StoredSelection_entity.aod
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>StoredSelection_entity</name>
- <title>Stored selections</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>Base64String_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>StoredSelections</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>1386345f-0ed8-4c82-b96d-a249775314ee</name>
- <entityName>Employee_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CONTEXT_NAME</name>
- <title>Module</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>SELECTION_TITLE</name>
- <title>Name</title>
- <state>READONLY</state>
- </entityField>
- <entityParameter>
- <name>UserName_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <contentProcess>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onDelete>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>CONTEXT_NAME.value</element>
- <element>SELECTION_TITLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js b/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index d92a27b39c..0000000000
--- a/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("system.result");
-import("system.pack");
-import("system.util");
-import("system.vars");
-
-var records = [];
-if (vars.exists("$param.Base64String_param") && vars.get("$param.Base64String_param"))
-{
- var codedSelections = pack.gunzip(vars.get("$param.Base64String_param"));
-
- var selections = new XML(util.decodeBase64String(codedSelections));
- selections = selections.FRAME;
- for (let i in selections)
- {
- context = selections[i];
- var contextName = context.NAME;
- if (contextName)
- {
- var title = context.STORE.(ID == "#STORE_SAVED").ELEMENT.TITLE;
- for (let ii in title)
- {
- records.push([(contextName + title[ii]), contextName, title[ii]]);
- }
- }
- }
-}
-
-result.object(records);
\ No newline at end of file
diff --git a/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js b/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js
deleted file mode 100644
index cf864004f9..0000000000
--- a/entity/StoredSelection_entity/recordcontainers/jdito/onDelete.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import("system.util");
-import("system.pack");
-import("system.vars");
-import("system.tools");
-import("Employee_lib");
-
-var userName = vars.exists("$param.UserName_param") && vars.get("$param.UserName_param");
-var contextName = vars.get("$field.CONTEXT_NAME");
-var selectionTitle = vars.get("$field.SELECTION_TITLE");
-
-if (vars.exists("$param.Base64String_param") && vars.get("$param.Base64String_param") && user && tools.existUsers(user))
-{
- var user;
- if (userName == EmployeeUtils.getCurrentUserName())
- user = tools.getCurrentUser();
- else
- user = tools.getUser(userName, tools.PROFILE_FULL);
-
- var codedSelections = pack.gunzip(vars.get("$param.Base64String_param"));
- var selections = new XML(util.decodeBase64String(codedSelections));
- delete selections.FRAME.(NAME == contextName).STORE.(ID == "#STORE_SAVED").ELEMENT.(TITLE == selectionTitle)[0];
-
- user[tools.PARAMS][tools.FRAME_STOREDSEARCHES] = pack.gzip(util.encodeBase64String(selections.toString()));
-
- if (userName == EmployeeUtils.getCurrentUserName())
- tools.updateCurrentUser(user)
- else
- tools.updateUser(user);
-}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 6c31d77bfa..73af0d0247 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2688,6 +2688,36 @@
<entry>
<key>This private person doeas already exist and can not be created once more.</key>
</entry>
+ <entry>
+ <key>Everyone</key>
+ </entry>
+ <entry>
+ <key>Project</key>
+ </entry>
+ <entry>
+ <key>Human resources</key>
+ </entry>
+ <entry>
+ <key>Project management</key>
+ </entry>
+ <entry>
+ <key>Office staff</key>
+ </entry>
+ <entry>
+ <key>Field staff</key>
+ </entry>
+ <entry>
+ <key>Resource</key>
+ </entry>
+ <entry>
+ <key>Human Resources</key>
+ </entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
+ <entry>
+ <key>Note</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 816ec30255..3ab2420888 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,14 +6,26 @@
<country></country>
<variant></variant>
<keyValueMap>
+ <entry>
+ <key>Project management</key>
+ <value>Projektmanagement</value>
+ </entry>
<entry>
<key>Company</key>
<value>Firma</value>
</entry>
+ <entry>
+ <key>Office staff</key>
+ <value>Innendienst</value>
+ </entry>
<entry>
<key>Confirm password</key>
<value>Passwort prüfen</value>
</entry>
+ <entry>
+ <key>Human Resources</key>
+ <value>Personal</value>
+ </entry>
<entry>
<key>Entrydate (Day)</key>
<value>Eingangsdatum (Tag)</value>
@@ -26,6 +38,10 @@
<key>Discount %</key>
<value>Rabatt %</value>
</entry>
+ <entry>
+ <key>Email must be unique!</key>
+ <value>Die E-Mail-Adresse muss eindeutig sein!</value>
+ </entry>
<entry>
<key>E-Mail</key>
<value>E-Mail</value>
@@ -1067,6 +1083,10 @@
<key>My Activities</key>
<value>Meine Aktivitäten</value>
</entry>
+ <entry>
+ <key>Everyone</key>
+ <value>Jeder</value>
+ </entry>
<entry>
<key>Combobox Value</key>
<value>Combobox-Wert</value>
@@ -1201,6 +1221,10 @@
<entry>
<key>ISO 3166-1 alpha-2</key>
</entry>
+ <entry>
+ <key>Field staff</key>
+ <value>Außendienst</value>
+ </entry>
<entry>
<key>0.00</key>
</entry>
@@ -2506,6 +2530,10 @@
<key>Christmas Island</key>
<value>Weihnachtsinsel</value>
</entry>
+ <entry>
+ <key>Project</key>
+ <value>Projekt</value>
+ </entry>
<entry>
<key>Netherlands</key>
<value>Niederlande</value>
@@ -2602,6 +2630,10 @@
<key>Congo (Democratic Republic of the)</key>
<value>Kongo (Demokratische Republik)</value>
</entry>
+ <entry>
+ <key>Resource</key>
+ <value>Ressource</value>
+ </entry>
<entry>
<key>Greece</key>
<value>Griechenland</value>
@@ -3462,6 +3494,15 @@
<key>This private person doeas already exist and can not be created once more.</key>
<value>Diese Privatperson existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
</entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
+ <entry>
+ <key>Human resources</key>
+ </entry>
+ <entry>
+ <key>Note</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 c35bab99b6..a7440fd6ab 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1038,6 +1038,9 @@
<entry>
<key>Seite</key>
</entry>
+ <entry>
+ <key>Note</key>
+ </entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
@@ -2671,6 +2674,9 @@
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
<value>%0 has to be between %2 and %3.</value>
</entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
<entry>
<key>Password</key>
</entry>
@@ -2718,6 +2724,30 @@
<entry>
<key>This private person doeas already exist and can not be created once more.</key>
</entry>
+ <entry>
+ <key>Everyone</key>
+ </entry>
+ <entry>
+ <key>Project</key>
+ </entry>
+ <entry>
+ <key>Human resources</key>
+ </entry>
+ <entry>
+ <key>Project management</key>
+ </entry>
+ <entry>
+ <key>Office staff</key>
+ </entry>
+ <entry>
+ <key>Field staff</key>
+ </entry>
+ <entry>
+ <key>Resource</key>
+ </entry>
+ <entry>
+ <key>Human Resources</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/StoredSelection/StoredSelection.aod b/neonContext/StoredSelection/StoredSelection.aod
deleted file mode 100644
index b758aed2aa..0000000000
--- a/neonContext/StoredSelection/StoredSelection.aod
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>StoredSelection</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>StoredSelection_entity</entity>
- <references>
- <neonViewReference>
- <name>8ab7727b-5dc7-47bb-9034-079d84ede3a3</name>
- <view>StoredSelectionFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index 9d89615fa4..71614eff59 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -14,17 +14,13 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>fdd5320e-a8c0-4043-a88e-aeba1ca02cd1</name>
- <entityField>UID</entityField>
+ <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
<entityField>ISACTIVE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
<entityField>FIRSTNAME</entityField>
@@ -33,6 +29,10 @@
<name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
<entityField>LASTNAME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>9c030b62-bf17-4be1-bcc6-87b304a618c0</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
<entityField>EMAIL_ADDRESS</entityField>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index a11de42475..88171ca8fc 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -19,7 +19,7 @@
</neonTableColumn>
<neonTableColumn>
<name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
- <entityField>UID</entityField>
+ <entityField>TITLE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index ce9851ad9a..1cbb84296d 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -34,10 +34,5 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>aaca4c8c-7953-43d8-9390-53b78d86863a</name>
- <entityField>StoredSelections</entityField>
- <view>StoredSelectionFilter_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index cbad666710..198c613625 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -12,7 +12,7 @@
<name>Header</name>
<iconField>IMAGE</iconField>
<titleField>NAME_fieldGroup</titleField>
- <subtitleField>UID</subtitleField>
+ <subtitleField>TITLE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
deleted file mode 100644
index 9974513f1b..0000000000
--- a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>StoredSelectionFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Table</name>
- <isEditable v="false" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>713574de-2d9c-4006-93a3-3860fb145c26</name>
- <entityField>CONTEXT_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc4d5ff-24cf-46d9-9941-cda11e445a17</name>
- <entityField>SELECTION_TITLE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index ef3273b495..99e4904867 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -1,3 +1,6 @@
+import("system.logging");
+import("system.db");
+import("Sql_lib");
import("system.tools");
/**
@@ -29,4 +32,84 @@ EmployeeUtils.getCurrentUserName = function ()
{
var user = tools.getCurrentUser();
return user ? user[tools.TITLE] : null;
+}
+
+EmployeeUtils.sliceUserId = function (pUserId)
+{
+ return pUserId.substr(10, 36);
+}
+
+/**
+ * generates a username from the firstname and lastname with the given structure
+ *
+ * @param {String} pFirstName
+ * @param {String} pLastName
+ * @param {String} pStructure the structure of the username, special characters:
+ * f - one letter of the firstname in lowercase
+ * F - one letter of the firstname in uppsercase
+ * l - one letter of the lastname in lowercase
+ * L - one letter of the lastname in uppsercase
+ * f+ - the complete firstname in lowercase
+ * F+ - the complete firstname
+ * l+ - the complete lastname in lowercae
+ * L+ - the complete lastname
+ *
+ * @return {String} the generated username
+ */
+EmployeeUtils.generateUserName = function (pFirstName, pLastName, pStructure)
+{
+ if (!pStructure || (!pFirstName && !pLastName))
+ return null;
+
+ var firstNameIndex = 0;
+ var lastNameIndex = 0;
+ var userName = pStructure.replace(/(f\+|l\+|f|l)/ig, function (type)
+ {
+ switch (type)
+ {
+ case "f+":
+ return pFirstName.toLowerCase() || "";
+ case "F+":
+ return pFirstName || "";
+ case "l+":
+ return pLastName.toLowerCase() || "";
+ case "L+":
+ return pLastName || "";
+ case "f":
+ return pFirstName.charAt(firstNameIndex++).toLowerCase() || "";
+ case "F":
+ return pFirstName.charAt(firstNameIndex++).toUpperCase() || "";
+ case "l":
+ return pLastName.charAt(lastNameIndex++).toLowerCase() || "";
+ case "L":
+ return pLastName.charAt(lastNameIndex++).toUpperCase() || "";
+ }
+ });
+
+ return userName;
+}
+
+/**
+ * checks if an employee is used somewhere
+ *
+ * @param {String} pContactId the contact id of the user
+ *
+ * @return {boolean} if the employee has relations
+ */
+EmployeeUtils.hasRelations = function (pContactId)
+{
+ //sql queries with selects on tables where an employee can be used
+ var queries = [
+ SqlCondition.begin()
+ .andPrepare("ACTIVITY.CREATOR", pContactId)
+ .buildSql("select 1 from ACTIVITY"),
+ SqlCondition.begin()
+ .andPrepare("TIMETRACKING.CONTACT_ID", pContactId)
+ .buildSql("select 1 from TIMETRACKING")
+ ];
+ logging.log(queries.toSource())
+ return queries.some(function (sql)
+ {
+ return db.cell(sql) != "";
+ });
}
\ No newline at end of file
diff --git a/role/PROJECT_Administrator/PROJECT_Administrator.aod b/role/PROJECT_Administrator/PROJECT_Administrator.aod
new file mode 100644
index 0000000000..49266936de
--- /dev/null
+++ b/role/PROJECT_Administrator/PROJECT_Administrator.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Administrator</name>
+ <title>Administrator</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Everyone/PROJECT_Everyone.aod b/role/PROJECT_Everyone/PROJECT_Everyone.aod
new file mode 100644
index 0000000000..f14d5573e8
--- /dev/null
+++ b/role/PROJECT_Everyone/PROJECT_Everyone.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Everyone</name>
+ <title>Everyone</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_FieldStaff/PROJECT_FieldStaff.aod b/role/PROJECT_FieldStaff/PROJECT_FieldStaff.aod
new file mode 100644
index 0000000000..5dafdb429b
--- /dev/null
+++ b/role/PROJECT_FieldStaff/PROJECT_FieldStaff.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_FieldStaff</name>
+ <title>Field staff</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_HumanResources/PROJECT_HumanResources.aod b/role/PROJECT_HumanResources/PROJECT_HumanResources.aod
new file mode 100644
index 0000000000..3f8a7fd659
--- /dev/null
+++ b/role/PROJECT_HumanResources/PROJECT_HumanResources.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_HumanResources</name>
+ <title>Human Resources</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Marketing/PROJECT_Marketing.aod b/role/PROJECT_Marketing/PROJECT_Marketing.aod
new file mode 100644
index 0000000000..f28c9ae8f6
--- /dev/null
+++ b/role/PROJECT_Marketing/PROJECT_Marketing.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Marketing</name>
+ <title>Marketing</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_OfficeStaff/PROJECT_OfficeStaff.aod b/role/PROJECT_OfficeStaff/PROJECT_OfficeStaff.aod
new file mode 100644
index 0000000000..9b70512446
--- /dev/null
+++ b/role/PROJECT_OfficeStaff/PROJECT_OfficeStaff.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_OfficeStaff</name>
+ <title>Office staff</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Project/PROJECT_Project.aod b/role/PROJECT_Project/PROJECT_Project.aod
new file mode 100644
index 0000000000..ecc4f7aae4
--- /dev/null
+++ b/role/PROJECT_Project/PROJECT_Project.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Project</name>
+ <title>Project</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_ProjectManagement/PROJECT_ProjectManagement.aod b/role/PROJECT_ProjectManagement/PROJECT_ProjectManagement.aod
new file mode 100644
index 0000000000..8016375c8b
--- /dev/null
+++ b/role/PROJECT_ProjectManagement/PROJECT_ProjectManagement.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_ProjectManagement</name>
+ <title>Project Management</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Resource/PROJECT_Resource.aod b/role/PROJECT_Resource/PROJECT_Resource.aod
new file mode 100644
index 0000000000..e6904e26c2
--- /dev/null
+++ b/role/PROJECT_Resource/PROJECT_Resource.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Resource</name>
+ <title>Resource</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Service/PROJECT_Service.aod b/role/PROJECT_Service/PROJECT_Service.aod
new file mode 100644
index 0000000000..7d586ddd20
--- /dev/null
+++ b/role/PROJECT_Service/PROJECT_Service.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Service</name>
+ <title>Service</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Support/PROJECT_Support.aod b/role/PROJECT_Support/PROJECT_Support.aod
new file mode 100644
index 0000000000..39c7878768
--- /dev/null
+++ b/role/PROJECT_Support/PROJECT_Support.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Support</name>
+ <title>Support</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
--
GitLab
From fa9626b5f0422f6bb194cbc32f3eea94b0388b94 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 4 Apr 2019 11:59:18 +0200
Subject: [PATCH 191/250] Employee loggings removed
---
entity/Employee_entity/recordcontainers/jdito/onUpdate.js | 1 -
process/Attribute_lib/process.js | 1 -
process/Employee_lib/process.js | 2 --
3 files changed, 4 deletions(-)
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 6818acfd62..6402be1fa5 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -1,5 +1,4 @@
import("system.db");
-import("system.logging");
import("system.vars");
import("system.tools");
import("Person_lib");
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 1427b7f21a..af3d24d958 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.util");
import("system.datetime");
import("system.translate");
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index 99e4904867..dac86b25c4 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.db");
import("Sql_lib");
import("system.tools");
@@ -107,7 +106,6 @@ EmployeeUtils.hasRelations = function (pContactId)
.andPrepare("TIMETRACKING.CONTACT_ID", pContactId)
.buildSql("select 1 from TIMETRACKING")
];
- logging.log(queries.toSource())
return queries.some(function (sql)
{
return db.cell(sql) != "";
--
GitLab
From 6b66cce7df6f56affa02ffa1794fa2d15592d0ba Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 4 Apr 2019 12:17:28 +0200
Subject: [PATCH 192/250] some objectrelationtree fixes
---
.../recordcontainers/jdito/contentProcess.js | 60 +++++++++++++------
1 file changed, 41 insertions(+), 19 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 24743025b7..f653935431 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -8,6 +8,7 @@ import("system.logging");
import("ObjectRelation_lib");
import("Context_lib");
import("Sql_lib");
+import("system.tools");
var relationTypesCache = {};
var tree = []
@@ -21,12 +22,15 @@ if (filter)
selectedRelationType = filter.childs[0].value;
}
}
-
-_loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.ObjectType_param"), selectedRelationType);
+var originalObjectId = vars.get("$param.ObjectId_param");
+_loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pObjectRelationId)
{
+ if (pLayer > 20)
+ return;
+
if (pLayer == undefined)
pLayer = 0;
@@ -49,6 +53,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// use always reverse-type
relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
currentObjectId = _getRootID(currentObjectId, relationTypeData);
+ originalObjectId = currentObjectId;
}
let uids = _insertEntry(tree, [[currentObjectId, "", "", "", ""]], pNodeId, pLayer, pObjectType, relationTypeData)
@@ -93,7 +98,6 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
{
var myData = _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2)
- // wenn typ-side 1 dann die eine Richtung, sonnst die andere?
let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType, typeData)
for (let i = 0; i < uids.length; i++)
{
@@ -102,12 +106,26 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
}
else
{
- // get ObjectRelationType from nodeId
- //if (!pObjectRelationTypeId)
- //{
- _insertEntry(tree, _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2), pNodeId, pLayer, destObjectType, typeData)
- //}
- // TODO: wenn relationtype selected
+ var prevObjectId;
+ if (pNodeId[4] != undefined)
+ {
+ prevObjectId = pNodeId[4][0];
+ }
+
+ var entryData = _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2, prevObjectId, true);
+
+ // add both sides. Only one will succeed, because the prevObjectId will be filtered and it will just return []
+ let uids = _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, typeData, 0);
+ if (direction == "same")
+ {
+ var otherEntryData = _getEntryData(pNodeId[0], typeId, "normal", relationType1, relationType2, prevObjectId, true);
+ uids =uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, typeData, 1));
+ }
+
+ for (let i = 0; i < uids.length; i++)
+ {
+ _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1, uids[i][6]);
+ }
}
}
}
@@ -117,11 +135,11 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
* load data for a relation.
* OBJECT_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE
*/
-function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, pRelationType2, pRecursion)
+function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, pRelationType2, pPrevId, pRecursion)
{
if (pRelationType1 == undefined || pRelationType2 == undefined)
return [];
-
+
var myNum;
var otherNum;
@@ -141,12 +159,14 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2)
.andPrepare("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId);
-
+
// exclude previous node
- if (!pRelationTypeId)
+ if (!pPrevId)
cond.and("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID is not null");
else
- cond.andPrepare("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID", pObjectId, "# <> ?");
+ {
+ cond.andPrepare("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID", pPrevId, "# <> ?");
+ }
// TODO: BINDATA?
// var image = getImageObject("Beziehung");
@@ -156,10 +176,10 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
"select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE \n\
from AB_OBJECTRELATION \n\
join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " and ","1=2", "", false));
-
+
if (data.length == 0 && pDirection == "same" && !pRecursion)
{
- return _getEntryData (pObjectId, pRelationTypeId, "normal", pRelationType1, pRelationType2, true)
+ return _getEntryData (pObjectId, pRelationTypeId, "normal", pRelationType1, pRelationType2, pPrevId, true)
}
// TODO: BINDATA?
@@ -176,7 +196,7 @@ function _getRelationTypes(pObjectType)
return relationTypesCache[pObjectType];
}
-function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelationTypeData)
+function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelationTypeData, pNum)
{
var expanded = true;
if (pLayer > 10) expanded = false;
@@ -186,7 +206,9 @@ function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelatio
{
var display = db.cell(ContextUtils.getNameSql(pObjectType, pEntryData[i][0]));
// TODO: Icon
- var uid = [pEntryData[i][0], i, pRelationTypeData, pObjectType, pNodeId, pEntryData[i][2]]
+ var uid = [pEntryData[i][0], i, pRelationTypeData, pObjectType, pNodeId, pEntryData[i][2], pEntryData[i][1]]
+ if (pNum)
+ uid.push(pNum);
uids.push(uid);
pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, ""]);
}
--
GitLab
From 43ba7a514c47cef7d45e937771002556fc10784d Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 4 Apr 2019 13:17:36 +0200
Subject: [PATCH 193/250] refactor
---
.../recordcontainers/jdito/contentProcess.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index f653935431..5f9715750d 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -26,9 +26,10 @@ var originalObjectId = vars.get("$param.ObjectId_param");
_loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pObjectRelationId)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer)
{
- if (pLayer > 20)
+ // prevent stack overflows
+ if (pLayer > 30)
return;
if (pLayer == undefined)
@@ -53,7 +54,6 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// use always reverse-type
relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
currentObjectId = _getRootID(currentObjectId, relationTypeData);
- originalObjectId = currentObjectId;
}
let uids = _insertEntry(tree, [[currentObjectId, "", "", "", ""]], pNodeId, pLayer, pObjectType, relationTypeData)
@@ -124,7 +124,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
for (let i = 0; i < uids.length; i++)
{
- _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1, uids[i][6]);
+ _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1);
}
}
}
--
GitLab
From 855b16ad6c100490c8b95e0d0465384668bc25b6 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 4 Apr 2019 13:27:33 +0200
Subject: [PATCH 194/250] preset OrganisationId_param on
OrganisationAndContactAddress provider
---
entity/Address_entity/Address_entity.aod | 2 ++
.../children/organisationid_param/valueProcess.js | 7 +++++++
2 files changed, 9 insertions(+)
create mode 100644 entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 3feac2b6cf..6d9d49d26b 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -232,6 +232,8 @@
</entityParameter>
<entityParameter>
<name>OrganisationId_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
<entityParameter>
diff --git a/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
new file mode 100644
index 0000000000..d1f6855f94
--- /dev/null
+++ b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+result.string(db.cell(SqlCondition.begin()
+ .andPrepareVars("CONTACT.CONTACTID", "$param.ContactId_param")
+ .buildSql("select ORGANISATION_ID from CONTACT", "1=2")));
--
GitLab
From 6fdec02388ba7822ac4bd23116ff966a9831f37d Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 4 Apr 2019 13:49:25 +0200
Subject: [PATCH 195/250] Employee bugfix
---
entity/Employee_entity/Employee_entity.aod | 5 ++--
.../entityfields/contact_id/onValueChange.js | 25 +++++++++++++++++++
.../entityfields/contact_id/stateProcess.js | 7 ++++++
.../email_address/onValidation.js | 13 ++++++----
.../email_address/possibleItemsProcess.js | 2 +-
.../email_address/valueProcess.js | 17 -------------
.../entityfields/firstname/valueProcess.js | 16 ------------
.../entityfields/lastname/valueProcess.js | 16 ------------
.../_____PREFERENCES_PROJECT.aod | 2 +-
9 files changed, 44 insertions(+), 59 deletions(-)
create mode 100644 entity/Employee_entity/entityfields/contact_id/onValueChange.js
create mode 100644 entity/Employee_entity/entityfields/contact_id/stateProcess.js
delete mode 100644 entity/Employee_entity/entityfields/email_address/valueProcess.js
delete mode 100644 entity/Employee_entity/entityfields/firstname/valueProcess.js
delete mode 100644 entity/Employee_entity/entityfields/lastname/valueProcess.js
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index c1a5ae6a1c..748fd22d32 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -31,18 +31,18 @@
<consumer>Contacts</consumer>
<linkedContext>Person</linkedContext>
<mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/contact_id/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
+ <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>FIRSTNAME</name>
<title>Firstname</title>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/firstname/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LASTNAME</name>
<title>Lastname</title>
<mandatory v="false" />
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ISACTIVE</name>
@@ -57,7 +57,6 @@
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js</possibleItemsProcess>
<newItemsAllowed v="true" />
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/email_address/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
new file mode 100644
index 0000000000..8b8af980ea
--- /dev/null
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -0,0 +1,25 @@
+import("Communication_lib");
+import("Entity_lib");
+import("system.result");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+var contactId = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var name = db.array(
+ db.ROW,
+ SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select FIRSTNAME, LASTNAME, (" + CommUtil.getStandardSubSqlMail() + ") from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
+ );
+
+ neon.setFieldValues({
+ "$field.FIRSTNAME" : name[0] || "",
+ "$field.LASTNAME" : name[1] || "",
+ "$field.EMAIL_ADDRESS" : name[2] || ""
+ });
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/contact_id/stateProcess.js b/entity/Employee_entity/entityfields/contact_id/stateProcess.js
new file mode 100644
index 0000000000..465a0be94e
--- /dev/null
+++ b/entity/Employee_entity/entityfields/contact_id/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Employee_lib")
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && EmployeeUtils.hasRelations(vars.get("$field.CONTACT_ID")))
+ result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/onValidation.js b/entity/Employee_entity/entityfields/email_address/onValidation.js
index f6a829134c..35d65102d1 100644
--- a/entity/Employee_entity/entityfields/email_address/onValidation.js
+++ b/entity/Employee_entity/entityfields/email_address/onValidation.js
@@ -1,10 +1,13 @@
-import("system.translate");
-import("system.neon");
+import("Entity_lib");
import("system.result");
import("system.vars");
import("system.tools");
-import("Entity_lib");
+import("system.translate");
var email = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.EMAIL_ADDRESS"));
-if (email != "" && tools.getUsersByAttribute(tools.EMAIL, [email]).length)
- result.string(translate.text("Email must be unique!"));
\ No newline at end of file
+var isTaken = tools.getUserByAttribute(tools.EMAIL, [email]);
+isTaken = isTaken
+ ? isTaken[tools.TITLE] != vars.get("$field.TITLE_ORIGINAL")
+ : false;
+if (email && isTaken)
+ result.string(translate.text("Email must be unique!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js b/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
index a171cd824e..21bbfcda32 100644
--- a/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
+++ b/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
@@ -27,4 +27,4 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
result.object(addresses);
}
else
- result.object([])
+ result.object([]);
diff --git a/entity/Employee_entity/entityfields/email_address/valueProcess.js b/entity/Employee_entity/entityfields/email_address/valueProcess.js
deleted file mode 100644
index 7931dce1d6..0000000000
--- a/entity/Employee_entity/entityfields/email_address/valueProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-import("Communication_lib");
-
-var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- && contactId && !vars.get("$field.EMAIL_ADDRESS"))
-{
- var defaultMail = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", contactId)
- .buildSql("select (" + CommUtil.getStandardSubSqlMail() + ") from CONTACT")
- );
- result.string(defaultMail);
-}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/firstname/valueProcess.js b/entity/Employee_entity/entityfields/firstname/valueProcess.js
deleted file mode 100644
index f118b02d96..0000000000
--- a/entity/Employee_entity/entityfields/firstname/valueProcess.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-
-var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- && contactId && !vars.get("$field.FIRSTNAME"))
-{
- var firstname = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", contactId)
- .buildSql("select FIRSTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
- );
- result.string(firstname);
-}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/lastname/valueProcess.js b/entity/Employee_entity/entityfields/lastname/valueProcess.js
deleted file mode 100644
index d0f5d394fa..0000000000
--- a/entity/Employee_entity/entityfields/lastname/valueProcess.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-
-var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- && contactId && !vars.get("$field.LASTNAME"))
-{
- var lastname = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", contactId)
- .buildSql("select LASTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
- );
- result.string(lastname);
-}
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 35430f5089..2e627c2e51 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic5</projectName>
+ <projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab
From 682aebf8fa0022f8ceb80827df2fdcaf603e2920 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 4 Apr 2019 13:53:20 +0200
Subject: [PATCH 196/250] replace operatingstate with recordstate
---
.../entityfields/creator/valueProcess.js | 12 +++++-----
.../confirm_password/mandatoryProcess.js | 16 ++++++-------
.../confirm_password/stateProcess.js | 18 +++++++-------
.../entityfields/password/mandatoryProcess.js | 16 ++++++-------
.../entityfields/password/stateProcess.js | 18 +++++++-------
.../entityfields/status/valueProcess.js | 2 +-
.../recordcontainers/db/onDBInsert.js | 12 +++++-----
.../recordcontainers/db/onDBInsert.js | 24 +++++++++----------
.../entityfields/phase/valueProcess.js | 10 ++++----
.../entityfields/state/valueProcess.js | 2 +-
.../entityfields/contact_id/valueProcess.js | 12 +++++-----
11 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/entity/Activity_entity/entityfields/creator/valueProcess.js b/entity/Activity_entity/entityfields/creator/valueProcess.js
index b8bc2d0539..a95c59aa0b 100644
--- a/entity/Activity_entity/entityfields/creator/valueProcess.js
+++ b/entity/Activity_entity/entityfields/creator/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("Employee_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js b/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
index 66736a3ca9..fec2cc6ff4 100644
--- a/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
+++ b/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- result.string(true);
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ result.string(true);
+
diff --git a/entity/Employee_entity/entityfields/confirm_password/stateProcess.js b/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
index 7df5126f58..a2440a36b0 100644
--- a/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
+++ b/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
@@ -1,10 +1,10 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var state = neon.COMPONENTSTATE_INVISIBLE;
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- state = neon.COMPONENTSTATE_AUTO;
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ state = neon.COMPONENTSTATE_AUTO;
+
result.string(state);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/password/mandatoryProcess.js b/entity/Employee_entity/entityfields/password/mandatoryProcess.js
index 66736a3ca9..fec2cc6ff4 100644
--- a/entity/Employee_entity/entityfields/password/mandatoryProcess.js
+++ b/entity/Employee_entity/entityfields/password/mandatoryProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- result.string(true);
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ result.string(true);
+
diff --git a/entity/Employee_entity/entityfields/password/stateProcess.js b/entity/Employee_entity/entityfields/password/stateProcess.js
index 7df5126f58..a2440a36b0 100644
--- a/entity/Employee_entity/entityfields/password/stateProcess.js
+++ b/entity/Employee_entity/entityfields/password/stateProcess.js
@@ -1,10 +1,10 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var state = neon.COMPONENTSTATE_INVISIBLE;
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- state = neon.COMPONENTSTATE_AUTO;
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ state = neon.COMPONENTSTATE_AUTO;
+
result.string(state);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js
index 7d4ed678a4..ef4ec27fb0 100644
--- a/entity/Offer_entity/entityfields/status/valueProcess.js
+++ b/entity/Offer_entity/entityfields/status/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
import("system.vars");
import("system.result");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("70d27a1b-7233-481d-826f-01a13a4bb0b2"); //Open
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
index 6b3c4033a0..c9c4870299 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("Offer_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
- OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$field.OFFERID"));
+import("system.neon");
+import("system.vars");
+import("Offer_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
+ OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$field.OFFERID"));
diff --git a/entity/Order_entity/recordcontainers/db/onDBInsert.js b/entity/Order_entity/recordcontainers/db/onDBInsert.js
index f3f8fd6de5..940a4ff0f9 100644
--- a/entity/Order_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Order_entity/recordcontainers/db/onDBInsert.js
@@ -1,12 +1,12 @@
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-import("Order_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferId_param"))
-{
- var orderId = vars.getString("$field.SALESORDERID");
- var offerId = vars.getString("$param.OfferId_param");
-
- OrderUtils.copyOfferItemsToOrder(offerId, orderId); //copy all offerItems
-}
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+import("Order_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferId_param"))
+{
+ var orderId = vars.getString("$field.SALESORDERID");
+ var offerId = vars.getString("$param.OfferId_param");
+
+ OrderUtils.copyOfferItemsToOrder(offerId, orderId); //copy all offerItems
+}
diff --git a/entity/Salesproject_entity/entityfields/phase/valueProcess.js b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
index 49280bb32c..90b1c491d4 100644
--- a/entity/Salesproject_entity/entityfields/phase/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("9f7d1fa9-7c09-4037-8f7c-8458def14d89"); //NQC
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/valueProcess.js b/entity/Salesproject_entity/entityfields/state/valueProcess.js
index 1bfcc5d651..abb032b5ae 100644
--- a/entity/Salesproject_entity/entityfields/state/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/state/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
import("system.vars");
import("system.result");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712"); //Open
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
index 8df31bc890..1e62e7551c 100644
--- a/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Employee_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
--
GitLab
From 53606fb1ae9f242c9ce1401225ba10e5881f5f5e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 10:01:34 +0200
Subject: [PATCH 197/250] added sorting in Contact and Organisation
---
entity/Contact_entity/Contact_entity.aod | 15 ++++++++++++++-
.../recordcontainers/db/fromClauseProcess.js | 4 ++++
.../recordcontainers/db/orderClauseProcess.js | 6 ++++++
.../Organisation_entity/Organisation_entity.aod | 1 +
.../recordcontainers/db/orderClauseProcess.js | 7 +++++++
entity/Person_entity/Person_entity.aod | 1 +
.../recordcontainers/db/orderClauseProcess.js | 5 +++++
7 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
create mode 100644 entity/Contact_entity/recordcontainers/db/orderClauseProcess.js
create mode 100644 entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js
create mode 100644 entity/Person_entity/recordcontainers/db/orderClauseProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 2b6cdcfe10..1d93750675 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -227,15 +227,24 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
- <name>d2a29013-e270-4ce1-8f2d-b372206f0aa3</name>
+ <name>31dbd8d8-b10c-4621-ab45-b735216f078f</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
+ <linkInformation>
+ <name>31948bfb-2fe9-4345-a65c-14ad49ffbc0e</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -290,6 +299,10 @@
<name>DATE_EDIT.value</name>
<recordfield>CONTACT.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGANISATION_ID.displayValue</name>
+ <recordfield>ORGANISATION.NAME</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js b/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000..f1b7f85762
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+result.string("CONTACT\n\
+ join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js b/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..be00ad88d1
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ORGANISATION.NAME": db.ASCENDING
+});
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index db55fdd66a..400b1ad29f 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -790,6 +790,7 @@
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
diff --git a/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..4e5e1db97f
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ORGANISATION.CUSTOMERCODE": db.ASCENDING,
+ "ORGANISATION.NAME": db.ASCENDING
+ });
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9d70fe16b1..6cf1149a6a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -853,6 +853,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBUpdate>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
diff --git a/entity/Person_entity/recordcontainers/db/orderClauseProcess.js b/entity/Person_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..3d8ca41957
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.db");
+
+result.object({"PERSON.LASTNAME": db.ASCENDING,
+ "PERSON.FIRSTNAME": db.ASCENDING});
\ No newline at end of file
--
GitLab
From 76f4db2b0cc9deee76a7dbb96106cba0633c820c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 13:40:44 +0200
Subject: [PATCH 198/250] Bugfix: Objectrelation used non standard-sql
---
.../possibleItemsProcess.js | 5 ++---
process/ObjectRelation_lib/process.js | 8 +++-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
index 6a50b40e6e..41ddaad8d5 100644
--- a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
@@ -7,10 +7,9 @@ result.object(db.table(
["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE \n\
from AB_OBJECTRELATIONTYPE main \n\
left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where case when type2.OBJECT_TYPE is null then ( ? = main.OBJECT_TYPE) else ( ? = type2.OBJECT_TYPE) end"
+ where case when type2.OBJECT_TYPE is null then main.OBJECT_TYPE else type2.OBJECT_TYPE end = ? "
, [
- [vars.get("$param.ObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- [vars.get("$param.ObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
+ [vars.get("$param.ObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]
]]).map(function(pItem)
{
return [pItem[0], translate.text(pItem[1])];
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
index a3d375d5c3..2457c50902 100644
--- a/process/ObjectRelation_lib/process.js
+++ b/process/ObjectRelation_lib/process.js
@@ -22,7 +22,7 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
{
var sql = " from AB_OBJECTRELATIONTYPE main \n\
left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where case when type2.OBJECT_TYPE is null then ( ? = main.OBJECT_TYPE) else ( ? = type2.OBJECT_TYPE) end"
+ where case when type2.OBJECT_TYPE is null then main.OBJECT_TYPE else type2.OBJECT_TYPE end = ? "
// only id and title:
if (pFullInfo == undefined || pFullInfo == false)
@@ -32,8 +32,7 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
return (db.table(
["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE" + sql,
[
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
+ [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]
]
]));
@@ -57,8 +56,7 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
main.SIDE" + sql,
[
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
+ [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]
]
]));
--
GitLab
From 6086715339e44482d0c3137e01d0addf934025c2 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 13:58:58 +0200
Subject: [PATCH 199/250] AnyContact: added sorting
---
entity/AnyContact_entity/AnyContact_entity.aod | 1 +
.../recordcontainers/db/orderClauseProcess.js | 9 +++++++++
2 files changed, 10 insertions(+)
create mode 100644 entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 3cad25e214..65221a6d02 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -116,6 +116,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
diff --git a/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js b/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..19dc62881e
--- /dev/null
+++ b/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ORGANISATION.CUSTOMERCODE": db.ASCENDING,
+ "ORGANISATION.NAME": db.ASCENDING,
+ "PERSON.LASTNAME": db.ASCENDING,
+ "PERSON.FIRSTNAME": db.ASCENDING
+ });
\ No newline at end of file
--
GitLab
From 9f5615d2848728856f96601c2718d4c84c7cf9a0 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 14:01:20 +0200
Subject: [PATCH 200/250] added Address_lookup
---
entity/Address_entity/Address_entity.aod | 12 ++++
.../contactid_param/valueProcess.js | 0
.../defaultaddressid_param/valueProcess.js | 20 +++++++
.../is_standard/documentation.adoc | 4 +-
.../is_standard_icon/contentTypeProcess.js | 10 ++++
.../is_standard_icon/valueProcess.js | 10 ++++
.../organisationid_param/documentation.adoc | 2 +
.../organisationid_param/valueProcess.js | 21 +++++--
.../recordcontainers/db/orderClauseProcess.js | 5 ++
.../_____LANGUAGE_EXTRA.aod | 12 ++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 10 ++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 13 +++++
neonContext/Address/Address.aod | 5 ++
.../AddressLookup_view/AddressLookup_view.aod | 58 +++++++++++++++++++
14 files changed, 176 insertions(+), 6 deletions(-)
create mode 100644 entity/Address_entity/entityfields/contactid_param/valueProcess.js
create mode 100644 entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js
create mode 100644 entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
create mode 100644 entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
create mode 100644 entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc
create mode 100644 entity/Address_entity/recordcontainers/db/orderClauseProcess.js
create mode 100644 neonView/AddressLookup_view/AddressLookup_view.aod
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 6d9d49d26b..76217f3083 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -21,6 +21,7 @@
</entityField>
<entityField>
<name>ADDRIDENTIFIER</name>
+ <title>{$ADDRESS_IDENTIFIER}</title>
</entityField>
<entityField>
<name>ADDR_TYPE</name>
@@ -104,6 +105,7 @@
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contactid_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="true" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/contactid_param/documentation.adoc</documentation>
@@ -192,6 +194,7 @@
</entityField>
<entityParameter>
<name>DefaultAddressId_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="false" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
@@ -235,6 +238,7 @@
<title></title>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
<expose v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
@@ -278,12 +282,20 @@
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>IS_STANDARD_ICON</name>
+ <title>Standard</title>
+ <contentType>IMAGE</contentType>
+ <contentTypeProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js</contentTypeProcess>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<linkInformation>
<linkInformation>
diff --git a/entity/Address_entity/entityfields/contactid_param/valueProcess.js b/entity/Address_entity/entityfields/contactid_param/valueProcess.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js b/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js
new file mode 100644
index 0000000000..9c5d394a1a
--- /dev/null
+++ b/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js
@@ -0,0 +1,20 @@
+import("Sql_lib");
+import("system.db");
+import("system.result");
+import("system.vars");
+
+//this organisationId param is optional which means:
+//if it's not given for the "OrganisationAndContactAddresses"-provider we've to find the orgId by the passed CONTACTID
+//the reason behind this is: whenever the consuming entity can provide the organisationid it should provide the id to improve performance
+//(since we[Address_entity] have not to find out the value our own)
+//but if the consuming entity does not have the value we[Address_entity] will do it for the sake of simpler usage
+
+var contactId = vars.get("$param.ContactId_param");
+if (contactId)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select CONTACT.ADDRESS_ID from CONTACT");
+ var organisationId = db.cell(sql);
+ result.string(organisationId);
+}
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard/documentation.adoc b/entity/Address_entity/entityfields/is_standard/documentation.adoc
index fb7d4bac8d..6a7186b467 100644
--- a/entity/Address_entity/entityfields/is_standard/documentation.adoc
+++ b/entity/Address_entity/entityfields/is_standard/documentation.adoc
@@ -1,3 +1,3 @@
The `IS_STANDARD` field specifies if an ADDRESS is the standard address (see Address_entity documentation)
-
-However that information is not stored directly in the `ADDRESS` database table. Every `CONTACT`-record has an own standard address.
\ No newline at end of file
+However that information is not stored directly in the `ADDRESS` database table. Every `CONTACT`-record has an own standard address.
+This fields works only correct if `DefaultAddressId_param` is passed.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
new file mode 100644
index 0000000000..2c348afa93
--- /dev/null
+++ b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+
+var isStandard = vars.getString("$field.IS_STANDARD") == "true";
+var res;
+if (isStandard)
+ res = "IMAGE";
+else
+ res = "TEXT";
+result.string(res);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
new file mode 100644
index 0000000000..7420487f08
--- /dev/null
+++ b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+
+var isStandard = vars.getString("$field.IS_STANDARD") == "true";
+var res;
+if (isStandard)
+ res = "VAADIN:MAP_MARKER";
+else
+ res = "";
+result.string(res);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc
new file mode 100644
index 0000000000..74649993db
--- /dev/null
+++ b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc
@@ -0,0 +1,2 @@
+This param will be calculated automatically with the given "ContactId_param" if you do not pass it.
+When you've got the ORGANISTAIONID-value already you should pass it for better performance.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
index d1f6855f94..c4bf0500f2 100644
--- a/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
@@ -1,7 +1,20 @@
+import("Sql_lib");
import("system.db");
import("system.result");
-import("Sql_lib");
+import("system.vars");
+
+//this organisationId param is optional which means:
+//if it's not given for the "OrganisationAndContactAddresses"-provider we've to find the orgId by the passed CONTACTID
+//the reason behind this is: whenever the consuming entity can provide the organisationid it should provide the id to improve performance
+//(since we[Address_entity] have not to find out the value our own)
+//but if the consuming entity does not have the value we[Address_entity] will do it for the sake of simpler usage
-result.string(db.cell(SqlCondition.begin()
- .andPrepareVars("CONTACT.CONTACTID", "$param.ContactId_param")
- .buildSql("select ORGANISATION_ID from CONTACT", "1=2")));
+var contactId = vars.get("$param.ContactId_param");
+if (contactId)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select CONTACT.ORGANISATION_ID from CONTACT");
+ var organisationId = db.cell(sql);
+ result.string(organisationId);
+}
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/orderClauseProcess.js b/entity/Address_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..7cafef1a54
--- /dev/null
+++ b/entity/Address_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.db");
+
+result.object({"ADDRESS.COUNTRY": db.ASCENDING,
+ "ADDRESS.ADDRESS": db.ASCENDING});
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 73af0d0247..7f1bc7254a 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2718,6 +2718,18 @@
<entry>
<key>Note</key>
</entry>
+ <entry>
+ <key>Email must be unique!</key>
+ </entry>
+ <entry>
+ <key>Project Management</key>
+ </entry>
+ <entry>
+ <key>Support</key>
+ </entry>
+ <entry>
+ <key>{$ADDRESS_IDENTIFIER}</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 3ab2420888..4a8fb2f972 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3503,6 +3503,16 @@
<entry>
<key>Note</key>
</entry>
+ <entry>
+ <key>Project Management</key>
+ </entry>
+ <entry>
+ <key>Support</key>
+ </entry>
+ <entry>
+ <key>{$ADDRESS_IDENTIFIER}</key>
+ <value>Bezeichnung</value>
+ </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 a7440fd6ab..7226f426ca 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2748,6 +2748,19 @@
<entry>
<key>Human Resources</key>
</entry>
+ <entry>
+ <key>Email must be unique!</key>
+ </entry>
+ <entry>
+ <key>Project Management</key>
+ </entry>
+ <entry>
+ <key>Support</key>
+ </entry>
+ <entry>
+ <key>{$ADDRESS_IDENTIFIER}</key>
+ <value>Identifier</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Address/Address.aod b/neonContext/Address/Address.aod
index 62cf97f249..85f79bd80d 100644
--- a/neonContext/Address/Address.aod
+++ b/neonContext/Address/Address.aod
@@ -6,6 +6,7 @@
<filterview>AddressFilter_view</filterview>
<editview>AddressEdit_view</editview>
<preview>AddressEdit_view</preview>
+ <lookupview>AddressLookup_view</lookupview>
<entity>Address_entity</entity>
<references>
<neonViewReference>
@@ -24,5 +25,9 @@
<name>f4c516c0-b9de-47df-91e4-43bdb3297fe7</name>
<view>AdressMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>77b182a7-2361-41a7-ae78-dc5285b41b97</name>
+ <view>AddressLookup_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/AddressLookup_view/AddressLookup_view.aod b/neonView/AddressLookup_view/AddressLookup_view.aod
new file mode 100644
index 0000000000..84a197811b
--- /dev/null
+++ b/neonView/AddressLookup_view/AddressLookup_view.aod
@@ -0,0 +1,58 @@
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>AddressLookup_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>DataTable</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>297a27f0-51a0-40d7-a2eb-28fc2b9e5730</name>
+ <entityField>IS_STANDARD_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>07e3bcf0-30aa-4745-8dd6-ed79dd2d0fa0</name>
+ <entityField>ADDR_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e6d9ced9-eea3-4cdf-9751-74c8f206282f</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>570039fc-c27a-4b06-a93e-16cc712a3d0c</name>
+ <entityField>ADDRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>26ca52ce-91e7-4e76-a37e-6db28b967beb</name>
+ <entityField>BUILDINGNO</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a54d6306-e9be-41db-9d1c-abeebe5ce77b</name>
+ <entityField>ZIP</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6a07479c-b4d3-4946-993e-e6ce7dd825ba</name>
+ <entityField>CITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>820b6ffc-7e56-4982-8f39-4443b0ada876</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>24f73ac8-ac90-4beb-83fe-bdaa2d0806b6</name>
+ <entityField>ADDRIDENTIFIER</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9651a718-ab01-4c97-8da0-6e7133f26466</name>
+ <entityField>#PROVIDER</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
--
GitLab
From 92d33922ae776c637bf2c952077b359aa75199d1 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 4 Apr 2019 15:18:43 +0200
Subject: [PATCH 201/250] refactor tree
---
.../recordcontainers/jdito/contentProcess.js | 75 ++++++++++---------
1 file changed, 40 insertions(+), 35 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 5f9715750d..c290fd12d8 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,16 +1,12 @@
-import("system.translate");
-import("system.util");
import("system.db");
-import("system.text");
+import("system.translate");
import("system.result");
import("system.vars");
-import("system.logging");
import("ObjectRelation_lib");
import("Context_lib");
import("Sql_lib");
import("system.tools");
-var relationTypesCache = {};
var tree = []
var filter = JSON.parse(vars.get("$local.filter"))
var selectedRelationType = null;
@@ -26,7 +22,7 @@ var originalObjectId = vars.get("$param.ObjectId_param");
_loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData)
{
// prevent stack overflows
if (pLayer > 30)
@@ -56,10 +52,10 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
currentObjectId = _getRootID(currentObjectId, relationTypeData);
}
- let uids = _insertEntry(tree, [[currentObjectId, "", "", "", ""]], pNodeId, pLayer, pObjectType, relationTypeData)
+ let uids = _insertEntry(tree, [[currentObjectId, "", "", "", ""]], pNodeId, pLayer, pObjectType)
for (let i = 0; i < uids.length; i++)
{
- _loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1);
+ _loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1, relationTypeData);
}
}
else // no ObjectType chosen
@@ -69,7 +65,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
for (let i=0; i<relationTypes.length; i++)
{
- var data = _getEntryData(currentObjectId, relationTypes[i][0], relationTypes[i][3], relationTypes[i][7], relationTypes[i][8]);
+ var data = _getEntryData(currentObjectId, relationTypes[i][3], relationTypes[i][7], relationTypes[i][8]);
// if any subentry: show objectType
if (data.length > 0)
@@ -79,52 +75,56 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
let uid = [currentObjectId, i, relationTypes[i]];
tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, ""]);
- _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1);
+ _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1, relationTypeData);
}
}
}
}
else if (pLayer >= 1)
{
- var typeData = pNodeId[2];
- var typeId = typeData[0];
- var hierarchy = typeData[4];
- var destObjectType = typeData[6];
- var relationType1 = typeData[7];
- var relationType2 = typeData[8];
- var direction = typeData[3];
+ // if no relationType given, load from nodeId
+ if (!pRelationTypeData)
+ pRelationTypeData = pNodeId[2];
+
+ var typeId = pRelationTypeData[0];
+ var hierarchy = pRelationTypeData[4];
+ var destObjectType = pRelationTypeData[6];
+ var relationType1 = pRelationTypeData[7];
+ var relationType2 = pRelationTypeData[8];
+ var direction = pRelationTypeData[3];
if (hierarchy == "1")
{
- var myData = _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2)
+ var myData = _getEntryData(pNodeId[0], direction, relationType1, relationType2)
- let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType, typeData)
+ let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType)
for (let i = 0; i < uids.length; i++)
{
- _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1);
+ _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1, pRelationTypeData);
}
}
else
{
+ // pNodeId[4] is the previous NodeId and pNodeId[4][0] the previous ObjectId
var prevObjectId;
if (pNodeId[4] != undefined)
{
prevObjectId = pNodeId[4][0];
}
- var entryData = _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2, prevObjectId, true);
+ var entryData = _getEntryData(pNodeId[0], direction, relationType1, relationType2, prevObjectId, true);
// add both sides. Only one will succeed, because the prevObjectId will be filtered and it will just return []
- let uids = _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, typeData, 0);
+ let uids = _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, 0);
if (direction == "same")
{
- var otherEntryData = _getEntryData(pNodeId[0], typeId, "normal", relationType1, relationType2, prevObjectId, true);
- uids =uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, typeData, 1));
+ var otherEntryData = _getEntryData(pNodeId[0], "normal", relationType1, relationType2, prevObjectId, true);
+ uids =uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, 1));
}
for (let i = 0; i < uids.length; i++)
{
- _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1);
+ _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1, pRelationTypeData);
}
}
}
@@ -134,8 +134,17 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
/**
* load data for a relation.
* OBJECT_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE
+ *
+ * @param {String} pObjectId
+ * @param {String} pDirection
+ * @param {String} pRelationType1
+ * @param {String} pRelationType2
+ * @param {String} pPrevId Id of the previous node to exclude it
+ * @param {String} pNoRecursion if false: select for direction "same" the other direction, if result is empty.
+ *
+ * @return {[][]}
*/
-function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, pRelationType2, pPrevId, pRecursion)
+function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pPrevId, pNoRecursion)
{
if (pRelationType1 == undefined || pRelationType2 == undefined)
return [];
@@ -154,7 +163,6 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
myNum = 1;
}
-
var cond = SqlCondition.begin()
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2)
@@ -177,9 +185,9 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
from AB_OBJECTRELATION \n\
join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " and ","1=2", "", false));
- if (data.length == 0 && pDirection == "same" && !pRecursion)
+ if (data.length == 0 && pDirection == "same" && !pNoRecursion)
{
- return _getEntryData (pObjectId, pRelationTypeId, "normal", pRelationType1, pRelationType2, pPrevId, true)
+ return _getEntryData(pObjectId, "normal", pRelationType1, pRelationType2, pPrevId, true)
}
// TODO: BINDATA?
@@ -190,13 +198,10 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
function _getRelationTypes(pObjectType)
{
// TODO: load from entity when possible
- if (relationTypesCache[pObjectType] == undefined)
- relationTypesCache[pObjectType] = ObjectRelationUtils.getPossibleRelationTypes(pObjectType, true);
-
- return relationTypesCache[pObjectType];
+ return ObjectRelationUtils.getPossibleRelationTypes(pObjectType, true);
}
-function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelationTypeData, pNum)
+function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNum)
{
var expanded = true;
if (pLayer > 10) expanded = false;
@@ -206,7 +211,7 @@ function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelatio
{
var display = db.cell(ContextUtils.getNameSql(pObjectType, pEntryData[i][0]));
// TODO: Icon
- var uid = [pEntryData[i][0], i, pRelationTypeData, pObjectType, pNodeId, pEntryData[i][2], pEntryData[i][1]]
+ var uid = [pEntryData[i][0], i, "", pObjectType, pNodeId, pEntryData[i][2], pEntryData[i][1]]
if (pNum)
uid.push(pNum);
uids.push(uid);
--
GitLab
From 38a6e83a1d9028bcf171d12674c202a0e99bd3ba Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 4 Apr 2019 15:42:30 +0200
Subject: [PATCH 202/250] refactor tree
---
.../recordcontainers/jdito/contentProcess.js | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index c290fd12d8..c4a65d74fb 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -19,7 +19,9 @@ if (filter)
}
}
var originalObjectId = vars.get("$param.ObjectId_param");
+
_loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+
result.object(tree);
function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData)
@@ -86,7 +88,6 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
if (!pRelationTypeData)
pRelationTypeData = pNodeId[2];
- var typeId = pRelationTypeData[0];
var hierarchy = pRelationTypeData[4];
var destObjectType = pRelationTypeData[6];
var relationType1 = pRelationTypeData[7];
@@ -140,7 +141,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
* @param {String} pRelationType1
* @param {String} pRelationType2
* @param {String} pPrevId Id of the previous node to exclude it
- * @param {String} pNoRecursion if false: select for direction "same" the other direction, if result is empty.
+ * @param {Boolean} [pNoRecursion=false] if false: select for direction "same" the other direction, if result is empty.
*
* @return {[][]}
*/
@@ -201,6 +202,18 @@ function _getRelationTypes(pObjectType)
return ObjectRelationUtils.getPossibleRelationTypes(pObjectType, true);
}
+/**
+ * insert a new Entry
+ *
+ * @param {Array} pTree
+ * @param {Array[][]} pEntryData
+ * @param {Array[][]} pNodeId id of the parent
+ * @param {Integer} pLayer layernumber
+ * @param {String} pObjectType
+ * @param {Integer} [pNum=undefined] optional number added to the key. Needed, if the key would not be unique.
+ *
+ * @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, ""(not needed anymore), pObjectType, pNodeId, objectrelationid, objecttype
+ */
function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNum)
{
var expanded = true;
--
GitLab
From 4f9ca553efe74d9d501a8f704b744172ddc0e381 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 4 Apr 2019 16:09:25 +0200
Subject: [PATCH 203/250] object relation add description
---
aliasDefinition/Data_alias/Data_alias.aod | 14 ++++++++++++++
.../ObjectRelation_entity.aod | 8 ++++++++
entity/ObjectTree_entity/ObjectTree_entity.aod | 10 +++++-----
.../entityfields/description/valueProcess.js | 1 -
.../recordcontainers/jdito/contentProcess.js | 9 ++++-----
.../ObjectRelationEdit_view.aod | 4 ++++
.../ObjectRelationFilter_view.aod | 4 ++++
neonView/ObjectTree_view/ObjectTree_view.aod | 2 +-
.../basic/2019.2/add_ObjectRelation_type.xml | 1 +
9 files changed, 41 insertions(+), 12 deletions(-)
delete mode 100644 entity/ObjectTree_entity/entityfields/description/valueProcess.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 0c33b0d95f..89e097db34 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4309,6 +4309,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>INFO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <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/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index f495721eb1..1a3854b659 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -160,6 +160,10 @@
<entityField>
<name>OBJECT2_TYPE</name>
</entityField>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -213,6 +217,10 @@
<name>OBJECT1_TYPE.value</name>
<expression>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_type.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>AB_OBJECTRELATION.INFO</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index abb4084655..02de3b4ff6 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -63,11 +63,6 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/description/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>Selector</name>
<title>Relationtype</title>
@@ -113,6 +108,10 @@
<name>TARGET_CONTEXT</name>
<searchable v="false" />
</entityField>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -126,6 +125,7 @@
<element>EXPANDED.value</element>
<element>TARGET_ID.value</element>
<element>TARGET_CONTEXT.value</element>
+ <element>INFO.value</element>
<element>Selector.value</element>
</recordFields>
</jDitoRecordContainer>
diff --git a/entity/ObjectTree_entity/entityfields/description/valueProcess.js b/entity/ObjectTree_entity/entityfields/description/valueProcess.js
deleted file mode 100644
index 552c76f974..0000000000
--- a/entity/ObjectTree_entity/entityfields/description/valueProcess.js
+++ /dev/null
@@ -1 +0,0 @@
-import("system.result");
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index c4a65d74fb..2496696dde 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -54,7 +54,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
currentObjectId = _getRootID(currentObjectId, relationTypeData);
}
- let uids = _insertEntry(tree, [[currentObjectId, "", "", "", ""]], pNodeId, pLayer, pObjectType)
+ let uids = _insertEntry(tree, [[currentObjectId, "", "", "", "", ""]], pNodeId, pLayer, pObjectType)
for (let i = 0; i < uids.length; i++)
{
_loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1, relationTypeData);
@@ -75,7 +75,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// TODO: Icons, BINDATA
// var icon = getIcon...
let uid = [currentObjectId, i, relationTypes[i]];
- tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, ""]);
+ tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, "", ""]);
_loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1, relationTypeData);
}
@@ -180,9 +180,8 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
// TODO: BINDATA?
// var image = getImageObject("Beziehung");
- // TODO: RELDESC gibts noch nicht
var data = db.table(cond.buildSql(
- "select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE \n\
+ "select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO \n\
from AB_OBJECTRELATION \n\
join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " and ","1=2", "", false));
@@ -228,7 +227,7 @@ function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNum)
if (pNum)
uid.push(pNum);
uids.push(uid);
- pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, ""]);
+ pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, pEntryData[i][4], ""]);
}
return uids;
}
diff --git a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
index 83e9082f7f..7f3ae6c820 100644
--- a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
+++ b/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
@@ -21,6 +21,10 @@
<name>f60a0e0d-c3a9-4ab7-9b52-b33f5bb61d31</name>
<entityField>rowIdProxy</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>04579da5-0609-4a43-97dd-9e773ec1a29b</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod b/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
index d0895c5772..0199c5d9ca 100644
--- a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
+++ b/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
@@ -22,6 +22,10 @@
<name>ab25081c-cb63-4d28-87d0-e4c022aac878</name>
<entityField>rowIdProxy</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>a5e8b3d6-ff83-461a-ba28-d67e0df5d93d</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTree_view/ObjectTree_view.aod
index a6e80e32a7..2917cacd09 100644
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTree_view/ObjectTree_view.aod
@@ -14,7 +14,7 @@
<parentField>PARENT_ID</parentField>
<nodeExpandedField>EXPANDED</nodeExpandedField>
<titleField>TITLE</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
+ <descriptionField>INFO</descriptionField>
<iconField>ICON</iconField>
<entityField>#ENTITY</entityField>
</treeViewTemplate>
diff --git a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml b/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
index 89d9e3cf4a..a4cd984291 100644
--- a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
@@ -25,6 +25,7 @@
<addColumn tableName="AB_OBJECTRELATION">
<column name="AB_OBJECTRELATIONTYPE1" type="CHAR(36)"/>
<column name="AB_OBJECTRELATIONTYPE2" type="CHAR(36)"/>
+ <column name="INFO" type="NCLOB"/>
</addColumn>
<dropIndex tableName="AB_OBJECTRELATION" indexName="IDX_AB_OBJECTRELATION_OBJECT1"/>
--
GitLab
From 0a08c0087b64144ef37f02f1058a538fc408aca0 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Thu, 4 Apr 2019 16:40:11 +0200
Subject: [PATCH 204/250] hasTasks in stateProcess for Tasks
---
entity/Offer_entity/Offer_entity.aod | 1 +
.../entityfields/tasks/stateProcess.js | 10 ++++++++++
.../Organisation_entity.aod | 1 +
.../entityfields/tasks/stateProcess.js | 10 ++++++++++
entity/Person_entity/Person_entity.aod | 1 +
.../entityfields/tasks/stateProcess.js | 10 ++++++++++
entity/Product_entity/Product_entity.aod | 1 +
.../entityfields/tasks/stateProcess.js | 10 ++++++++++
.../Salesproject_entity.aod | 1 +
.../entityfields/tasks/stateProcess.js | 10 ++++++++++
process/ActivityTask_lib/process.js | 20 +++++++++++++++++++
11 files changed, 75 insertions(+)
create mode 100644 entity/Offer_entity/entityfields/tasks/stateProcess.js
create mode 100644 entity/Organisation_entity/entityfields/tasks/stateProcess.js
create mode 100644 entity/Person_entity/entityfields/tasks/stateProcess.js
create mode 100644 entity/Product_entity/entityfields/tasks/stateProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/tasks/stateProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 26ca463bb4..36e8bee336 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -597,6 +597,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Offer_entity/entityfields/tasks/stateProcess.js b/entity/Offer_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000..fca9129ea6
--- /dev/null
+++ b/entity/Offer_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.OFFERID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 400b1ad29f..ef0872720f 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -550,6 +550,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Organisation_entity/entityfields/tasks/stateProcess.js b/entity/Organisation_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000..2d6a0eb244
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.ORGANISATIONID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6cf1149a6a..4595597581 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -622,6 +622,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Person_entity/entityfields/tasks/stateProcess.js b/entity/Person_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000..a33c7f3e00
--- /dev/null
+++ b/entity/Person_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 4ed30005ec..f8474184d2 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -395,6 +395,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Product_entity/entityfields/tasks/stateProcess.js b/entity/Product_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000..062f477b61
--- /dev/null
+++ b/entity/Product_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.PRODUCTID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b1499464e8..fc82706d67 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -496,6 +496,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Salesproject_entity/entityfields/tasks/stateProcess.js b/entity/Salesproject_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000..8a5375f38f
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.SALESPROJECTID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 4228e5d38d..8f7de2b78e 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.util");
import("system.datetime");
@@ -82,6 +83,25 @@ TaskUtils.createNewTask = function(pRowId, pAdditionalLinks, pParentContext, pPa
_ActivityTaskUtils._createNew("Task", pRowId, pAdditionalLinks, pParentContext, pParentId)
}
+/**
+ * Create a new task
+ */
+TaskUtils.hasTasks = function(pRowId, pObjectType)
+{
+ if (pRowId != "" && pObjectType != "")
+ {
+ var cond = SqlCondition.begin().andPrepare("TASKLINK.OBJECT_TYPE", pObjectType)
+ .andPrepare("TASKLINK.OBJECT_ROWID", pRowId);
+ var taskCount = db.cell(cond.buildSql("select count(*) from TASKLINK"));
+ if (taskCount != "0")
+ return true;
+ else
+ return false;
+ }
+ else
+ return true;
+}
+
/**
* add the links to the link-table in new mode
*
--
GitLab
From a2217e4634ecb420c41a37ab288030fc098253b1 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Wed, 3 Apr 2019 07:55:18 +0200
Subject: [PATCH 205/250] Salesproject phase chart
---
.../SalesprojectChart_entity.aod | 42 +++++++++++++++++++
.../documentation.adoc | 3 ++
.../recordcontainers/jdito/contentProcess.js | 34 +++++++++++++++
.../SalesprojectChart/SalesprojectChart.aod | 13 ++++++
.../SalesprojectChart_view.aod | 35 ++++++++++++++++
5 files changed, 127 insertions(+)
create mode 100644 entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
create mode 100644 entity/SalesprojectChart_entity/documentation.adoc
create mode 100644 entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js
create mode 100644 neonContext/SalesprojectChart/SalesprojectChart.aod
create mode 100644 neonView/SalesprojectChart_view/SalesprojectChart_view.aod
diff --git a/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod b/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
new file mode 100644
index 0000000000..bd720b911e
--- /dev/null
+++ b/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
@@ -0,0 +1,42 @@
+<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>SalesprojectChart_entity</name>
+ <title>Salesproject Charts</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/SalesprojectChart_entity/documentation.adoc</documentation>
+ <iconId>VAADIN:PIE_CHART</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>PARENT</name>
+ <title>Parent</title>
+ </entityField>
+ <entityField>
+ <name>X_PHASE</name>
+ <title>Phase</title>
+ </entityField>
+ <entityField>
+ <name>Y_COUNT</name>
+ <title>Count</title>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>X_PHASE.value</element>
+ <element>Y_COUNT.value</element>
+ <element>PARENT.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectChart_entity/documentation.adoc b/entity/SalesprojectChart_entity/documentation.adoc
new file mode 100644
index 0000000000..eff361e152
--- /dev/null
+++ b/entity/SalesprojectChart_entity/documentation.adoc
@@ -0,0 +1,3 @@
+== Salesproject Chart ==
+
+This entity provides charts to display the Phases / Status / ... of the Salesproject.
\ No newline at end of file
diff --git a/entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..e65797a6ad
--- /dev/null
+++ b/entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,34 @@
+import("system.vars");
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.translate");
+import("Data_lib");
+import("Keyword_lib");
+import("Money_lib");
+import("KeywordRegistry_basic");
+
+// load data
+
+var phases = db.table("select KEYID, AB_KEYWORD_ENTRY.TITLE, count(PHASE), AB_KEYWORD_ENTRY.SORTING \n\
+from SALESPROJECT join AB_KEYWORD_ENTRY on KEYID = PHASE and CONTAINER = 'SalesprojectPhase' and SORTING <> 7 \n\
+group by KEYID, AB_KEYWORD_ENTRY.TITLE, AB_KEYWORD_ENTRY.SORTING order by SORTING");
+
+for(i = 0; i < phases.length; i++){
+ if(phases[i][1] == "${SALESPROJECT_OFFER}"){
+ phases[i][1] = "Offer";
+ }
+}
+
+
+result.object(phases);
+
+
+
+
+
+
+
+
+
+
diff --git a/neonContext/SalesprojectChart/SalesprojectChart.aod b/neonContext/SalesprojectChart/SalesprojectChart.aod
new file mode 100644
index 0000000000..7697361d4a
--- /dev/null
+++ b/neonContext/SalesprojectChart/SalesprojectChart.aod
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>SalesprojectChart</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>SalesprojectChart_view</filterview>
+ <entity>SalesprojectChart_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>c50b2e10-86ca-4a5b-83d4-946a78c18786</name>
+ <view>SalesprojectChart_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
new file mode 100644
index 0000000000..ff38a00b95
--- /dev/null
+++ b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
@@ -0,0 +1,35 @@
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>SalesprojectChart_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <singleDataChartViewTemplate>
+ <name>PhaseFunnelChart</name>
+ <chartType>FUNNEL</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <parentField></parentField>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ <singleDataChartViewTemplate>
+ <name>PhaseDonutChart</name>
+ <chartType>DONUT</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <parentField></parentField>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ <singleDataChartViewTemplate>
+ <name>PhasePyramidChart</name>
+ <chartType>PYRAMID</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ </children>
+</neonView>
--
GitLab
From 8abd37e3f35b1ffb8baef605067d3ecbf9168ce8 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Thu, 4 Apr 2019 13:33:05 +0200
Subject: [PATCH 206/250] Salesproject scorecard with key figures
---
.../SalesprojectChart_entity.aod | 6 +--
.../Salesproject_entity.aod | 28 +++++++++++
.../open_saleprojects/valueProcess.js | 14 ++++++
.../overall_forecast/valueProcess.js | 14 ++++++
.../overall_turnover/valueProcess.js | 14 ++++++
.../entityfields/sent_offers/valueProcess.js | 13 +++++
.../_____LANGUAGE_EXTRA.aod | 9 ++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 9 ++++
neonContext/Salesproject/Salesproject.aod | 4 ++
.../SalesprojectScoreCard_view.aod | 50 +++++++++++++++++++
11 files changed, 162 insertions(+), 3 deletions(-)
create mode 100644 entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js
create mode 100644 neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
diff --git a/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod b/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
index bd720b911e..865b746689 100644
--- a/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
+++ b/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
@@ -1,5 +1,5 @@
<?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.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectChart_entity</name>
<title>Salesproject Charts</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -14,7 +14,7 @@
<name>UID</name>
</entityField>
<entityField>
- <name>PARENT</name>
+ <name>SORTING</name>
<title>Parent</title>
</entityField>
<entityField>
@@ -35,7 +35,7 @@
<element>UID.value</element>
<element>X_PHASE.value</element>
<element>Y_COUNT.value</element>
- <element>PARENT.value</element>
+ <element>SORTING.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index fc82706d67..4f929d040c 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -517,6 +517,34 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>OVERALL_TURNOVER</name>
+ <title>Turnover actual year</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OVERALL_FORECAST</name>
+ <title>Forecast actual year</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPEN_SALEPROJECTS</name>
+ <title>Open salesprojects</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SENT_OFFERS</name>
+ <title>Sent offers</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
+ </entityField>
<entityProvider>
<name>openSalesprojects</name>
<fieldType>DEPENDENCY_IN</fieldType>
diff --git a/entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js b/entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js
new file mode 100644
index 0000000000..5bad01babc
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var opensp = db.cell("select count(STATE) from SALESPROJECT \n\
+join AB_KEYWORD_ENTRY on KEYID = STATE and CONTAINER = 'SalesprojectState' and TITLE = 'Open' \n\
+group by KEYID, AB_KEYWORD_ENTRY.TITLE");
+
+result.string(opensp);
diff --git a/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js b/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js
new file mode 100644
index 0000000000..55161154b7
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var forecast = db.cell(SqlCondition.begin()
+ .andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+ .buildSql("select sum(VOLUME * 1000) from SALESPROJECT_FORECAST", "1=2"));
+
+result.string(forecast);
diff --git a/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js b/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js
new file mode 100644
index 0000000000..1a9825c1ad
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var turnover = db.cell(SqlCondition.begin()
+ .andPrepare("SALESORDER.SALESORDERDATE", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+ .buildSql("select sum(NET + VAT) from SALESORDER", "1=2"));
+
+result.string(turnover);
diff --git a/entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js b/entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js
new file mode 100644
index 0000000000..c415d73135
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var sentoffer = db.cell("select count(STATUS) from OFFER join AB_KEYWORD_ENTRY \n\
+on KEYID = STATUS and CONTAINER = 'OfferStatus' and TITLE = 'Sent' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
+
+result.string(sentoffer);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 7f1bc7254a..cbab88eb79 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2685,6 +2685,15 @@
<entry>
<key>Username already exists!</key>
</entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ </entry>
+ <entry>
+ <key>Turnover actual year</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year</key>
+ </entry>
<entry>
<key>This private person doeas already exist and can not be created once more.</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 4a8fb2f972..c565c0d19b 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -30,6 +30,10 @@
<key>Entrydate (Day)</key>
<value>Eingangsdatum (Tag)</value>
</entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ <value>Vertriebsprojektphasen</value>
+ </entry>
<entry>
<key>Turnover</key>
<value>Umsatz</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 7226f426ca..55aa1f3290 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2721,6 +2721,15 @@
<entry>
<key>Username already exists!</key>
</entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ </entry>
+ <entry>
+ <key>Turnover actual year</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year</key>
+ </entry>
<entry>
<key>This private person doeas already exist and can not be created once more.</key>
</entry>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index feef456053..fe73d71fbb 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -30,5 +30,9 @@
<name>d7fb7e2b-c932-4b96-be2c-ae5ec3d36beb</name>
<view>SalesprojectCycle_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>f93ffaae-a097-41d6-8ca8-fad02323a909</name>
+ <view>SalesprojectScoreCard_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
new file mode 100644
index 0000000000..642117e5d6
--- /dev/null
+++ b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
@@ -0,0 +1,50 @@
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectScoreCard_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>KeyFigures</name>
+ <title>Key figures</title>
+ <description>Kennzahlen</description>
+ <fragment>Salesproject/full</fragment>
+ <singleton v="false" />
+ <icon>VAADIN:GRID_BIG</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <scoreCardViewTemplate>
+ <name>KeyFigures</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9c2ca675-1a37-4ceb-ad49-279bddc1150b</name>
+ <entityField>OVERALL_TURNOVER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>23433d4d-94cb-4a25-99c1-88df451fcc34</name>
+ <entityField>OVERALL_FORECAST</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>da6c1a0b-723c-43d4-a168-1732ebe3bd34</name>
+ <entityField>OPEN_SALEPROJECTS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c376674f-fe29-4527-a2b3-db67e1dca085</name>
+ <entityField>SENT_OFFERS</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
--
GitLab
From 3e83f34934016977f9bcb448d838c3f97eb2e5e4 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Fri, 5 Apr 2019 08:09:55 +0200
Subject: [PATCH 207/250] Fixes salesproject charts and score card
---
.../Salesproject_entity.aod | 2 +-
.../_____LANGUAGE_EXTRA.aod | 3 +++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 +++++-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
.../SalesprojectChart_view.aod | 26 ++++++++++++++++---
5 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 4f929d040c..ec60c81963 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -526,7 +526,7 @@
</entityField>
<entityField>
<name>OVERALL_FORECAST</name>
- <title>Forecast actual year</title>
+ <title>Forecast actual year </title>
<contentType>NUMBER</contentType>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index cbab88eb79..53087cf5d2 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2739,6 +2739,9 @@
<entry>
<key>{$ADDRESS_IDENTIFIER}</key>
</entry>
+ <entry>
+ <key>Salesproject phases</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 c565c0d19b..4e7c4ae02d 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -31,7 +31,7 @@
<value>Eingangsdatum (Tag)</value>
</entry>
<entry>
- <key>Salesproject Phases</key>
+ <key>Salesproject phases</key>
<value>Vertriebsprojektphasen</value>
</entry>
<entry>
@@ -3517,6 +3517,12 @@
<key>{$ADDRESS_IDENTIFIER}</key>
<value>Bezeichnung</value>
</entry>
+ <entry>
+ <key>Turnover actual year</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year</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 55aa1f3290..e430baa505 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2770,6 +2770,9 @@
<key>{$ADDRESS_IDENTIFIER}</key>
<value>Identifier</value>
</entry>
+ <entry>
+ <key>Salesproject phases</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
index ff38a00b95..7b0791b033 100644
--- a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
+++ b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
@@ -1,7 +1,27 @@
<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectChart_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>Salesproject phases</name>
+ <title>Salesproject Phases</title>
+ <description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
+ <fragment>SalesprojectChart/full</fragment>
+ <singleton v="true" />
+ <icon>VAADIN:FUNNEL</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>chart</name>
+ <title>Chart</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
<layout>
<groupLayout>
<name>layout</name>
@@ -17,8 +37,8 @@
<entityField>#ENTITY</entityField>
</singleDataChartViewTemplate>
<singleDataChartViewTemplate>
- <name>PhaseDonutChart</name>
- <chartType>DONUT</chartType>
+ <name>PhasePieChart</name>
+ <chartType>PIE</chartType>
<xAxis>X_PHASE</xAxis>
<yAxis>Y_COUNT</yAxis>
<parentField></parentField>
--
GitLab
From 11b908ca5c51e7d2544da6183b9d14c8c0d29bac Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 16:20:55 +0200
Subject: [PATCH 208/250] Address: removed unused views
---
neonContext/Address/Address.aod | 11 -----
.../AddressEdit_view/AddressEdit_view.aod | 43 -------------------
.../AddressFilter_view/AddressFilter_view.aod | 43 -------------------
3 files changed, 97 deletions(-)
delete mode 100644 neonView/AddressEdit_view/AddressEdit_view.aod
delete mode 100644 neonView/AddressFilter_view/AddressFilter_view.aod
diff --git a/neonContext/Address/Address.aod b/neonContext/Address/Address.aod
index 85f79bd80d..87c5beb15b 100644
--- a/neonContext/Address/Address.aod
+++ b/neonContext/Address/Address.aod
@@ -3,20 +3,9 @@
<name>Address</name>
<title>Addresses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>AddressFilter_view</filterview>
- <editview>AddressEdit_view</editview>
- <preview>AddressEdit_view</preview>
<lookupview>AddressLookup_view</lookupview>
<entity>Address_entity</entity>
<references>
- <neonViewReference>
- <name>f36427d6-75b7-4f67-9cd9-e391bca3166e</name>
- <view>AddressFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>306f9a88-42be-4838-9698-c6ac5c6a7f57</name>
- <view>AddressEdit_view</view>
- </neonViewReference>
<neonViewReference>
<name>0b476864-5342-4cb2-aa0c-f1ab29bb99b4</name>
<view>AddressList_view</view>
diff --git a/neonView/AddressEdit_view/AddressEdit_view.aod b/neonView/AddressEdit_view/AddressEdit_view.aod
deleted file mode 100644
index 55e151a9eb..0000000000
--- a/neonView/AddressEdit_view/AddressEdit_view.aod
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AddressEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>b510378e-dfd3-4cec-bc2e-84b72aebb2b6</name>
- <entityField>ADDR_TYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
- <entityField>COUNTRY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c70668f3-6722-4a90-86d6-0d89be06dbe1</name>
- <entityField>ADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0eac157d-de3d-4ff0-9ac2-1927b33c854a</name>
- <entityField>BUILDINGNO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c70677f3-6722-4a90-86d6-0d89be06dbe1</name>
- <entityField>ZIP</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
- <entityField>CITY</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressFilter_view/AddressFilter_view.aod
deleted file mode 100644
index 4f6d79febe..0000000000
--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AddressFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Addresses</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>852583d4-1883-4b36-963f-6f3a4df63a89</name>
- <entityField>ADDR_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
- <entityField>COUNTRY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>32b8b6f0-bdbc-4a4b-b98c-0a22861b0e6c</name>
- <entityField>ADDRESS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9d93662b-f024-4b0b-a37e-6cc88afb9dd2</name>
- <entityField>BUILDINGNO</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>10e9e08f-db9b-4789-a4b4-b1a0a750b169</name>
- <entityField>ZIP</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>57247c5c-6498-420b-b288-68ca316cf7f2</name>
- <entityField>CITY</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
--
GitLab
From 91618b0d3097000dca8b4f0ec1ebe5cc9631058b Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 4 Apr 2019 16:32:01 +0200
Subject: [PATCH 209/250] Address: ADDRIDENTIFIER editable
---
neonView/AddressList_view/AddressList_view.aod | 4 ++++
neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod | 4 ++++
process/PostalAddress_lib/process.js | 7 ++++---
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 4c155db5b2..0baa8a5755 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -38,6 +38,10 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>6af52273-25bf-4286-83cc-217aea94ad09</name>
+ <entityField>ADDRIDENTIFIER</entityField>
+ </neonTableColumn>
</columns>
</titledListViewTemplate>
</children>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 3f827b5696..dbec2da120 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -36,6 +36,10 @@
<name>fafca2d6-c2dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>481496b8-d611-4b4a-9c5e-1d28a7136a2d</name>
+ <entityField>ADDRIDENTIFIER</entityField>
+ </neonTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index f3f2b67f1b..b21cd05e05 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -22,12 +22,13 @@ function AddressUtils(){}
* @param {String} pBuildingNo
* @param {String} pZipCode
* @param {String} pCity
+ * @param {String} pAddressIdentifier
*
* @return {String}
*/
-AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZipCode, pCity)
+AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier)
{
- return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity]);
+ return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier]);
};
/**
@@ -45,7 +46,7 @@ AddressUtils.getFormattedOnlineAddressById = function(pAddressId)
var addr = "";
if (addrId)
{
- var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY from ADDRESS ";
+ var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.ADDRIDENTIFIER from ADDRESS ";
var addrData = db.array(db.ROW,
SqlCondition.begin()
.andPrepare("ADDRESS.ADDRESSID", addrId)
--
GitLab
From b087398f724306bc209b842c8da9f10fbaf35941 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 5 Apr 2019 09:50:02 +0200
Subject: [PATCH 210/250] better performance for organisation and contacts by
adding sqlExpression for the standard address
---
.../Organisation_entity/Organisation_entity.aod | 15 +++++++++++++--
.../recordcontainers/db/fromClauseProcess.js | 5 ++++-
.../address_id.displayvalue/expression.js | 5 +++++
entity/Person_entity/Person_entity.aod | 17 ++++++++++++++---
.../recordcontainers/db/fromClauseProcess.js | 5 ++++-
.../address_id.displayvalue/expression.js | 5 +++++
process/PostalAddress_lib/process.js | 13 +++++++++++++
7 files changed, 58 insertions(+), 7 deletions(-)
create mode 100644 entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
create mode 100644 entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index ef0872720f..4da1b5d9f8 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -796,19 +796,26 @@
<onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
- <name>47c6c065-ae0e-4cee-b913-335570e3221c</name>
+ <name>f745a13c-6fbe-4cab-99d8-3cb7d599005a</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>e6120ee7-e6c3-4f60-9327-417627ba1fac</name>
+ <name>31f03bd6-83c1-4185-a9a7-4e6d94469fd2</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
+ <linkInformation>
+ <name>695731e1-879d-4fb1-a1bb-56ecfd6f7c03</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -897,6 +904,10 @@
<name>DATE_NEW_CONTACT.value</name>
<recordfield>CONTACT.DATE_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
index fd4f9ce328..81779a42ee 100644
--- a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,3 +1,6 @@
import("system.result");
-result.string("ORGANISATION join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)");
\ No newline at end of file
+//ADDRESS is necessary to display standard address fast within organisation lists
+result.string("ORGANISATION \n\
+ join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)\n\
+ left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)");
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
new file mode 100644
index 0000000000..beac43f3d9
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("PostalAddress_lib");
+import("system.result");
+
+var res = AddressUtils.formatOnelineSql();
+result.string(res);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 4595597581..d76edc5f1e 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -858,26 +858,33 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<onDBUpdate>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
- <name>cb2de42b-de48-4543-91d6-8d00af5c5736</name>
+ <name>3afdecb0-515e-43d2-872f-04c82ecca9ae</name>
<tableName>PERSON</tableName>
<primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>23fde8db-a3fe-421d-9e39-f6a0294e6883</name>
+ <name>217d431f-018c-4573-b786-d1b6b88f4b64</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>6766787e-d39b-4030-bd26-cacfcd80d386</name>
+ <name>19877118-eb80-4672-bd73-cf10dbbb052a</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
+ <linkInformation>
+ <name>64f188c2-e53d-44b5-9980-c867282eff7e</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -1014,6 +1021,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>USER_NEW_CONTACT.value</name>
<recordfield>CONTACT.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Person_entity/recordcontainers/db/fromClauseProcess.js b/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
index ce2f7eb850..96d05d16af 100644
--- a/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,7 @@
import("system.vars");
import("system.result");
-result.string("PERSON join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID ");
\ No newline at end of file
+//ADDRESS is necessary to display standard address fast within contact lists
+result.string("PERSON \n\
+ join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID\n\
+ left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
new file mode 100644
index 0000000000..beac43f3d9
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("PostalAddress_lib");
+import("system.result");
+
+var res = AddressUtils.formatOnelineSql();
+result.string(res);
\ No newline at end of file
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index b21cd05e05..bee94a606c 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -31,6 +31,19 @@ AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZip
return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier]);
};
+/**
+ * format the Address in one line as a sql statement
+ *
+ * @return {String} sql expression that can be used within a select statement
+ */
+AddressUtils.formatOnelineSql = function ()
+{
+ var maskingHelper = new SqlMaskingUtils();
+ var sqlExpression = maskingHelper.concat(["ADDRESS.COUNTRY", "ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.ADDRIDENTIFIER"], ", ");
+ return sqlExpression;
+};
+
+
/**
* returns the formatted address by the ADDRESSID as one line
*
--
GitLab
From ab4944cfe1a3e7ebf8363922698619f0023b87bc Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 5 Apr 2019 10:07:32 +0200
Subject: [PATCH 211/250] Organisation/Contact: remove IMAGE-binary fields from
Listviews
---
neonView/OrganisationFilter_view/OrganisationFilter_view.aod | 2 +-
neonView/PersonFilter_view/PersonFilter_view.aod | 2 +-
neonView/PersonSimpleList_view/PersonSimpleList_view.aod | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index a1a8f1e6e4..0be0dd2053 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -36,7 +36,7 @@
<columns>
<neonTableColumn>
<name>2008e7ac-9e6a-4104-9d5b-da60a10a1c02</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>a290a2ca-3236-4eb0-bf51-99f99d8414d6</name>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index 4f25712128..fe94380f98 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -37,7 +37,7 @@
<columns>
<neonTableColumn>
<name>210cc6ab-5123-4d8a-8f2e-a6cd91d494ef</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>125d04cc-5c7a-4c38-bd0f-b5d02d21067d</name>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 570e2fae64..30b81a27aa 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name>
--
GitLab
From fdd8acb2381fcc5045a6b5182b49d480b3247ceb Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Fri, 5 Apr 2019 10:31:03 +0200
Subject: [PATCH 212/250] change EmployeeRole layout to NoneLayout
---
neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
index f91bb0b4e7..8f7c8f87db 100644
--- a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -3,9 +3,9 @@
<name>EmployeeRoleEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericMultipleViewTemplate>
--
GitLab
From 1d0eada0c657f6dc96c84f1648e2f8521cb28674 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 5 Apr 2019 14:09:53 +0200
Subject: [PATCH 213/250] improve Person avatar
---
entity/Person_entity/imageProcess.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entity/Person_entity/imageProcess.js b/entity/Person_entity/imageProcess.js
index 9d30ec1ce2..07ab8d8c0f 100644
--- a/entity/Person_entity/imageProcess.js
+++ b/entity/Person_entity/imageProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string("TEXT:" + vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME"));
\ No newline at end of file
+result.string("TEXT:" + (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME") + " " + vars.getString("$field.ORGANISATION_ID.displayValue")).trim());
\ No newline at end of file
--
GitLab
From 9bbe54c550212c1a6fe74604703c407be49d08fb Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 5 Apr 2019 14:33:09 +0200
Subject: [PATCH 214/250] object relation tree inserts / deletes
---
aliasDefinition/Data_alias/Data_alias.aod | 62 ++++++++++++++++++
.../recordcontainers/jdito/contentProcess.js | 3 +-
.../ObjectTree_entity/ObjectTree_entity.aod | 63 ++++++++++++++++---
.../alter/children/insert/onActionProcess.js | 42 +++++++++++++
.../displayValueProcess.js | 9 +++
.../objectrelationtypeid/onValueChange.js | 38 +++++++++++
.../objectrelationtypeid/stateProcess.js | 12 ++++
.../objectrelationtypeid/valueProcess.js | 8 +++
.../children/objecttype_param/valueProcess.js | 5 ++
.../entityfields/parent_id/valueProcess.js | 9 +++
.../entityfields/selector/onValueChange.js | 3 -
.../target_context/valueProcess.js | 9 +++
.../recordcontainers/jdito/contentProcess.js | 45 ++++++++-----
.../recordcontainers/jdito/onDelete.js | 21 +++++++
.../recordcontainers/jdito/onInsert.js | 47 ++++++++++++++
entity/Object_entity/Object_entity.aod | 6 ++
neonContext/ObjectTree/ObjectTree.aod | 8 ++-
.../ObjectTreeEdit_view.aod | 31 +++++++++
.../ObjectTreeFilter_view.aod} | 4 +-
.../OrganisationMain_view.aod | 2 +-
neonView/PersonMain_view/PersonMain_view.aod | 2 +-
.../Data_alias/basic/2019.2/changelog.xml | 13 ++++
process/ObjectRelation_lib/process.js | 8 +--
23 files changed, 415 insertions(+), 35 deletions(-)
create mode 100644 entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js
create mode 100644 entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js
delete mode 100644 entity/ObjectTree_entity/entityfields/selector/onValueChange.js
create mode 100644 entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
create mode 100644 entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
create mode 100644 entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
create mode 100644 neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
rename neonView/{ObjectTree_view/ObjectTree_view.aod => ObjectTreeFilter_view/ObjectTreeFilter_view.aod} (85%)
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 89e097db34..fdfdb64c21 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5954,6 +5954,68 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>TEST</name>
+ <dbName></dbName>
+ <idColumn>TESTID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>TEST2</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TESTID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TEST1</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/Document_entity/recordcontainers/jdito/contentProcess.js b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
index 6682c389f9..ccee9b0372 100644
--- a/entity/Document_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.result");
import("system.db");
@@ -16,7 +17,7 @@ if(vars.exists("$param.AssignmentTable_param") &&
if(vars.exists("$param.Keyword_param")) {
keyword = vars.get("$param.Keyword_param");
}
-
+
// Check if multiple Documents are selected
if(vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
metadata = db.getBinaryMetadataForIds(vars.get("$local.idvalues"), true, alias)
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 02de3b4ff6..1dff17cb99 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -38,6 +38,10 @@
<expose v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityParameter>
+ <name>RelationType_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -53,6 +57,7 @@
<entityField>
<name>PARENT_ID</name>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TITLE</name>
@@ -63,14 +68,6 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>Selector</name>
- <title>Relationtype</title>
- <consumer>ObjectRelationTypes</consumer>
- <searchable v="true" />
- <state>EDITABLE</state>
- <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/selector/onValueChange.js</onValueChange>
- </entityField>
<entityConsumer>
<name>ObjectRelationTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -102,22 +99,70 @@
</entityField>
<entityField>
<name>TARGET_ID</name>
+ <consumer>Objects</consumer>
<searchable v="false" />
</entityField>
<entityField>
<name>TARGET_CONTEXT</name>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>INFO</name>
<title>Description</title>
+ <searchable v="false" />
</entityField>
+ <entityField>
+ <name>OBJECTRELATIONTYPEID</name>
+ <title>Relationtype</title>
+ <consumer>ObjectRelationTypes</consumer>
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js</onValueChange>
+ </entityField>
+ <entityConsumer>
+ <name>Objects</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionGroup>
+ <name>alter</name>
+ <children>
+ <entityActionField>
+ <name>insert</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityParameter>
+ <name>RelationType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
<element>TITLE.value</element>
@@ -126,7 +171,7 @@
<element>TARGET_ID.value</element>
<element>TARGET_CONTEXT.value</element>
<element>INFO.value</element>
- <element>Selector.value</element>
+ <element>OBJECTRELATIONTYPEID.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
new file mode 100644
index 0000000000..571d8ca4e3
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
@@ -0,0 +1,42 @@
+import("ObjectRelation_lib");
+import("system.logging");
+import("system.neon");
+import("system.vars");
+
+if (vars.exists("$local.rows") && vars.get("$local.rows"))
+{
+ var selectedRows = JSON.parse(vars.get("$local.rows"));
+ var uid = JSON.parse(selectedRows[0]["#LOOKUPID"]);
+ var isObjectRelationNode = typeof uid[2] == "string";
+
+ logging.log(JSON.parse(selectedRows[0]["#LOOKUPID"]).toSource())
+ logging.log(vars.getString("$param.ObjectId_param"))
+ logging.log(isObjectRelationNode)
+
+ var parentId;
+ var parentObjectType;
+ var relationType;
+
+ if (isObjectRelationNode)
+ {
+ parentId = uid[0];
+ parentObjectType = uid[3];
+ // get relationTypeId from the other side
+ //relationType = ObjectRelationUtils.getRelationType(uid[2])[10];
+ }
+ else
+ {
+ parentId = vars.getString("$param.ObjectId_param");
+ parentObjectType = vars.getString("$param.ObjectType_param");
+ //relationType = uid[2][0];
+ }
+
+ var params = {
+ "ObjectId_param" : parentId,
+ "ObjectType_param" : parentObjectType,
+ "RelationType_param" : vars.get("$field.OBJECTRELATIONTYPEID")
+ };
+
+ logging.log(params.toSource())
+ neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
new file mode 100644
index 0000000000..83a799bf34
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("ObjectRelation_lib");
+
+if (vars.get("$field.OBJECTRELATIONTYPEID"))
+{
+ result.string(translate.text(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[1]));
+}
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js
new file mode 100644
index 0000000000..9264282cd7
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js
@@ -0,0 +1,38 @@
+import("system.vars");
+import("system.db");
+import("system.result");
+import("system.neon");
+import("Sql_lib");
+import("Entity_lib");
+
+var selectedObjectRelationTypeId = vars.exists("$field.selectedObjectRelationTypeIdProxy") ? vars.get("$field.selectedObjectRelationTypeIdProxy") : "";
+selectedObjectRelationTypeId = ProcessHandlingUtils.getOnValidationValue(selectedObjectRelationTypeId);
+
+var relationTypeData = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", selectedObjectRelationTypeId)
+ .buildSql("select AB_OBJECTRELATIONTYPEID, OBJECT_TYPE, RELATION_TITLE, RELATION_TYPE, SIDE from AB_OBJECTRELATIONTYPE", "1=2"));
+
+if (relationTypeData[0])
+{
+ var otherRelationTypeData = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("AB_OBJECTRELATIONTYPE.RELATION_TYPE", relationTypeData[3])
+ .andPrepare("AB_OBJECTRELATIONTYPE.SIDE", (relationTypeData[4] == "1" ? "2" : "1"))
+ .buildSql("select AB_OBJECTRELATIONTYPEID, OBJECT_TYPE, RELATION_TITLE, RELATION_TYPE, SIDE from AB_OBJECTRELATIONTYPE", "1=2"))
+ if (!otherRelationTypeData[0])
+ {
+ otherRelationTypeData = relationTypeData;
+ }
+
+ if (relationTypeData[4] == "2")
+ {
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE2", relationTypeData[0]);
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE1", otherRelationTypeData[0]);
+ }
+ else if (relationTypeData[4] == "1")
+ {
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE1", relationTypeData[0]);
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE2", otherRelationTypeData[0]);
+ }
+
+ // neon.setFieldValue("$field.MySide", otherRelationTypeData[4]);
+}
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
new file mode 100644
index 0000000000..7c27f2f690
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.exists("$param.RelationType_param") && vars.get("$param.RelationType_param"))
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_AUTO);
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js
new file mode 100644
index 0000000000..6dad72dac5
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.RelationType_param") && vars.get("$param.RelationType_param"))
+{
+ result.string(vars.get("$param.RelationType_param"))
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js b/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..85f399b856
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+logging.log(vars.get("$field.TARGET_CONTEXT"))
+result.string(vars.get("$field.TARGET_CONTEXT"));
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js b/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js
new file mode 100644
index 0000000000..7eed476d46
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ObjectRelation_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ result.string(vars.get("$param.ObjectId_param"));
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/selector/onValueChange.js b/entity/ObjectTree_entity/entityfields/selector/onValueChange.js
deleted file mode 100644
index 821651c14e..0000000000
--- a/entity/ObjectTree_entity/entityfields/selector/onValueChange.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.neon");
-
-neon.refresh()
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js b/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
new file mode 100644
index 0000000000..700dc7461b
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ObjectRelation_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[6]);
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 2496696dde..ddabafed1e 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.db");
import("system.translate");
import("system.result");
@@ -5,7 +6,6 @@ import("system.vars");
import("ObjectRelation_lib");
import("Context_lib");
import("Sql_lib");
-import("system.tools");
var tree = []
var filter = JSON.parse(vars.get("$local.filter"))
@@ -54,7 +54,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
currentObjectId = _getRootID(currentObjectId, relationTypeData);
}
- let uids = _insertEntry(tree, [[currentObjectId, "", "", "", "", ""]], pNodeId, pLayer, pObjectType)
+ let uids = _insertEntry(tree, [[currentObjectId, "", "", "", "", relationTypeData[7]]], pNodeId, pLayer, pObjectType, selectedRelationType)
for (let i = 0; i < uids.length; i++)
{
_loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1, relationTypeData);
@@ -75,7 +75,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// TODO: Icons, BINDATA
// var icon = getIcon...
let uid = [currentObjectId, i, relationTypes[i]];
- tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, "", ""]);
+ tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, "", relationTypes[i][0]]);
_loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1, relationTypeData);
}
@@ -87,18 +87,31 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// if no relationType given, load from nodeId
if (!pRelationTypeData)
pRelationTypeData = pNodeId[2];
-
+ logging.log("aaa " + pRelationTypeData.toSource())
+ var thisRelationTypeId = pRelationTypeData[0];
+ var otherRelationTypeId = pRelationTypeData[10];
var hierarchy = pRelationTypeData[4];
var destObjectType = pRelationTypeData[6];
var relationType1 = pRelationTypeData[7];
var relationType2 = pRelationTypeData[8];
var direction = pRelationTypeData[3];
+ var relationTypeIdForNew = otherRelationTypeId;
+
if (hierarchy == "1")
{
var myData = _getEntryData(pNodeId[0], direction, relationType1, relationType2)
- let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType)
+
+
+ // if hierarchy and selected RelationType -> use the selected one
+ if (selectedRelationType)
+ relationTypeIdForNew = selectedRelationType
+ else
+ relationTypeIdForNew = thisRelationTypeId;
+
+
+ let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType, relationTypeIdForNew)
for (let i = 0; i < uids.length; i++)
{
_loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1, pRelationTypeData);
@@ -115,12 +128,15 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
var entryData = _getEntryData(pNodeId[0], direction, relationType1, relationType2, prevObjectId, true);
+ if (direction == "same")
+ relationTypeIdForNew = thisRelationTypeId
+
// add both sides. Only one will succeed, because the prevObjectId will be filtered and it will just return []
- let uids = _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, 0);
+ let uids = _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 0);
if (direction == "same")
{
var otherEntryData = _getEntryData(pNodeId[0], "normal", relationType1, relationType2, prevObjectId, true);
- uids =uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, 1));
+ uids = uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 1));
}
for (let i = 0; i < uids.length; i++)
@@ -134,7 +150,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
/**
* load data for a relation.
- * OBJECT_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE
+ * OBJECT_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, AB_OBJECTRELATIONTYPEID
*
* @param {String} pObjectId
* @param {String} pDirection
@@ -181,7 +197,7 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
// var image = getImageObject("Beziehung");
var data = db.table(cond.buildSql(
- "select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO \n\
+ "select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO, AB_OBJECTRELATIONTYPEID \n\
from AB_OBJECTRELATION \n\
join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " and ","1=2", "", false));
@@ -209,11 +225,12 @@ function _getRelationTypes(pObjectType)
* @param {Array[][]} pNodeId id of the parent
* @param {Integer} pLayer layernumber
* @param {String} pObjectType
+ * @param {String} pNewRelationTypeId the RelationType, a new relation should have, if this node is selected.
* @param {Integer} [pNum=undefined] optional number added to the key. Needed, if the key would not be unique.
*
- * @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, ""(not needed anymore), pObjectType, pNodeId, objectrelationid, objecttype
+ * @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, AB_OBJECTRELATIONTYPEID, pObjectType, pNodeId, objectrelationid, objecttype
*/
-function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNum)
+function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNewRelationTypeId, pNum)
{
var expanded = true;
if (pLayer > 10) expanded = false;
@@ -222,12 +239,12 @@ function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNum)
for(let i = 0; i < pEntryData.length; i++)
{
var display = db.cell(ContextUtils.getNameSql(pObjectType, pEntryData[i][0]));
- // TODO: Icon
- var uid = [pEntryData[i][0], i, "", pObjectType, pNodeId, pEntryData[i][2], pEntryData[i][1]]
+ // TODO: Icon
+ var uid = [pEntryData[i][0], i, pEntryData[i][5], pObjectType, pNodeId, pEntryData[i][2], pEntryData[i][1]]
if (pNum)
uid.push(pNum);
uids.push(uid);
- pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, pEntryData[i][4], ""]);
+ pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, pEntryData[i][4], pNewRelationTypeId]);
}
return uids;
}
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000..86e11604e1
--- /dev/null
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,21 @@
+import("system.logging");
+import("system.vars");
+import("system.neon");
+import("system.db");
+import("Sql_lib");
+
+
+var uid = JSON.parse(vars.get("$field.UID"));
+var isObjectRelationNode = typeof uid[2] == "string";
+
+if (isObjectRelationNode)
+{
+ var objectRelationId = uid[6];
+ logging.log("delete: " + objectRelationId)
+ db.deleteData("AB_OBJECTRELATION", SqlCondition.begin()
+ .andPrepareIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId)
+ .build("1=2"));
+
+ // Refresh otherwise the children of the deleted node would be moved to the root.
+ neon.refresh();
+}
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js b/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000..9be46d3b15
--- /dev/null
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,47 @@
+import("system.util");
+import("ObjectRelation_lib");
+import("system.vars");
+import("system.db");
+
+selectedObjectRelationTypeId = vars.get("$field.OBJECTRELATIONTYPEID");
+if (selectedObjectRelationTypeId)
+{
+ relationTypeData = ObjectRelationUtils.getRelationType(selectedObjectRelationTypeId)
+ if (relationTypeData[0])
+ {
+ var relationType1 = relationTypeData[7];
+ var relationType2 = relationTypeData[8];
+ var side = relationTypeData[9];
+ var objectId1;
+ var objectId2;
+ var info = vars.get("$field.INFO");
+
+
+ if (side == "1")
+ {
+ objectId1 = vars.get("$field.TARGET_ID");
+ objectId2 = vars.get("$field.PARENT_ID");
+ }
+ else
+ {
+ objectId1 = vars.get("$field.PARENT_ID");
+ objectId2 = vars.get("$field.TARGET_ID");
+ }
+
+ db.insertData("AB_OBJECTRELATION", [
+ "AB_OBJECTRELATIONID",
+ "OBJECT1_ROWID",
+ "OBJECT2_ROWID",
+ "AB_OBJECTRELATIONTYPE1",
+ "AB_OBJECTRELATIONTYPE2",
+ "INFO"
+ ], null, [
+ util.getNewUUID(),
+ objectId1,
+ objectId2,
+ relationType1,
+ relationType2,
+ info
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 62d80564fa..7dedc47f21 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -86,6 +86,12 @@
<fieldName>Objects</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>e55777a1-7dfc-46b3-b0e3-318eeecf018e</name>
+ <entityName>ObjectTree_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/neonContext/ObjectTree/ObjectTree.aod b/neonContext/ObjectTree/ObjectTree.aod
index b7ae46a2ca..a8f24a4415 100644
--- a/neonContext/ObjectTree/ObjectTree.aod
+++ b/neonContext/ObjectTree/ObjectTree.aod
@@ -2,11 +2,17 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>ObjectTree</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>ObjectTreeFilter_view</filterview>
+ <editview>ObjectTreeEdit_view</editview>
<entity>ObjectTree_entity</entity>
<references>
<neonViewReference>
<name>0c9fc36e-e3f7-4198-b675-5d9ddb177611</name>
- <view>ObjectTree_view</view>
+ <view>ObjectTreeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1122516a-5f1c-4f08-9995-02acaee2a0cd</name>
+ <view>ObjectTreeEdit_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod b/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
new file mode 100644
index 0000000000..472f2ae675
--- /dev/null
+++ b/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
@@ -0,0 +1,31 @@
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ObjectTreeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>fd656c16-ef80-479f-a106-4741fb86c95f</name>
+ <entityField>OBJECTRELATIONTYPEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>81ec0bf6-132c-4046-b770-f65da3cd4b6e</name>
+ <entityField>TARGET_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>04579da5-0609-4a43-97dd-9e773ec1a29b</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
similarity index 85%
rename from neonView/ObjectTree_view/ObjectTree_view.aod
rename to neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
index 2917cacd09..3649820320 100644
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
@@ -1,6 +1,6 @@
<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ObjectTree_view</name>
+ <name>ObjectTreeFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
@@ -12,10 +12,12 @@
<treeViewTemplate>
<name>ObjectRelations</name>
<parentField>PARENT_ID</parentField>
+ <favoriteActionGroup1>alter</favoriteActionGroup1>
<nodeExpandedField>EXPANDED</nodeExpandedField>
<titleField>TITLE</titleField>
<descriptionField>INFO</descriptionField>
<iconField>ICON</iconField>
+ <hideContentSearch v="true" />
<entityField>#ENTITY</entityField>
</treeViewTemplate>
</children>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index b8cddb7e65..33c7ef2568 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -53,7 +53,7 @@
<neonViewReference>
<name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
<entityField>ObjectTrees</entityField>
- <view>ObjectTree_view</view>
+ <view>ObjectTreeFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>39c98ccb-7f77-4df0-818f-1f302f69fec4</name>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 25df37d62a..81c60ecc29 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -42,7 +42,7 @@
<neonViewReference>
<name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
<entityField>ObjectTrees</entityField>
- <view>ObjectTree_view</view>
+ <view>ObjectTreeFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>be48c6fe-1837-4c40-aef1-130fc1a5c544</name>
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
index 4c52dd94a3..11919373ef 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
@@ -129,4 +129,17 @@
<include relativeToChangelogFile="true" file="indicesRefactor/Keyword.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
+
+
+
+ <changeSet author="j.hoermann" id="1df96464-abff-4a3c-b52c-759d073a9a7a">
+ <createTable tableName="TEST">
+ <column name="TESTID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_TEST_TESTID"/>
+ </column>
+ <column name="TEST1" type="VARCHAR(36)"/>
+ <column name="TEST2" type="VARCHAR(36)"/>
+ </createTable>
+ </changeSet>
+
</databaseChangeLog>
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
index 2457c50902..1010f1a658 100644
--- a/process/ObjectRelation_lib/process.js
+++ b/process/ObjectRelation_lib/process.js
@@ -14,7 +14,7 @@ function ObjectRelationUtils() {}
* Normally it only returns the id and title. If you set pFullInfo to true, you will get additional information, too.
*
* @param {String} pObjectType the object type to load the relation types for.]
- * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side
+ * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, otherSide-RELATION_TYPE
*
* @return {String[][]}
*/
@@ -54,7 +54,7 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
-- typeId of Object1\n\
case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE" + sql,
+ main.SIDE, type2.AB_OBJECTRELATIONTYPEID" + sql,
[
[pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]
]
@@ -65,7 +65,7 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
/**
* Get all possible relationTypes by a objectType.
- * returns the id, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side
+ * returns the id, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, otherSide-RELATION_TYPE
*
* @param {String} pObjectTypeId the object type to load the relation types for.]
*
@@ -94,7 +94,7 @@ ObjectRelationUtils.getRelationType = function(pObjectTypeId)
-- typeId of Object1\n\
case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE" + sql,
+ main.SIDE, type2.AB_OBJECTRELATIONTYPEID" + sql,
[
[pObjectTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]],
]
--
GitLab
From 0d7fd8504abee2f87ac5e1990ec11e67d13daeda Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 5 Apr 2019 14:34:14 +0200
Subject: [PATCH 215/250] remove logging
---
.../alter/children/insert/onActionProcess.js | 11 +----------
.../objects/children/objecttype_param/valueProcess.js | 3 +--
.../recordcontainers/jdito/contentProcess.js | 2 --
.../recordcontainers/jdito/onDelete.js | 2 --
4 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
index 571d8ca4e3..16288da804 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
@@ -1,5 +1,4 @@
import("ObjectRelation_lib");
-import("system.logging");
import("system.neon");
import("system.vars");
@@ -8,11 +7,7 @@ if (vars.exists("$local.rows") && vars.get("$local.rows"))
var selectedRows = JSON.parse(vars.get("$local.rows"));
var uid = JSON.parse(selectedRows[0]["#LOOKUPID"]);
var isObjectRelationNode = typeof uid[2] == "string";
-
- logging.log(JSON.parse(selectedRows[0]["#LOOKUPID"]).toSource())
- logging.log(vars.getString("$param.ObjectId_param"))
- logging.log(isObjectRelationNode)
-
+
var parentId;
var parentObjectType;
var relationType;
@@ -21,14 +16,11 @@ if (vars.exists("$local.rows") && vars.get("$local.rows"))
{
parentId = uid[0];
parentObjectType = uid[3];
- // get relationTypeId from the other side
- //relationType = ObjectRelationUtils.getRelationType(uid[2])[10];
}
else
{
parentId = vars.getString("$param.ObjectId_param");
parentObjectType = vars.getString("$param.ObjectType_param");
- //relationType = uid[2][0];
}
var params = {
@@ -37,6 +29,5 @@ if (vars.exists("$local.rows") && vars.get("$local.rows"))
"RelationType_param" : vars.get("$field.OBJECTRELATIONTYPEID")
};
- logging.log(params.toSource())
neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params);
}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js b/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
index 85f399b856..b73f117c99 100644
--- a/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
+++ b/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
@@ -1,5 +1,4 @@
-import("system.logging");
import("system.vars");
import("system.result");
-logging.log(vars.get("$field.TARGET_CONTEXT"))
+
result.string(vars.get("$field.TARGET_CONTEXT"));
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index ddabafed1e..bc49795bd4 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.db");
import("system.translate");
import("system.result");
@@ -87,7 +86,6 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// if no relationType given, load from nodeId
if (!pRelationTypeData)
pRelationTypeData = pNodeId[2];
- logging.log("aaa " + pRelationTypeData.toSource())
var thisRelationTypeId = pRelationTypeData[0];
var otherRelationTypeId = pRelationTypeData[10];
var hierarchy = pRelationTypeData[4];
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
index 86e11604e1..27ac27f8fe 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.neon");
import("system.db");
@@ -11,7 +10,6 @@ var isObjectRelationNode = typeof uid[2] == "string";
if (isObjectRelationNode)
{
var objectRelationId = uid[6];
- logging.log("delete: " + objectRelationId)
db.deleteData("AB_OBJECTRELATION", SqlCondition.begin()
.andPrepareIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId)
.build("1=2"));
--
GitLab
From 21a65f0f3f573d6aa2598580a0549ad22860f5c2 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 5 Apr 2019 15:52:05 +0200
Subject: [PATCH 216/250] objectTree exclude some Ids
---
.../ObjectTree_entity/ObjectTree_entity.aod | 6 +-
.../excludedobjectids_param/valueProcess.js | 21 ++++++
entity/Object_entity/Object_entity.aod | 70 +++++++++----------
.../entityfields/oneobject/documentation.adoc | 3 -
.../recordcontainers/jdito/contentProcess.js | 14 ++--
process/Context_lib/process.js | 19 ++++-
6 files changed, 81 insertions(+), 52 deletions(-)
create mode 100644 entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js
delete mode 100644 entity/Object_entity/entityfields/oneobject/documentation.adoc
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 1dff17cb99..1be26c1bbf 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -127,7 +127,7 @@
<dependency>
<name>dependency</name>
<entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
+ <fieldName>FilteredObjects</fieldName>
</dependency>
<children>
<entityParameter>
@@ -136,6 +136,10 @@
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
</entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityActionGroup>
diff --git a/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js b/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js
new file mode 100644
index 0000000000..59596bc594
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js
@@ -0,0 +1,21 @@
+import("Sql_lib");
+import("system.vars");
+import("system.result");
+import("system.db");
+import("ObjectRelation_lib");
+
+var relationTypeData = ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"));
+
+var sql1 = db.translateStatement(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$field.PARENT_ID")
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", relationTypeData[7])
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", relationTypeData[8])
+ .buildSql("select OBJECT2_ROWID from AB_OBJECTRELATION", "1=2"));
+
+var sql2 = db.translateStatement(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.OBJECT2_ROWID", "$field.PARENT_ID")
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", relationTypeData[7])
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", relationTypeData[8])
+ .buildSql("select OBJECT1_ROWID from AB_OBJECTRELATION", "1=2"));
+
+result.object([vars.get("$field.PARENT_ID")].concat(db.array(db.COLUMN, sql1 + " union " + sql2)));
\ No newline at end of file
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 7dedc47f21..189f11b3a9 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -29,32 +29,6 @@
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>OneObject</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <documentation>%aditoprj%/entity/Object_entity/entityfields/oneobject/documentation.adoc</documentation>
- <recordContainer>jdito</recordContainer>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
<entityProvider>
<name>AllObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
@@ -86,25 +60,18 @@
<fieldName>Objects</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>e55777a1-7dfc-46b3-b0e3-318eeecf018e</name>
- <entityName>ObjectTree_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="false" />
- <mandatory v="false" />
- </entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -170,6 +137,35 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>FilteredObjects</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
+ <entityName>ObjectTree_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Object_entity/entityfields/oneobject/documentation.adoc b/entity/Object_entity/entityfields/oneobject/documentation.adoc
deleted file mode 100644
index 628c214780..0000000000
--- a/entity/Object_entity/entityfields/oneobject/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-== OneObjects provider ==
-
-This provider returns one specific object.
\ No newline at end of file
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 4c8e5d685b..4497cff400 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -3,16 +3,14 @@ import("system.vars");
import("system.result");
import("Context_lib");
+
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
{
- if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
- {
- result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"), false, undefined, false)));
- }
- else
- {
- result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false)))
- }
+ var excludedIds = [];
+ if (vars.exists("$param.ExcludedObjectIds_param") && vars.get("$param.ExcludedObjectIds_param"))
+ excludedIds = JSON.parse(vars.get("$param.ExcludedObjectIds_param"));
+
+ result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false, excludedIds)))
}
else
{
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index e08292ee51..82ea3eef6b 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -375,14 +375,14 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
-ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive, pWithState)
+ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pExcludedObjectIds)
{
var selectMap = ContextUtils.getSelectMap();
var ownContextSelector = selectMap[pContextId];
var cond = SqlCondition.begin();
- if (pRowId)
+ if (pContactId)
{
- cond.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.contactIdField, pRowId)
+ cond.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.contactIdField, pContactId)
}
if (pActive != undefined)
@@ -401,6 +401,19 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive
cond.andSqlCondition(condSub);
}
}
+
+ if (pExcludedObjectIds)
+ {
+ var exludedIdsCond = new SqlCondition()
+
+ pExcludedObjectIds.forEach(function(id)
+ {
+ this.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.idField, id, "# <> ?");
+ }, exludedIdsCond)
+
+ cond.andSqlCondition(exludedIdsCond);
+ }
+
var dateColumn = "";
if (pWithDate === true)
dateColumn = ", " + (ownContextSelector.creationDateField || "''");
--
GitLab
From 6eea67b71ec0479e5a3a05ce4070f95ba373b8ee Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 5 Apr 2019 16:34:03 +0200
Subject: [PATCH 217/250] Attribute: jdito recordcontainer
---
.../recordcontainers/jdito/contentProcess.js | 97 +++++++++++++++++++
.../recordcontainers/jdito/onDelete.js | 35 +++++++
.../recordcontainers/jdito/onInsert.js | 23 +++++
.../recordcontainers/jdito/onUpdate.js | 26 +++++
4 files changed, 181 insertions(+)
create mode 100644 entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
create mode 100644 entity/Attribute_entity/recordcontainers/jdito/onDelete.js
create mode 100644 entity/Attribute_entity/recordcontainers/jdito/onInsert.js
create mode 100644 entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000..c56f881e00
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,97 @@
+import("JditoFilter_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+import("Attribute_lib");
+
+var condition = new SqlCondition();
+
+var getGroups = vars.exists("$param.GetGroups_param") && vars.get("$param.GetGroups_param");
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
+if (getGroups)
+{
+ //this is for the selection of the superordinate attribute, this condition
+ //filters out the own id and the children to prevent loops
+ condition.andSqlCondition(SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP)
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$param.AttrParentId_param", "# != ?")
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID not in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')")
+ .build());
+}
+else if (objectType) //if there's an objectType, it comes from the AttributeRelation entity
+{
+ var filteredAttributes = [];
+ if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+ filteredAttributes = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
+
+ var ids = AttributeUtil.getPossibleAttributes(objectType, false, filteredAttributes);
+ condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + ids.join("','") + "')");
+}
+else
+{
+ var type = vars.exists("$param.AttrParentType_param") && vars.get("$param.AttrParentType_param");
+ if (type == $AttributeTypes.COMBO)
+ condition = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", "$param.AttrParentId_param")
+ .build();
+ else if (type)
+ {
+ var parentId = vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param");
+ if (parentId)
+ condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')");
+ }
+}
+
+var sql = "select AB_ATTRIBUTEID, AB_ATTRIBUTEID, ATTRIBUTE_ACTIVE, "
+ + "ATTRIBUTE_NAME, ATTRIBUTE_PARENT_ID, ATTRIBUTE_TYPE, "
+ + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE")
+ + ", KEYWORD_CONTAINER from AB_ATTRIBUTE";
+
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ condition.and(" AB_ATTRIBUTEID in ('" + vars.get("$local.idvalues").join("','") + "')");
+else if (vars.exists("$local.filter") && vars.get("$local.filter"))
+{
+ var filter = vars.get("$local.filter");
+ condition.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE")));
+}
+
+var attributes = db.table(condition.buildSql(sql, "1=1"));
+
+if (!(vars.exists("$local.idvalues") && vars.get("$local.idvalues")))
+ attributes = _sortArrayForTree(attributes);
+
+result.object(attributes);
+
+//sorts the records in a way that a tree can be built
+function _sortArrayForTree (pArray)
+{
+ var rows = {};
+ var allIds = {};
+ var idIndex = 1;
+ var parentIdIndex = 4;
+
+ pArray.forEach(function (row) {allIds[row[idIndex]] = true;});
+
+ var index = 0;
+
+ for (let itemsAdded = true; itemsAdded; itemsAdded = oldIndex != index)
+ {
+ var oldIndex = index;
+ pArray.forEach(function (row)
+ {
+ if (!(row[idIndex] in this) && (row[parentIdIndex] in this || !allIds[row[parentIdIndex]]))
+ this[row[idIndex]] = {
+ data : row,
+ index : index++
+ };
+ }, rows);
+ }
+ var sortedArray = new Array(Object.keys(rows).length);
+ for (let i in rows)
+ sortedArray[rows[i].index] = rows[i].data;
+
+ return sortedArray;
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000..61929ba31c
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,35 @@
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+import("Attribute_lib");
+
+var condition = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+ .build("1=2");
+
+db.deleteData("AB_ATTRIBUTE", conditon);
+
+var attributeId = vars.get("$field.UID");
+
+var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
+
+var condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all entries in AB_ATTRIBUTEUSAGE belonging to the attribute to avoid unrelated entries
+db.deleteData("AB_ATTRIBUTEUSAGE", condition);
+
+condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all entries in AB_ATTRIBUTERELATION for the attributes
+db.deleteData("AB_ATTRIBUTERELATION", condition);
+
+condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all attribute children
+db.deleteData("AB_ATTRIBUTE", condition);
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000..87565632d7
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,23 @@
+import("system.db");
+import("system.vars");
+
+var columns = [
+ "AB_ATTRIBUTEID",
+ "ATTRIBUTE_ACTIVE",
+ "ATTRIBUTE_LEVEL",
+ "ATTRIBUTE_NAME",
+ "ATTRIBUTE_PARENT_ID",
+ "ATTRIBUTE_TYPE",
+ "KEYWORD_CONTAINER"
+];
+var values = [
+ vars.get("$field.UID"),
+ vars.get("$field.ATTRIBUTE_ACTIVE"),
+ vars.get("$field.ATTRIBUTE_LEVEL"),
+ vars.get("$field.ATTRIBUTE_NAME"),
+ vars.get("$field.ATTRIBUTE_PARENT_ID"),
+ vars.get("$field.ATTRIBUTE_TYPE"),
+ vars.get("$field.KEYWORD_CONTAINER")
+];
+
+db.insertData("AB_ATTRIBUTE", columns, null, values);
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000..6740df0d14
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,26 @@
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+
+var columns = [
+ "ATTRIBUTE_ACTIVE",
+ "ATTRIBUTE_LEVEL",
+ "ATTRIBUTE_NAME",
+ "ATTRIBUTE_PARENT_ID",
+ "ATTRIBUTE_TYPE",
+ "KEYWORD_CONTAINER"
+];
+var values = [
+ vars.get("$field.ATTRIBUTE_ACTIVE"),
+ vars.get("$field.ATTRIBUTE_LEVEL"),
+ vars.get("$field.ATTRIBUTE_NAME"),
+ vars.get("$field.ATTRIBUTE_PARENT_ID"),
+ vars.get("$field.ATTRIBUTE_TYPE"),
+ vars.get("$field.KEYWORD_CONTAINER")
+];
+
+var condition = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+ .build("1=2");
+
+db.updateData("AB_ATTRIBUTE", columns, null, values, conditon);
\ No newline at end of file
--
GitLab
From c00bac018fd52fb1c748665ab250c21bdaf54986 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 8 Apr 2019 08:53:28 +0200
Subject: [PATCH 218/250] cleanup
---
.../db_changes/Data_alias/basic/2019.2/changelog.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
index 11919373ef..b79cfcfc54 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
@@ -130,16 +130,4 @@
<include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
-
-
- <changeSet author="j.hoermann" id="1df96464-abff-4a3c-b52c-759d073a9a7a">
- <createTable tableName="TEST">
- <column name="TESTID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_TEST_TESTID"/>
- </column>
- <column name="TEST1" type="VARCHAR(36)"/>
- <column name="TEST2" type="VARCHAR(36)"/>
- </createTable>
- </changeSet>
-
</databaseChangeLog>
--
GitLab
From 31454c57631d5edd8287d68418982ec30169a8c7 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 11:10:12 +0200
Subject: [PATCH 219/250] Standard-Address: Fixed new contact
---
entity/Contact_entity/Contact_entity.aod | 2 +-
.../entityfields/address_id/valueProcess.js | 14 ++++++++++++++
.../entityfields/organisation_id/onValueChange.js | 4 ----
entity/Person_entity/Person_entity.aod | 3 +--
4 files changed, 16 insertions(+), 7 deletions(-)
create mode 100644 entity/Contact_entity/entityfields/address_id/valueProcess.js
delete mode 100644 entity/Contact_entity/entityfields/organisation_id/onValueChange.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 1d93750675..ca27c05342 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -29,7 +29,6 @@
<mandatory v="false" />
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
- <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>PERSON_ID</name>
@@ -92,6 +91,7 @@
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PERSON_TITLE</name>
diff --git a/entity/Contact_entity/entityfields/address_id/valueProcess.js b/entity/Contact_entity/entityfields/address_id/valueProcess.js
new file mode 100644
index 0000000000..d1d6810b04
--- /dev/null
+++ b/entity/Contact_entity/entityfields/address_id/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("StandardObject_lib");
+
+// Check if the standard address is already set.
+if (vars.get("$field.ADDRESS_ID") === null || vars.get("$field.ADDRESS_ID") === "" || vars.get("$field.ADDRESS_ID") == 0) {
+ var possibleStandardAddressID = new StandardObject("Address", null, "Person", vars.get("$field.CONTACTID"))
+ .onPersonValueChange(vars.get("$field.ORGANISATION_ID"));
+
+ // If a possible standard addrss was found it should get applied to the field.
+ if (possibleStandardAddressID !== null)
+ result.string(possibleStandardAddressID);
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
deleted file mode 100644
index 0347a3d2d5..0000000000
--- a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-
-//since the standard address can be only values of org the standard address has to be reset on org change
-vars.set("$field.ADDRESS_ID", "");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index d76edc5f1e..7ee31a9d54 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -481,6 +481,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>Address</title>
<consumer>ContactAndOrganisationAddresses</consumer>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
@@ -945,12 +946,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
- <recordfield></recordfield>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
- <recordfield></recordfield>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
--
GitLab
From 2033a413310a2f6e986029e8ff6fa50e0a9b3f4b Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:44:11 +0200
Subject: [PATCH 220/250] Standard-Address: Removed static ID
---
process/StandardObject_lib/process.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 52d5ba43de..4e39fc12e4 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -3,6 +3,7 @@ import("system.db");
import("Keyword_lib");
import("KeywordRegistry_basic");
import("Contact_lib");
+import("Communication_lib");
function StandardObject (pObjectType, pObjectID, pScopeType, pScopeID) {
if (!this._isValidType("object", pObjectType))
@@ -245,8 +246,8 @@ StandardObject.prototype._getCompanyStandardAddress = function (pOrganisationID)
StandardObject.prototype._hasStandardCommunicationByMedium = function (pContactID, pMediumCategory) {
var dbResult = db.array(db.COLUMN, "select CHAR_VALUE from COMMUNICATION"
+ " left join AB_KEYWORD_ENTRY on KEYID = MEDIUM_ID"
- + " left join AB_KEYWORD_ATTRIBUTERELATION on AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID and AB_KEYWORD_ATTRIBUTE_ID = '7250ff28-1d48-41cc-bb36-8c33ace341bb'"
- + " where STANDARD = 1 and CONTACT_ID = '" + pContactID + "'");
+ + " left join AB_KEYWORD_ATTRIBUTERELATION on AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID"
+ + " where STANDARD = 1 and CONTACT_ID = '" + pContactID + "' and KEYID in ('" + CommUtil.getMediumIdsByCategory(pMediumCategory).join("', '") + "')");
return dbResult.indexOf(pMediumCategory) !== -1;
}
--
GitLab
From f69d353e0c0fe7af2f4b63a56b5bf8be0a948ce4 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:48:09 +0200
Subject: [PATCH 221/250] KeywordRegistry_basic: Added taskStatus$new
---
process/KeywordRegistry_basic/process.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index ec0826d232..b38cf7734b 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -36,6 +36,7 @@ $KeywordRegistry.offerStatus = function(){return "OfferStatus";};
$KeywordRegistry.organisationType = function(){return "OrganisationType";};
$KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.taskStatus = function(){return "TaskStatus";};
+$KeywordRegistry.taskStatus$new = function(){return "21bc4d20-1a87-4247-8f7c-8d3a09631850";};
$KeywordRegistry.taskType = function(){return "TaskType";};
$KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
--
GitLab
From 9d35a4ace54e725761b5ba0368f8ca2aa596a31d Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:48:30 +0200
Subject: [PATCH 222/250] Task_entity/status: Removed static ID
---
entity/Task_entity/entityfields/status/valueProcess.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/entity/Task_entity/entityfields/status/valueProcess.js b/entity/Task_entity/entityfields/status/valueProcess.js
index b3253f839f..fe5d8581fd 100644
--- a/entity/Task_entity/entityfields/status/valueProcess.js
+++ b/entity/Task_entity/entityfields/status/valueProcess.js
@@ -2,6 +2,7 @@ import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
+import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("21bc4d20-1a87-4247-8f7c-8d3a09631850");
\ No newline at end of file
+ result.string($KeywordRegistry.taskStatus$new());
\ No newline at end of file
--
GitLab
From ff60be9c3b7c0ceda929db2643d130347084f2e7 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:50:37 +0200
Subject: [PATCH 223/250] KeywordRegistry_basic: Added taskType$Task
---
process/KeywordRegistry_basic/process.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index b38cf7734b..2ba1ff4e2d 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -38,6 +38,7 @@ $KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.taskStatus = function(){return "TaskStatus";};
$KeywordRegistry.taskStatus$new = function(){return "21bc4d20-1a87-4247-8f7c-8d3a09631850";};
$KeywordRegistry.taskType = function(){return "TaskType";};
+$KeywordRegistry.taskType$Task = function(){return "4dee8727-8299-422e-ae41-6cdf9de2dfd7";};
$KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
$KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9";};
--
GitLab
From 7d2dd458a1b1c734a9fda66a157f86dfa79ec414 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:50:49 +0200
Subject: [PATCH 224/250] Task_entity/type: Removed static ID
---
entity/Task_entity/entityfields/type/valueProcess.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js
index 68427766d1..e1331380ae 100644
--- a/entity/Task_entity/entityfields/type/valueProcess.js
+++ b/entity/Task_entity/entityfields/type/valueProcess.js
@@ -1,4 +1,5 @@
import("system.result");
+import("KeywordRegistry_basic");
// Sets the type to "Task" as default value.
-result.string("4dee8727-8299-422e-ae41-6cdf9de2dfd7");
\ No newline at end of file
+result.string($KeywordRegistry.taskType$Task());
\ No newline at end of file
--
GitLab
From ff8f0a16a8b172c8d3c5443a571ec4442a27f0a4 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:53:32 +0200
Subject: [PATCH 225/250] KeywordRegistry_basic: Added taskPriority$low
---
process/KeywordRegistry_basic/process.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 2ba1ff4e2d..6a8fad1d58 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -60,6 +60,7 @@ $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"
$KeywordRegistry.salesprojectState = function(){return "SalesprojectState";};
$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
$KeywordRegistry.taskPriority = function(){return "TaskPriority";};
+$KeywordRegistry.taskPriority$low = function(){return "09072b59-d12f-469b-acbd-18a28232ff70";};
$KeywordRegistry.taskProgress = function(){return "TaskProgress";};
$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState";};
$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType";};
--
GitLab
From f88b4f0e292861cfb7c9979baeb59ed60e1a2026 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:54:00 +0200
Subject: [PATCH 226/250] Task_entity/priority: Removed static ID
---
entity/Task_entity/entityfields/priority/valueProcess.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/entity/Task_entity/entityfields/priority/valueProcess.js b/entity/Task_entity/entityfields/priority/valueProcess.js
index 97f6684068..0639e8287e 100644
--- a/entity/Task_entity/entityfields/priority/valueProcess.js
+++ b/entity/Task_entity/entityfields/priority/valueProcess.js
@@ -2,6 +2,7 @@ import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
+import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("09072b59-d12f-469b-acbd-18a28232ff70");
\ No newline at end of file
+ result.string($KeywordRegistry.taskPriority$low());
--
GitLab
From 42a9cd31b772a1f722f42f1b0d4ca09c2b6a09b1 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:56:39 +0200
Subject: [PATCH 227/250] KeywordRegistry_basic: Added taskProgress$0
---
process/KeywordRegistry_basic/process.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 6a8fad1d58..dda81268ff 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -62,6 +62,7 @@ $KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
$KeywordRegistry.taskPriority = function(){return "TaskPriority";};
$KeywordRegistry.taskPriority$low = function(){return "09072b59-d12f-469b-acbd-18a28232ff70";};
$KeywordRegistry.taskProgress = function(){return "TaskProgress";};
+$KeywordRegistry.taskProgress$0 = function(){return "ec92271b-eac2-4ec2-be24-ab4abde7e939";};
$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState";};
$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType";};
$KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm";};
--
GitLab
From 5a6a34a5385557fce177398e9e0c27e097f79239 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 13:57:00 +0200
Subject: [PATCH 228/250] Task_entity/progress: Removed static ID
---
entity/Task_entity/entityfields/progress/valueProcess.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/entity/Task_entity/entityfields/progress/valueProcess.js b/entity/Task_entity/entityfields/progress/valueProcess.js
index 50f7254139..854d3c9429 100644
--- a/entity/Task_entity/entityfields/progress/valueProcess.js
+++ b/entity/Task_entity/entityfields/progress/valueProcess.js
@@ -2,6 +2,7 @@ import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
+import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("ec92271b-eac2-4ec2-be24-ab4abde7e939");
\ No newline at end of file
+ result.string($KeywordRegistry.taskProgress$0());
\ No newline at end of file
--
GitLab
From 983f7fd630173b452bbdffcf42a1743501a034a1 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 14:25:38 +0200
Subject: [PATCH 229/250] Liquibase: Added update keyword essentials script
---
.../Data_alias/basic/2019.2/changelog.xml | 49 ++++++++++---------
.../2019.2/update_Keyword_Essentials.xml | 17 +++++++
2 files changed, 42 insertions(+), 24 deletions(-)
create mode 100644 others/db_changes/Data_alias/basic/2019.2/update_Keyword_Essentials.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
index b79cfcfc54..453deea967 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
@@ -20,7 +20,7 @@
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
@@ -28,30 +28,30 @@
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
-
+
<include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
-
+
<include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
-
+
<include relativeToChangelogFile="true" file="activity_add_parent.xml"/>
<include relativeToChangelogFile="true" file="task_add_parent.xml"/>
<include relativeToChangelogFile="true" file="create_salutation.xml"/>
-
+
<include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
-
+
<!--References to the Keyword Values-->
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/OfferProbability.xml"/>
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/ActivityCategory.xml"/>
@@ -65,7 +65,7 @@
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/TaskPriority.xml"/>
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml"/>
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml"/>
-
+
<!--References to the reference files-->
<include relativeToChangelogFile="true" file="AditoBasic/init_OfferProbability.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ActivityCategory.xml"/>
@@ -83,27 +83,27 @@
<include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
<include relativeToChangelogFile="true" file="SalesOrder_source_offer.xml"/>
<include relativeToChangelogFile="true" file="Product_remove_fk.xml"/>
-
+
<include relativeToChangelogFile="true" file="data/example_attribute/Attribute.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_attribute/AttributeUsage.xml" context="example"/>
-
+
<include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
-
+
<include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
-
+
<include relativeToChangelogFile="true" file="drop_pricePolitics-weakness-strength.xml"/>
-
+
<include relativeToChangelogFile="true" file="update_pricelist_keyword.xml"/>
-
+
<include relativeToChangelogFile="true" file="create_taskLink.xml"/>
-
+
<include relativeToChangelogFile="true" file="Offer_terms.xml"/>
-
+
<include relativeToChangelogFile="true" file="add_ObjectRelation_type.xml"/>
<include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
-
+
<include relativeToChangelogFile="true" file="Salesproject_add_column.xml"/>
-
+
<include relativeToChangelogFile="true" file="AditoBasic/update_Strength_Weakness.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactDepartment.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactContactrole.xml"/>
@@ -124,10 +124,11 @@
<include relativeToChangelogFile="true" file="offer_add_date_editnew_user_editnew.xml"/>
<include relativeToChangelogFile="true" file="attributerelation_add_date_editnew_user_editnew.xml"/>
<include relativeToChangelogFile="true" file="communication_add_date_editnew_user_editnew.xml"/>
-
+
<include relativeToChangelogFile="true" file="indicesRefactor/ContactManagement.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Keyword.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
-
+
+ <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
</databaseChangeLog>
diff --git a/others/db_changes/Data_alias/basic/2019.2/update_Keyword_Essentials.xml b/others/db_changes/Data_alias/basic/2019.2/update_Keyword_Essentials.xml
new file mode 100644
index 0000000000..f9e3cb33a2
--- /dev/null
+++ b/others/db_changes/Data_alias/basic/2019.2/update_Keyword_Essentials.xml
@@ -0,0 +1,17 @@
+<?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="a.loreth" id="b1629529-92ab-437d-b864-0fd68fe5ceab">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>KEYID in ('BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
+ </update>
+
+
+ <rollback>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="0" />
+ <where>KEYID in ('BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
+ </update>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
--
GitLab
From c07eca45d4a364766d1efae0df57714cb796c2ac Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Mon, 8 Apr 2019 14:42:59 +0200
Subject: [PATCH 230/250] Activity/Detail: hideLabels
---
neonView/ActivityDetail_view/ActivityDetail_view.aod | 1 +
1 file changed, 1 insertion(+)
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 2c3545b72c..7bb44f0e16 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -14,6 +14,7 @@
<editMode v="false" />
<showDrawer v="true" />
<drawerCaption>Detail</drawerCaption>
+ <hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
--
GitLab
From 188f47c27d69da94569625b882675735832c328a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 8 Apr 2019 14:42:09 +0200
Subject: [PATCH 231/250] objectRelation tree - Update
---
entity/Address_entity/Address_entity.aod | 1 -
.../contactid_param/valueProcess.js | 0
.../recordcontainers/jdito/onDelete.js | 4 +-
.../ObjectTree_entity/ObjectTree_entity.aod | 26 ++++++-
.../alter/children/edit/onActionProcess.js | 18 +++++
.../displayValueProcess.js | 1 +
.../objectrelationtypeid/stateProcess.js | 2 +-
.../target_id/displayValueProcess.js | 10 +++
.../target_id/linkedContextProcess.js | 8 +++
.../entityfields/target_id/stateProcess.js | 12 ++++
.../recordcontainers/jdito/contentProcess.js | 72 +++++++++++++------
.../recordcontainers/jdito/onUpdate.js | 18 +++++
entity/Object_entity/Object_entity.aod | 6 --
.../Organisation_entity.aod | 12 ----
neonContext/ObjectTree/ObjectTree.aod | 5 ++
.../ObjectTreePreview/ObjectTreePreview.aod | 32 +++++++++
process/ObjectRelation_lib/process.js | 20 +++---
17 files changed, 191 insertions(+), 56 deletions(-)
delete mode 100644 entity/Address_entity/entityfields/contactid_param/valueProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js
create mode 100644 entity/ObjectTree_entity/entityfields/target_id/stateProcess.js
create mode 100644 entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
create mode 100644 neonView/ObjectTreePreview/ObjectTreePreview.aod
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 76217f3083..df8385fa8f 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -105,7 +105,6 @@
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contactid_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="true" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/contactid_param/documentation.adoc</documentation>
diff --git a/entity/Address_entity/entityfields/contactid_param/valueProcess.js b/entity/Address_entity/entityfields/contactid_param/valueProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
index 61929ba31c..046b1dca18 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
@@ -7,13 +7,13 @@ var condition = SqlCondition.begin()
.andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
.build("1=2");
-db.deleteData("AB_ATTRIBUTE", conditon);
+db.deleteData("AB_ATTRIBUTE", condition);
var attributeId = vars.get("$field.UID");
var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
-var condition = SqlCondition.begin()
+condition = SqlCondition.begin()
.and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
.build();
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 1be26c1bbf..9effca076a 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -11,8 +11,6 @@
<entityProvider>
<name>TreeProvider</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <targetContextField>TARGET_CONTEXT</targetContextField>
- <targetIdField>TARGET_ID</targetIdField>
<dependencies>
<entityDependency>
<name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
@@ -42,6 +40,10 @@
<name>RelationType_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -61,10 +63,12 @@
</entityField>
<entityField>
<name>TITLE</name>
+ <title>Object</title>
<searchable v="false" />
</entityField>
<entityField>
<name>ICON</name>
+ <contentType>IMAGE</contentType>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
@@ -99,8 +103,12 @@
</entityField>
<entityField>
<name>TARGET_ID</name>
+ <title>Object</title>
<consumer>Objects</consumer>
+ <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
<searchable v="false" />
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TARGET_CONTEXT</name>
@@ -110,6 +118,7 @@
<entityField>
<name>INFO</name>
<title>Description</title>
+ <contentType>LONG_TEXT</contentType>
<searchable v="false" />
</entityField>
<entityField>
@@ -152,6 +161,13 @@
<isSelectionAction v="true" />
<iconId>VAADIN:FILE_TREE_SMALL</iconId>
</entityActionField>
+ <entityActionField>
+ <name>edit</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>NEON:PENCIL</iconId>
+ </entityActionField>
</children>
</entityActionGroup>
<entityParameter>
@@ -159,6 +175,11 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="true" />
+ <description>Needed to load ONE Objectrelation together with ObjectId_param and ObjectType_param to determine the side</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -166,6 +187,7 @@
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
new file mode 100644
index 0000000000..8cbab64779
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -0,0 +1,18 @@
+import("ObjectRelation_lib");
+import("system.neon");
+import("system.vars");
+
+if (vars.exists("$local.rows") && vars.get("$local.rows"))
+{
+ var selectedRows = JSON.parse(vars.get("$local.rows"));
+ var uid = JSON.parse(selectedRows[0]["#LOOKUPID"]);
+ var isObjectRelationNode = typeof uid[2] == "string";
+
+ if (isObjectRelationNode)
+ {
+ var params = {
+ "Uid_param" : selectedRows[0]["#LOOKUPID"]
+ }
+ neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_EDIT, params);
+ }
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
index 83a799bf34..e4ddc9dc59 100644
--- a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
@@ -1,3 +1,4 @@
+import("system.neon");
import("system.translate");
import("system.result");
import("system.vars");
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
index 7c27f2f690..7d9ab38c5c 100644
--- a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
@@ -2,7 +2,7 @@ import("system.result");
import("system.vars");
import("system.neon");
-if (vars.exists("$param.RelationType_param") && vars.get("$param.RelationType_param"))
+if (vars.exists("$param.RelationType_param") && vars.get("$param.RelationType_param") || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
result.string(neon.COMPONENTSTATE_DISABLED);
}
diff --git a/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js b/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js
new file mode 100644
index 0000000000..d074689525
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.db");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if (vars.get("$field.TARGET_ID") && vars.get("$field.TARGET_CONTEXT"))
+{
+ result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.TARGET_CONTEXT"), vars.get("$field.TARGET_ID"))));
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js b/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js
new file mode 100644
index 0000000000..1309ba4e92
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+if (vars.get("$field.TARGET_CONTEXT"))
+{
+ result.string(ContextUtils.getContextName(vars.get("$field.TARGET_CONTEXT")));
+}
diff --git a/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js b/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js
new file mode 100644
index 0000000000..432b555ce8
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_AUTO);
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index bc49795bd4..797fe1f60a 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -7,23 +7,45 @@ import("Context_lib");
import("Sql_lib");
var tree = []
-var filter = JSON.parse(vars.get("$local.filter"))
-var selectedRelationType = null;
-if (filter)
+// uidParam: if only one row should be loaded
+var uidParam;
+if (vars.exists("$param.Uid_param") && vars.get("$param.Uid_param"))
{
- if (filter.childs.length > 0)
+ uidParam = vars.get("$param.Uid_param");
+}
+else if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
+{
+ uidParam = vars.get("$local.idvalues")[0];
+}
+
+if (uidParam)
+{
+ let uid = JSON.parse(uidParam);
+
+ let relationTypeData = ObjectRelationUtils.getRelationType(uid[2]);
+ _insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10]);
+}
+else
+{
+ var filter = JSON.parse(vars.get("$local.filter"))
+ var selectedRelationType = null;
+
+ if (filter)
{
- selectedRelationType = filter.childs[0].value;
+ if (filter.childs.length > 0)
+ {
+ selectedRelationType = filter.childs[0].value;
+ }
}
-}
-var originalObjectId = vars.get("$param.ObjectId_param");
+ var originalObjectId = vars.get("$param.ObjectId_param");
-_loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+ _loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+}
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData, pObjectRelationId)
{
// prevent stack overflows
if (pLayer > 30)
@@ -41,9 +63,14 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
{
if (pLayer == 0)
{
- if (pObjectRelationTypeId)
+ // load only one ObjectRelation (e.g. for edit mode)
+ if (pObjectRelationId)
+ {
+
+ }
+ else if (pObjectRelationTypeId)
{
- var relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
+ let relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
// if hirachy: get most top id else use the current currentObjectId
if (relationTypeData[4] == "1")
@@ -76,7 +103,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
let uid = [currentObjectId, i, relationTypes[i]];
tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, "", relationTypes[i][0]]);
- _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1, relationTypeData);
+ _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1, relationTypes[i]);
}
}
}
@@ -154,12 +181,13 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
* @param {String} pDirection
* @param {String} pRelationType1
* @param {String} pRelationType2
- * @param {String} pPrevId Id of the previous node to exclude it
+ * @param {String} [pPrevId=undefined] Id of the previous node to exclude it
* @param {Boolean} [pNoRecursion=false] if false: select for direction "same" the other direction, if result is empty.
+ * @param {Boolean} [pObjectRelationId=false] provide if only one special node is needed
*
* @return {[][]}
*/
-function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pPrevId, pNoRecursion)
+function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pPrevId, pNoRecursion, pObjectRelationId)
{
if (pRelationType1 == undefined || pRelationType2 == undefined)
return [];
@@ -181,7 +209,8 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
var cond = SqlCondition.begin()
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2)
- .andPrepare("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId);
+ .andPrepare("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId)
+ .andPrepareIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", pObjectRelationId);
// exclude previous node
if (!pPrevId)
@@ -193,17 +222,16 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
// TODO: BINDATA?
// var image = getImageObject("Beziehung");
-
var data = db.table(cond.buildSql(
- "select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO, AB_OBJECTRELATIONTYPEID \n\
+ "select OBJECT" + (pObjectRelationId ? myNum : otherNum) + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO, AB_OBJECTRELATIONTYPEID \n\
from AB_OBJECTRELATION \n\
join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " and ","1=2", "", false));
-
- if (data.length == 0 && pDirection == "same" && !pNoRecursion)
+
+ // try again with other side for "same"
+ if (data.length == 0 && pDirection == "same" && !pNoRecursion || pObjectRelationId && data.length > 0 && !data[0][0])
{
- return _getEntryData(pObjectId, "normal", pRelationType1, pRelationType2, pPrevId, true)
+ return _getEntryData(pObjectId, "normal", pRelationType1, pRelationType2, pPrevId, true, pObjectRelationId)
}
-
// TODO: BINDATA?
//for ( var i = 0; i < data.length; i++) data[i][2] = image[data[i][2]] == undefined ? "" : image[data[i][2]];
return data;
@@ -226,7 +254,7 @@ function _getRelationTypes(pObjectType)
* @param {String} pNewRelationTypeId the RelationType, a new relation should have, if this node is selected.
* @param {Integer} [pNum=undefined] optional number added to the key. Needed, if the key would not be unique.
*
- * @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, AB_OBJECTRELATIONTYPEID, pObjectType, pNodeId, objectrelationid, objecttype
+ * @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, AB_OBJECTRELATIONTYPEID, pObjectType (from param), pNodeId, objecttype (from entryId), objectrelationid]
*/
function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNewRelationTypeId, pNum)
{
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js b/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000..23a87592d8
--- /dev/null
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.neon");
+import("system.db");
+import("Sql_lib");
+
+
+var uid = JSON.parse(vars.get("$field.UID"));
+var isObjectRelationNode = typeof uid[2] == "string";
+
+if (isObjectRelationNode)
+{
+ var objectRelationId = uid[6];
+
+ db.updateData("AB_OBJECTRELATION", ["INFO"], null, [vars.get("$field.INFO")],
+ SqlCondition.begin()
+ .andPrepareIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId)
+ .build("1=2"));
+}
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 189f11b3a9..a35318329e 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -9,12 +9,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>jdito</recordContainer>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 4da1b5d9f8..0cfafe4ba1 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -123,10 +123,6 @@
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
<entityParameter>
<name>WithPrivate_param</name>
<expose v="true" />
@@ -644,10 +640,6 @@
</entityDependency>
</dependencies>
<children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<title></title>
@@ -709,10 +701,6 @@
<name>AttributeKeyId_param</name>
<expose v="true" />
</entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<expose v="false" />
diff --git a/neonContext/ObjectTree/ObjectTree.aod b/neonContext/ObjectTree/ObjectTree.aod
index a8f24a4415..3a0bc38b2c 100644
--- a/neonContext/ObjectTree/ObjectTree.aod
+++ b/neonContext/ObjectTree/ObjectTree.aod
@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>ObjectTreeFilter_view</filterview>
<editview>ObjectTreeEdit_view</editview>
+ <preview>ObjectTreePreview</preview>
<entity>ObjectTree_entity</entity>
<references>
<neonViewReference>
@@ -14,5 +15,9 @@
<name>1122516a-5f1c-4f08-9995-02acaee2a0cd</name>
<view>ObjectTreeEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>1caa61e2-0e59-47bd-a996-db49867e3908</name>
+ <view>ObjectTreePreview</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ObjectTreePreview/ObjectTreePreview.aod b/neonView/ObjectTreePreview/ObjectTreePreview.aod
new file mode 100644
index 0000000000..b6b2c90c68
--- /dev/null
+++ b/neonView/ObjectTreePreview/ObjectTreePreview.aod
@@ -0,0 +1,32 @@
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ObjectTreePreview</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Info</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>a7ff1a5c-1ea5-4904-a802-b3da55c07341</name>
+ <entityField>OBJECTRELATIONTYPEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0b612a60-d882-4def-b569-7146e1b1ccb6</name>
+ <entityField>TARGET_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6ed4e675-b1f5-4790-97d1-d015f87f37e4</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
index 1010f1a658..f44bc3ead9 100644
--- a/process/ObjectRelation_lib/process.js
+++ b/process/ObjectRelation_lib/process.js
@@ -1,4 +1,4 @@
-import("system.logging");
+import("Sql_lib");
import("system.db");
/**
@@ -10,11 +10,11 @@ import("system.db");
function ObjectRelationUtils() {}
/**
- * Get all possible relationTypes by a objectType.
+ * Get all possible relationTypes by a objectType. (objectrelationtypeId and title)
* Normally it only returns the id and title. If you set pFullInfo to true, you will get additional information, too.
*
* @param {String} pObjectType the object type to load the relation types for.]
- * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, otherSide-RELATION_TYPE
+ * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, objectrelationtypeId
*
* @return {String[][]}
*/
@@ -54,7 +54,7 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
-- typeId of Object1\n\
case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE, type2.AB_OBJECTRELATIONTYPEID" + sql,
+ main.SIDE, case when type2.AB_OBJECTRELATIONTYPEID is null then main.AB_OBJECTRELATIONTYPEID else type2.AB_OBJECTRELATIONTYPEID end" + sql,
[
[pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]
]
@@ -64,14 +64,14 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
}
/**
- * Get all possible relationTypes by a objectType.
- * returns the id, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, otherSide-RELATION_TYPE
+ * Get relationType by a RelationTypeId.
+ * returns the objectrelationtypeId, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side,objectrelationtypeId
*
- * @param {String} pObjectTypeId the object type to load the relation types for.]
+ * @param {String} pRelationTypeId the RelationTypeId to load the full relation type for.
*
* @return {String[][]}
*/
-ObjectRelationUtils.getRelationType = function(pObjectTypeId)
+ObjectRelationUtils.getRelationType = function(pRelationTypeId)
{
// TODO: funktionen evtl. zusammenfassen
var sql = " from AB_OBJECTRELATIONTYPE main \n\
@@ -94,9 +94,9 @@ ObjectRelationUtils.getRelationType = function(pObjectTypeId)
-- typeId of Object1\n\
case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE, type2.AB_OBJECTRELATIONTYPEID" + sql,
+ main.SIDE, case when type2.AB_OBJECTRELATIONTYPEID is null then main.AB_OBJECTRELATIONTYPEID else type2.AB_OBJECTRELATIONTYPEID end" + sql,
[
- [pObjectTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]],
+ [pRelationTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]],
]
]));
--
GitLab
From e6c029d33d86b04d613bdd614c384f4c6ee7abe6 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 8 Apr 2019 14:59:22 +0200
Subject: [PATCH 232/250] swap solicits with promotion target of
---
aliasDefinition/Data_alias/Data_alias.aod | 62 -------------------
.../basic/2019.2/add_ObjectRelation_type.xml | 4 +-
2 files changed, 2 insertions(+), 64 deletions(-)
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index fdfdb64c21..89e097db34 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5954,68 +5954,6 @@
</entityFieldDb>
</entityFields>
</entityDb>
- <entityDb>
- <name>TEST</name>
- <dbName></dbName>
- <idColumn>TESTID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>TEST2</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TESTID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TEST1</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml b/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
index a4cd984291..063480e450 100644
--- a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
@@ -107,7 +107,7 @@
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
<column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="promotion target of"/>
+ <column name="RELATION_TITLE" value="solicits"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
<column name="SIDE" valueNumeric="1"/>
<column name="HIERARCHY" valueNumeric="0"/>
@@ -115,7 +115,7 @@
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="e397b595-38ae-4365-908e-75ee388838eb"/>
<column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="solicits"/>
+ <column name="RELATION_TITLE" value="promotion target of"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
<column name="SIDE" valueNumeric="2"/>
<column name="HIERARCHY" valueNumeric="0"/>
--
GitLab
From cfb8c04a021c337b1b6ee8edbb2583c439e5a35e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 8 Apr 2019 15:23:39 +0200
Subject: [PATCH 233/250] fix objectrelation test data
---
.../2019.2/data/AditoBasic/ObjectRelation_exampleData.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
index 448f72ab56..0ab7bfdba6 100644
--- a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
@@ -12,8 +12,8 @@
</insert>
<insert tableName="AB_OBJECTRELATION">
<column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
- <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
+ <column name="OBJECT1_ROWID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="OBJECT2_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="AB_OBJECTRELATIONTYPE1" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
<column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
</insert>
--
GitLab
From dd1707d7daefc96ab02b339be1ea061db224b2f0 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 8 Apr 2019 15:55:19 +0200
Subject: [PATCH 234/250] bugfixes objectrelation
---
entity/ObjectTree_entity/ObjectTree_entity.aod | 2 +-
.../recordcontainers/jdito/contentProcess.js | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 9effca076a..e4136413bd 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -103,7 +103,7 @@
</entityField>
<entityField>
<name>TARGET_ID</name>
- <title>Object</title>
+ <title>Relation</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
<searchable v="false" />
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 797fe1f60a..a8f30c3c97 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -22,9 +22,15 @@ else if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.ge
if (uidParam)
{
let uid = JSON.parse(uidParam);
-
- let relationTypeData = ObjectRelationUtils.getRelationType(uid[2]);
- _insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10]);
+
+ let isObjectRelationNode = typeof uid[2] == "string";
+
+ if (isObjectRelationNode)
+ {
+ let relationTypeData = ObjectRelationUtils.getRelationType(uid[2]);
+ _insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10]);
+
+ }
}
else
{
--
GitLab
From f0ac60e30071c7c83afa4952218da3cce9703974 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 8 Apr 2019 17:06:23 +0200
Subject: [PATCH 235/250] oibjectrelation edit state Process
---
.../ObjectTree_entity/ObjectTree_entity.aod | 5 +++-
.../alter/children/edit/onActionProcess.js | 10 +++----
.../alter/children/edit/stateProcess.js | 30 +++++++++++++++++++
.../recordcontainers/jdito/contentProcess.js | 5 ++--
4 files changed, 42 insertions(+), 8 deletions(-)
create mode 100644 entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index e4136413bd..d940f4a75f 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -11,6 +11,8 @@
<entityProvider>
<name>TreeProvider</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>TARGET_ID</targetIdField>
<dependencies>
<entityDependency>
<name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
@@ -165,8 +167,9 @@
<name>edit</name>
<fieldType>ACTION</fieldType>
<onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
<iconId>NEON:PENCIL</iconId>
+ <state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
index 8cbab64779..c18d22015d 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -2,16 +2,16 @@ import("ObjectRelation_lib");
import("system.neon");
import("system.vars");
-if (vars.exists("$local.rows") && vars.get("$local.rows"))
-{
- var selectedRows = JSON.parse(vars.get("$local.rows"));
- var uid = JSON.parse(selectedRows[0]["#LOOKUPID"]);
+if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+{
+ var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var uid = JSON.parse(selectedRows[0]);
var isObjectRelationNode = typeof uid[2] == "string";
if (isObjectRelationNode)
{
var params = {
- "Uid_param" : selectedRows[0]["#LOOKUPID"]
+ "Uid_param" : selectedRows[0]
}
neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_EDIT, params);
}
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
new file mode 100644
index 0000000000..60b83bbcbd
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
@@ -0,0 +1,30 @@
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("system.vars");
+logging.log("aaaaaaaaaaaaa " + vars.get("$sys.selection"))
+logging.log("aaaaaaaaaaaaa " + vars.get("$sys." + "viewmode"))
+if (vars.get("$sys." + "viewmode") == neon.FRAME_VIEWMODE_COMPONENT)
+if (vars.exists("$sys." + "selection") && vars.get("$sys." + "selection"))
+{
+ var selectedRows = JSON.parse(vars.get("$sys." + "selection"));
+ var isObjectRelationNode = false;
+ if (selectedRows.length > 0)
+ {
+ logging.log(selectedRows.toSource())
+ var uid = JSON.parse(selectedRows[0]);
+ logging.log(uid.toSource())
+ isObjectRelationNode = typeof uid[2] == "string";
+ }
+ logging.log(isObjectRelationNode)
+ if (isObjectRelationNode)
+ {
+ result.string(neon.COMPONENTSTATE_EDITABLE)
+ }
+ else
+ {
+ result.string(neon.COMPONENTSTATE_DISABLED)
+ }
+}
+else
+ result.string(neon.COMPONENTSTATE_DISABLED)
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index a8f30c3c97..70b8263604 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -22,8 +22,7 @@ else if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.ge
if (uidParam)
{
let uid = JSON.parse(uidParam);
-
- let isObjectRelationNode = typeof uid[2] == "string";
+ let isObjectRelationNode = uid != null && typeof uid[2] == "string";
if (isObjectRelationNode)
{
@@ -31,6 +30,8 @@ if (uidParam)
_insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10]);
}
+ /* else
+ tree = [["", "", "", "", "", "", "", ""]]*/
}
else
{
--
GitLab
From 736843b04d82e17f652ee6c95518d97313060360 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Tue, 9 Apr 2019 08:31:34 +0200
Subject: [PATCH 236/250] adaptations to salesproject dashboard elements
---
.../Salesproject_entity.aod | 4 +++-
.../overall_forecast/titleProcess.js | 6 ++++++
.../overall_turnover/titleProcess.js | 6 ++++++
.../_____LANGUAGE_EXTRA.aod | 3 +++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 9 +++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
.../Vertriebsdashboard/Vertriebsdashboard.aod | 20 +++++++++----------
.../SalesprojectChart_view.aod | 2 +-
.../SalesprojectScoreCard_view.aod | 2 +-
.../TimetrackingFilter_view.aod | 1 +
.../_____PREFERENCES_PROJECT.aod | 2 +-
11 files changed, 44 insertions(+), 14 deletions(-)
create mode 100644 entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index ec60c81963..01fc627bc1 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -522,13 +522,15 @@
<title>Turnover actual year</title>
<contentType>NUMBER</contentType>
<state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OVERALL_FORECAST</name>
- <title>Forecast actual year </title>
+ <title>Forecast actual year</title>
<contentType>NUMBER</contentType>
<state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
</entityField>
<entityField>
diff --git a/entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js b/entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js
new file mode 100644
index 0000000000..451502e0d4
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+import("system.datetime");
+
+result.string(translate.text("Forecast") + " " + datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js b/entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js
new file mode 100644
index 0000000000..03c0d039b7
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+import("system.datetime");
+
+result.string(translate.text("Turnover") + " " + datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 53087cf5d2..db5e07b9e3 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2742,6 +2742,9 @@
<entry>
<key>Salesproject phases</key>
</entry>
+ <entry>
+ <key>Key figures</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 4e7c4ae02d..6c8daafb40 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1596,6 +1596,10 @@
<entry>
<key>Kundenstammblatt</key>
</entry>
+ <entry>
+ <key>Key figures</key>
+ <value>Kennzahlen</value>
+ </entry>
<entry>
<key>Person</key>
</entry>
@@ -3519,9 +3523,14 @@
</entry>
<entry>
<key>Turnover actual year</key>
+ <value>Umsatz aktuelles Jahr</value>
</entry>
<entry>
<key>Forecast actual year</key>
+ <value>Forecast aktuelles Jahr</value>
+ </entry>
+ <entry>
+ <key>Salesproject Phases</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index e430baa505..0cd508f221 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2773,6 +2773,9 @@
<entry>
<key>Salesproject phases</key>
</entry>
+ <entry>
+ <key>Key figures</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index a72954dbb8..27a6720df4 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -16,16 +16,16 @@
<configName>OpenSalesprojectsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="0" />
- <yPos v="0" />
- <colspan v="1" />
+ <xPos v="1" />
+ <yPos v="5" />
+ <colspan v="2" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
<name>Dashlet2</name>
- <viewName>OfferFilter_view</viewName>
- <configName>SendOffersDashlet</configName>
+ <viewName>SalesprojectScoreCard_view</viewName>
+ <configName>KeyFigures</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="1" />
@@ -36,8 +36,8 @@
</neonDashlet>
<neonDashlet>
<name>Dashlet3</name>
- <viewName>ContractFilter_view</viewName>
- <configName>AllContractsDashlet</configName>
+ <viewName>SalesprojectChart_view</viewName>
+ <configName>Salesproject phases</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
@@ -64,9 +64,9 @@
<configName>TurnoverDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="1" />
- <yPos v="5" />
- <colspan v="2" />
+ <xPos v="0" />
+ <yPos v="0" />
+ <colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
diff --git a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
index 7b0791b033..ee90ac3e60 100644
--- a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
+++ b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
@@ -5,7 +5,7 @@
<dashletConfigurations>
<neonDashletConfiguration>
<name>Salesproject phases</name>
- <title>Salesproject Phases</title>
+ <title>Salesproject phases</title>
<description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
<fragment>SalesprojectChart/full</fragment>
<singleton v="true" />
diff --git a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
index 642117e5d6..2f5f49c297 100644
--- a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
+++ b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
@@ -8,7 +8,7 @@
<title>Key figures</title>
<description>Kennzahlen</description>
<fragment>Salesproject/full</fragment>
- <singleton v="false" />
+ <singleton v="true" />
<icon>VAADIN:GRID_BIG</icon>
<categories>
<neonDashletCategory>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index 9ddf2b4669..2e727ddd7f 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -3,6 +3,7 @@
<name>TimetrackingFilter_view</name>
<title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 2e627c2e51..a8a369862b 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>basic</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab
From a4b166f246cefadfe9fa2043027932b7a7c771c7 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Tue, 9 Apr 2019 08:37:17 +0200
Subject: [PATCH 237/250] reset preference changes
---
.../_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index a8a369862b..2e627c2e51 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>basic</projectName>
+ <projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab
From 736f9cb98b089a1d5328d2ca7f55ff71a8edad74 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 8 Apr 2019 15:09:37 +0200
Subject: [PATCH 238/250] Moved IMAGE directly into ORGANISATION/PERSON-tables
---
aliasDefinition/Data_alias/Data_alias.aod | 28 +++++++++++++++++++
.../Organisation_entity.aod | 26 ++++++++++-------
.../avatartext_param/valueProcess.js | 4 +++
.../entityfields/image/onValueChange.js | 4 ---
.../entityfields/image/valueProcess.js | 9 ------
.../picture/displayValueProcess.js | 6 ++++
entity/Organisation_entity/imageProcess.js | 2 +-
.../recordcontainers/db/onDBInsert.js | 3 --
.../recordcontainers/db/onDBUpdate.js | 10 +------
entity/Person_entity/Person_entity.aod | 25 +++++++++++------
.../avatartext_param/valueProcess.js | 4 +++
.../entityfields/image/onValueChange.js | 4 ---
.../entityfields/image/valueProcess.js | 9 ------
.../picture/displayValueProcess.js | 6 ++++
entity/Person_entity/imageProcess.js | 2 +-
.../recordcontainers/db/onDBUpdate.js | 8 ------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 7 +++++
.../OrganisationLookup_view.aod | 2 +-
.../OrganisationPreview_view.aod | 2 +-
.../PersonLookup_view/PersonLookup_view.aod | 2 +-
.../PersonPreview_view/PersonPreview_view.aod | 2 +-
.../Contactmanagement_added_ImageBlobs.xml | 13 +++++++++
.../Data_alias/basic/2019.2/changelog.xml | 1 +
23 files changed, 108 insertions(+), 71 deletions(-)
create mode 100644 entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js
delete mode 100644 entity/Organisation_entity/entityfields/image/onValueChange.js
delete mode 100644 entity/Organisation_entity/entityfields/image/valueProcess.js
create mode 100644 entity/Organisation_entity/entityfields/picture/displayValueProcess.js
delete mode 100644 entity/Organisation_entity/recordcontainers/db/onDBInsert.js
create mode 100644 entity/Person_entity/entityfields/avatartext_param/valueProcess.js
delete mode 100644 entity/Person_entity/entityfields/image/onValueChange.js
delete mode 100644 entity/Person_entity/entityfields/image/valueProcess.js
create mode 100644 entity/Person_entity/entityfields/picture/displayValueProcess.js
create mode 100644 others/db_changes/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 89e097db34..230be26a32 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -160,6 +160,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PICTURE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2004" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -568,6 +582,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PICTURE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2004" />
+ <size v="2147483647" />
+ <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/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 0cfafe4ba1..bbbd5c1c67 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -101,15 +101,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/image/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
<entityFieldGroup>
<name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
@@ -772,6 +763,18 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>PICTURE</name>
+ <title>Picture</title>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>AvatarText_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -780,7 +783,6 @@
<fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
@@ -896,6 +898,10 @@
<name>ADDRESS_ID.displayValue</name>
<expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PICTURE.value</name>
+ <recordfield>ORGANISATION.PICTURE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js b/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js
new file mode 100644
index 0000000000..c88b7ab04f
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.NAME"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/image/onValueChange.js b/entity/Organisation_entity/entityfields/image/onValueChange.js
deleted file mode 100644
index 86a4f85653..0000000000
--- a/entity/Organisation_entity/entityfields/image/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Entity_lib");
-
-// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.IMAGE");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/image/valueProcess.js b/entity/Organisation_entity/entityfields/image/valueProcess.js
deleted file mode 100644
index ff2e70283d..0000000000
--- a/entity/Organisation_entity/entityfields/image/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Organisation_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
- result.string(OrgUtils.getImage(vars.get("$field.ORGANISATIONID"), vars.getString("$field.NAME")));
-}
diff --git a/entity/Organisation_entity/entityfields/picture/displayValueProcess.js b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js
new file mode 100644
index 0000000000..a8bad702a8
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !vars.get("$this.value"))
+ result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/imageProcess.js b/entity/Organisation_entity/imageProcess.js
index c88b7ab04f..ab4d712d45 100644
--- a/entity/Organisation_entity/imageProcess.js
+++ b/entity/Organisation_entity/imageProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string("TEXT:" + vars.getString("$field.NAME"));
\ No newline at end of file
+result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index ba0e67422c..0000000000
--- a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.logging");
-import("system.vars");
-
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
index d9103a1d89..b2c37a2cc9 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
@@ -3,15 +3,7 @@ import("Organisation_lib");
import("Communication_lib");
import("Entity_lib");
-// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Container #1030023
-FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
- if (state == FieldChanges.STATE_CHANGED())
- OrgUtils.setImage(vars.get("$field.ORGANISATIONID"), value);
- else
- OrgUtils.removeImage(vars.get("$field.ORGANISATIONID"));
-});
-
-
+// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
var uid = vars.get("$sys.uid");
FieldChanges.assimilateChangeAndDispose("$field.STANDARD_EMAIL_COMMUNICATION", function(state, value){
CommUtil.setStandardMail(uid, value);
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 7ee31a9d54..2e33f29ccd 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -73,15 +73,6 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Person_entity/entityfields/image/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
<entityFieldGroup>
<name>NAME_fieldGroup</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
@@ -848,6 +839,18 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js</valueProcess>
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>PICTURE</name>
+ <title>Picture</title>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>AvatarText_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1024,6 +1027,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ADDRESS_ID.displayValue</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PICTURE.value</name>
+ <recordfield>PERSON.PICTURE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Person_entity/entityfields/avatartext_param/valueProcess.js b/entity/Person_entity/entityfields/avatartext_param/valueProcess.js
new file mode 100644
index 0000000000..07ab8d8c0f
--- /dev/null
+++ b/entity/Person_entity/entityfields/avatartext_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME") + " " + vars.getString("$field.ORGANISATION_ID.displayValue")).trim());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/image/onValueChange.js b/entity/Person_entity/entityfields/image/onValueChange.js
deleted file mode 100644
index 86a4f85653..0000000000
--- a/entity/Person_entity/entityfields/image/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Entity_lib");
-
-// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.IMAGE");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/image/valueProcess.js b/entity/Person_entity/entityfields/image/valueProcess.js
deleted file mode 100644
index 2a70e90ebf..0000000000
--- a/entity/Person_entity/entityfields/image/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Person_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
- result.string(PersUtils.getImage(vars.get("$field.PERSONID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
-}
diff --git a/entity/Person_entity/entityfields/picture/displayValueProcess.js b/entity/Person_entity/entityfields/picture/displayValueProcess.js
new file mode 100644
index 0000000000..a8bad702a8
--- /dev/null
+++ b/entity/Person_entity/entityfields/picture/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !vars.get("$this.value"))
+ result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Person_entity/imageProcess.js b/entity/Person_entity/imageProcess.js
index 07ab8d8c0f..ab4d712d45 100644
--- a/entity/Person_entity/imageProcess.js
+++ b/entity/Person_entity/imageProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string("TEXT:" + (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME") + " " + vars.getString("$field.ORGANISATION_ID.displayValue")).trim());
\ No newline at end of file
+result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 4e3598b753..558fad5fb3 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -5,14 +5,6 @@ import("Entity_lib");
import("StandardObject_lib");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
-FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
- if (state == FieldChanges.STATE_CHANGED())
- PersUtils.setImage(vars.get("$field.PERSONID"), value);
- else
- PersUtils.removeImage(vars.get("$field.PERSONID"));
-});
-
-
var uid = vars.get("$sys.uid");
FieldChanges.assimilateChangeAndDispose("$field.STANDARD_EMAIL_COMMUNICATION", function(state, value){
CommUtil.setStandardMail(uid, value);
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 6c8daafb40..e520e49219 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -14,6 +14,10 @@
<key>Company</key>
<value>Firma</value>
</entry>
+ <entry>
+ <key>Picture</key>
+ <value>Bild</value>
+ </entry>
<entry>
<key>Office staff</key>
<value>Innendienst</value>
@@ -3532,6 +3536,9 @@
<entry>
<key>Salesproject Phases</key>
</entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index 0264632ac4..ba23ce75d8 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>8c14a108-c672-4b48-bd10-b5ca2e777168</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>c2b34d5e-cefa-4bea-88bb-b62874956c19</name>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 220f2e9911..37be5f599a 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>IMAGE</iconField>
+ <iconField>PICTURE</iconField>
<titleField>NAME</titleField>
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/neonView/PersonLookup_view/PersonLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
index bce42f9fab..9d52675298 100644
--- a/neonView/PersonLookup_view/PersonLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_view.aod
@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>9541c336-10e9-4767-b6e5-52b6108d967a</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>876baf47-81c8-477a-951c-18df2dd4d972</name>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 6b4a7a3769..dea509d10e 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>IMAGE</iconField>
+ <iconField>PICTURE</iconField>
<titleField>FULL_NAME_fieldGroup</titleField>
<descriptionField>ORGANISATION_ID</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/others/db_changes/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml b/others/db_changes/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
new file mode 100644
index 0000000000..285d0f993b
--- /dev/null
+++ b/others/db_changes/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
@@ -0,0 +1,13 @@
+<?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="2f82302d-1fb0-46d2-a290-dbeca32f427f">
+ <addColumn tableName="PERSON">
+ <column name="PICTURE" type="BLOB"/>
+ </addColumn>
+ <addColumn tableName="ORGANISATION">
+ <column name="PICTURE" type="BLOB"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
index 453deea967..11cb1aee9e 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
@@ -131,4 +131,5 @@
<include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
<include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
+ <include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
</databaseChangeLog>
--
GitLab
From a74224439ed46e79274b37ff068ec96a01da3189 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 9 Apr 2019 10:56:10 +0200
Subject: [PATCH 239/250] Activity: performance optimisation
---
.../entityfields/category/displayValueProcess.js | 12 ++++++------
.../entityfields/subject_details/valueProcess.js | 6 ++----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/entity/Activity_entity/entityfields/category/displayValueProcess.js b/entity/Activity_entity/entityfields/category/displayValueProcess.js
index 05aefdcf53..5a77b55212 100644
--- a/entity/Activity_entity/entityfields/category/displayValueProcess.js
+++ b/entity/Activity_entity/entityfields/category/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index c30d6b2520..db1ed69d22 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -1,7 +1,5 @@
import("system.vars");
import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-var histMedium = vars.get("$field.CATEGORY");
-result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), histMedium) + ")" : ""));
+var category = vars.get("$field.CATEGORY.displayValue");
+result.string(vars.get("$field.SUBJECT") + (category ? " (" + category + ")" : ""));
\ No newline at end of file
--
GitLab
From 49642b8281d79bd9769a546801dcde7256d31be2 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 9 Apr 2019 15:45:18 +0200
Subject: [PATCH 240/250] Object relation fixes & administration
---
.../_____SYSTEM_APPLICATION_NEON.aod | 1 +
entity/Context_entity/Context_entity.aod | 8 ++
.../ObjectRelationType_entity.aod | 91 ++++++++++++++-
.../dest_object_type/displayValueProcess.js | 10 ++
.../displayValueProcess.js | 5 +
.../hierarchy/possibleItemsProcess.js | 7 ++
.../entityfields/hierarchy/valueProcess.js | 8 ++
.../onlyfirstside_param/valueProcess.js | 3 +
.../onlyfirstside_param/valueProcess.js | 2 +
.../removeusage/onActionProcess.js | 14 +++
.../source_object_type/displayValueProcess.js | 10 ++
.../displayValueProcess.js | 5 +
.../recordcontainers/jdito/contentProcess.js | 10 +-
.../recordcontainers/jdito/onDelete.js | 23 ++++
.../recordcontainers/jdito/onInsert.js | 43 +++++++
.../recordcontainers/jdito/onUpdate.js | 88 ++++++++++++++
.../ObjectRelationType_entity/titleProcess.js | 9 +-
.../ObjectTree_entity/ObjectTree_entity.aod | 7 +-
.../alter/children/edit/stateProcess.js | 30 -----
.../recordcontainers/jdito/contentProcess.js | 13 +--
.../recordcontainers/jdito/contentProcess.js | 4 +
.../Organisation_entity.aod | 2 +-
entity/Person_entity/Person_entity.aod | 2 +-
.../_____LANGUAGE_EXTRA.aod | 51 ++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 103 +++++++++++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 48 ++++++++
.../ObjectRelationType/ObjectRelationType.aod | 18 +++
.../ObjectRelationTypeEdit_view.aod | 39 +++++++
.../ObjectRelationTypeFilter_view.aod | 38 ++++++
.../ObjectRelationTypePreview_view.aod | 17 +++
.../OrganisationMain_view.aod | 5 -
neonView/PersonMain_view/PersonMain_view.aod | 5 -
process/ObjectRelation_lib/process.js | 109 +++++++++---------
33 files changed, 713 insertions(+), 115 deletions(-)
create mode 100644 entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js
create mode 100644 entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js
create mode 100644 entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
create mode 100644 entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
create mode 100644 entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
delete mode 100644 entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
create mode 100644 neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
create mode 100644 neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
create mode 100644 neonView/ObjectRelationTypePreview_view/ObjectRelationTypePreview_view.aod
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 74af7250a3..2d715c6e5a 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -33,6 +33,7 @@
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
<node name="Employee" kind="10077" />
+ <node name="ObjectRelationType" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 6b92f784aa..df505cf735 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -41,6 +41,14 @@
<entityProvider>
<name>Context</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
+ <entityName>ObjectRelationType_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>excludeContexts_param</name>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 7569f2f522..ad564c0c73 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>ObjectRelationType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:SPLIT</icon>
<titleProcess>%aditoprj%/entity/ObjectRelationType_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -21,7 +22,10 @@
<valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>RELATION_TITLE</name>
+ <name>SOURCE_RELATION_TITLE</name>
+ <title>Relation type 1</title>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>SourceObjectType_param</name>
@@ -46,17 +50,100 @@
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OnlyFirstSide_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
+ <entityParameter>
+ <name>OnlyFirstSide_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>RELATION_TYPE</name>
+ </entityField>
+ <entityField>
+ <name>DIRECTION</name>
+ </entityField>
+ <entityField>
+ <name>HIERARCHY</name>
+ <title>Hierarchy</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DEST_OBJECT_TYPE</name>
+ <title>Context 2</title>
+ <consumer>Contexts</consumer>
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>SOURCE_OBJECT_TYPE</name>
+ <title>Context 1</title>
+ <consumer>Contexts</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>AB_OBJECTRELATIONTYPE1</name>
+ </entityField>
+ <entityField>
+ <name>AB_OBJECTRELATIONTYPE2</name>
+ </entityField>
+ <entityField>
+ <name>SIDE</name>
+ </entityField>
+ <entityField>
+ <name>DEST_OBJECTRELATIONTYPEID</name>
+ </entityField>
+ <entityField>
+ <name>DEST_RELATION_TITLE</name>
+ <title>Relation type 2</title>
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Contexts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Context</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityActionField>
+ <name>removeUsage</name>
+ <fieldType>ACTION</fieldType>
+ <title>Delete all usage</title>
+ <onActionProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js</onActionProcess>
+ <iconId>NEON:TRASH</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
- <element>RELATION_TITLE.value</element>
+ <element>SOURCE_RELATION_TITLE.value</element>
+ <element>RELATION_TYPE.value</element>
+ <element>DIRECTION.value</element>
+ <element>HIERARCHY.value</element>
+ <element>DEST_OBJECT_TYPE.value</element>
+ <element>SOURCE_OBJECT_TYPE.value</element>
+ <element>AB_OBJECTRELATIONTYPE1.value</element>
+ <element>AB_OBJECTRELATIONTYPE2.value</element>
+ <element>SIDE.value</element>
+ <element>DEST_OBJECTRELATIONTYPEID.value</element>
+ <element>DEST_RELATION_TITLE.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js
new file mode 100644
index 0000000000..4cee3b90ca
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("Context_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.DEST_OBJECT_TYPE")) {
+ result.string("");
+} else if (vars.exists("$field.DEST_OBJECT_TYPE") && vars.get("$field.DEST_OBJECT_TYPE")) {
+ result.string(ContextUtils.getContext(vars.get("$field.DEST_OBJECT_TYPE"))[2]);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js
new file mode 100644
index 0000000000..6aecb834c5
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+result.string(translate.text(vars.get("$field.DEST_RELATION_TITLE")));
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js b/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js
new file mode 100644
index 0000000000..b88d5392d1
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+ ["1", translate.text("Yes")]
+ ,["0", translate.text("No")]
+]);
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js
new file mode 100644
index 0000000000..b3028ee4f3
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string("0")
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js
new file mode 100644
index 0000000000..755662df16
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("0")
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js
new file mode 100644
index 0000000000..985b9f8612
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("1");
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js b/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js
new file mode 100644
index 0000000000..7de1f5f6cb
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js
@@ -0,0 +1,14 @@
+import("system.translate");
+import("system.question");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+if (vars.get("$field.UID") && vars.get("$field.DEST_OBJECTRELATIONTYPEID"))
+{
+ db.deleteData("AB_OBJECTRELATION", SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", "$field.UID")
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", "$field.DEST_OBJECTRELATIONTYPEID").build("1=2"));
+ question.showMessage(translate.withArguments("Deleted all usages of \"%0\".", [translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.INFORMATION, translate.text("Successful"))
+}
+
diff --git a/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js
new file mode 100644
index 0000000000..762ebccbcb
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("Context_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.SOURCE_OBJECT_TYPE")) {
+ result.string("");
+} else if (vars.exists("$field.SOURCE_OBJECT_TYPE") && vars.get("$field.SOURCE_OBJECT_TYPE")) {
+ result.string(ContextUtils.getContext(vars.get("$field.SOURCE_OBJECT_TYPE"))[2]);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js
new file mode 100644
index 0000000000..abba412e0e
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")));
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
index 23e43cb44c..698419fadb 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
@@ -1,6 +1,12 @@
-import("system.logging");
import("system.result");
import("system.vars");
import("ObjectRelation_lib");
-result.object(ObjectRelationUtils.getPossibleRelationTypes(vars.get("$param.SourceObjectType_param")));
\ No newline at end of file
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+{
+ result.object([ObjectRelationUtils.getRelationType(vars.get("$local.idvalues")[0])]);
+}
+else
+{
+ result.object(ObjectRelationUtils.getPossibleRelationTypes(vars.get("$param.SourceObjectType_param"), true, vars.get("$param.OnlyFirstSide_param") == "1"));
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000..78bb374858
--- /dev/null
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,23 @@
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.translate");
+import("system.question");
+import("Sql_lib");
+
+var usageCount = db.cell(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", "$field.UID")
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", "$field.DEST_OBJECTRELATIONTYPEID")
+ .buildSql("select count(*) from AB_OBJECTRELATION", "1=2"))
+
+if (usageCount <= 0)
+{
+ db.deleteData("AB_OBJECTRELATIONTYPE", SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATIONTYPE.RELATION_TYPE", "$field.RELATION_TYPE")
+ .build("1=2"));
+}
+else
+{
+ // TODO: server hängt bei question.showMessage
+ //question.showMessage(translate.withArguments("There are still %0 relations using the type %1.", [usageCount, translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.WARNING, translate.text("Cannot remove relation type"))
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000..b9f87162f4
--- /dev/null
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,43 @@
+import("system.util");
+import("ObjectRelation_lib");
+import("system.vars");
+import("system.db");
+import("system.util");
+
+var newRelationType = util.getNewUUID();
+
+db.insertData("AB_OBJECTRELATIONTYPE", [
+ "AB_OBJECTRELATIONTYPEID",
+ "OBJECT_TYPE",
+ "RELATION_TITLE",
+ "RELATION_TYPE",
+ "SIDE",
+ "HIERARCHY"
+], null, [
+ util.getNewUUID(),
+ vars.get("$field.SOURCE_OBJECT_TYPE"),
+ vars.get("$field.SOURCE_RELATION_TITLE"),
+ newRelationType,
+ 1,
+ vars.get("$field.HIERARCHY")
+]);
+
+if ((vars.get("$field.SOURCE_RELATION_TITLE") != vars.get("$field.DEST_RELATION_TITLE") || vars.get("$field.SOURCE_OBJECT_TYPE") != vars.get("$field.DEST_OBJECT_TYPE"))
+ && vars.get("$field.DEST_OBJECT_TYPE") && vars.get("$field.DEST_RELATION_TITLE"))
+{
+ db.insertData("AB_OBJECTRELATIONTYPE", [
+ "AB_OBJECTRELATIONTYPEID",
+ "OBJECT_TYPE",
+ "RELATION_TITLE",
+ "RELATION_TYPE",
+ "SIDE",
+ "HIERARCHY"
+ ], null, [
+ util.getNewUUID(),
+ vars.get("$field.DEST_OBJECT_TYPE"),
+ vars.get("$field.DEST_RELATION_TITLE"),
+ newRelationType,
+ 2,
+ vars.get("$field.HIERARCHY")
+ ]);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000..4df0c2df9e
--- /dev/null
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,88 @@
+import("system.util");
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+
+var usageCount = db.cell(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", "$field.UID")
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", "$field.DEST_OBJECTRELATIONTYPEID")
+ .buildSql("select count(*) from AB_OBJECTRELATION", "1=2"))
+
+if (usageCount <= 0)
+{
+ var type1Fields = {};
+ var type2Fields = {};
+
+ vars.get("local.changed").forEach(function(pChange)
+ {
+ var fieldName = pChange.split(".")[0];
+
+ switch (pChange.split("_")[0])
+ {
+ case "SOURCE":
+ type1Fields[fieldName.replace("SOURCE_", "")] = vars.get("$field." + fieldName);
+ break;
+ case "DEST":
+ type2Fields[fieldName.replace("DEST_", "")] = vars.get("$field." + fieldName);
+ break;
+ default:
+ type1Fields[fieldName] = vars.get("$field." + fieldName);
+ type2Fields[fieldName] = vars.get("$field." + fieldName);
+ }
+ });
+
+ var updates = [];
+ var type1Cond = SqlCondition.begin().andPrepareVars("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", "$field.UID").build("1=2");
+ var type2Cond = SqlCondition.begin().andPrepareVars("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", "$field.DEST_OBJECTRELATIONTYPEID").build("1=2");
+
+ for (let field in type1Fields) {
+ updates.push(["AB_OBJECTRELATIONTYPE", [field], null, [type1Fields[field]], type1Cond]);
+ }
+
+ // delete, if type2 is empty -> convert it to a "same"-type
+ if ((vars.get("$field.SOURCE_RELATION_TITLE") == vars.get("$field.DEST_RELATION_TITLE") && vars.get("$field.SOURCE_OBJECT_TYPE") == vars.get("$field.DEST_OBJECT_TYPE"))
+ || !vars.get("$field.DEST_OBJECT_TYPE") && !vars.get("$field.DEST_RELATION_TITLE"))
+ {
+ db.deleteData("AB_OBJECTRELATIONTYPE", type2Cond);
+ }
+ else
+ { // update if already existing
+ if (vars.get("$field.DIRECTION") != "same")
+ {
+ for (let field in type2Fields) {
+ updates.push(["AB_OBJECTRELATIONTYPE", [field], null, [type2Fields[field]], type2Cond]);
+ }
+ }
+ else
+ { // insert if it was "same" before
+ if ((vars.get("$field.SOURCE_RELATION_TITLE") != vars.get("$field.DEST_RELATION_TITLE") || vars.get("$field.SOURCE_OBJECT_TYPE") != vars.get("$field.DEST_OBJECT_TYPE"))
+ && vars.get("$field.DEST_OBJECT_TYPE") && vars.get("$field.DEST_RELATION_TITLE"))
+ {
+ db.insertData("AB_OBJECTRELATIONTYPE", [
+ "AB_OBJECTRELATIONTYPEID",
+ "OBJECT_TYPE",
+ "RELATION_TITLE",
+ "RELATION_TYPE",
+ "SIDE",
+ "HIERARCHY"
+ ], null, [
+ util.getNewUUID(),
+ vars.get("$field.DEST_OBJECT_TYPE"),
+ vars.get("$field.DEST_RELATION_TITLE"),
+ vars.get("$field.RELATION_TYPE"),
+ 2,
+ vars.get("$field.HIERARCHY")
+ ]);
+
+ }
+ }
+ }
+
+ db.updates(updates);
+}
+else
+{
+ // TODO: server hängt bei question.showMessage
+ //question.showMessage(translate.withArguments("There are still %0 relations using the type %1.", [usageCount, translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.WARNING, translate.text("Cannot remove relation type"))
+}
+
diff --git a/entity/ObjectRelationType_entity/titleProcess.js b/entity/ObjectRelationType_entity/titleProcess.js
index 71a9111fb4..dbc0c50030 100644
--- a/entity/ObjectRelationType_entity/titleProcess.js
+++ b/entity/ObjectRelationType_entity/titleProcess.js
@@ -2,4 +2,11 @@ import("system.translate");
import("system.vars");
import("system.result");
-result.string(translate.text(vars.get("$field.RELATION_TITLE")))
\ No newline at end of file
+if (vars.exists("$param.OnlyFirstSide_param") && vars.get("$param.OnlyFirstSide_param") == "1" && vars.get("$field.DIRECTION") != "same")
+{
+ result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE")));
+}
+else
+{
+ result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")));
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index d940f4a75f..78ee2dcbcd 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,7 +1,7 @@
<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>ObjectTree_entity</name>
- <title>Object tree</title>
+ <title>Object relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -108,6 +108,7 @@
<title>Relation</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
<searchable v="false" />
<stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js</displayValueProcess>
@@ -127,6 +128,7 @@
<name>OBJECTRELATIONTYPEID</name>
<title>Relationtype</title>
<consumer>ObjectRelationTypes</consumer>
+ <mandatory v="true" />
<stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js</displayValueProcess>
@@ -167,9 +169,8 @@
<name>edit</name>
<fieldType>ACTION</fieldType>
<onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
<iconId>NEON:PENCIL</iconId>
- <state>DISABLED</state>
- <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
deleted file mode 100644
index 60b83bbcbd..0000000000
--- a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import("system.logging");
-import("system.result");
-import("system.neon");
-import("system.vars");
-logging.log("aaaaaaaaaaaaa " + vars.get("$sys.selection"))
-logging.log("aaaaaaaaaaaaa " + vars.get("$sys." + "viewmode"))
-if (vars.get("$sys." + "viewmode") == neon.FRAME_VIEWMODE_COMPONENT)
-if (vars.exists("$sys." + "selection") && vars.get("$sys." + "selection"))
-{
- var selectedRows = JSON.parse(vars.get("$sys." + "selection"));
- var isObjectRelationNode = false;
- if (selectedRows.length > 0)
- {
- logging.log(selectedRows.toSource())
- var uid = JSON.parse(selectedRows[0]);
- logging.log(uid.toSource())
- isObjectRelationNode = typeof uid[2] == "string";
- }
- logging.log(isObjectRelationNode)
- if (isObjectRelationNode)
- {
- result.string(neon.COMPONENTSTATE_EDITABLE)
- }
- else
- {
- result.string(neon.COMPONENTSTATE_DISABLED)
- }
-}
-else
- result.string(neon.COMPONENTSTATE_DISABLED)
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 70b8263604..565597b0b4 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -30,8 +30,6 @@ if (uidParam)
_insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10]);
}
- /* else
- tree = [["", "", "", "", "", "", "", ""]]*/
}
else
{
@@ -163,17 +161,12 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
if (direction == "same")
relationTypeIdForNew = thisRelationTypeId
- // add both sides. Only one will succeed, because the prevObjectId will be filtered and it will just return []
- let uids = _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 0);
+ // add both sides. Only one will succeed, because the prevObjectId will be filtered
+ _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 0);
if (direction == "same")
{
var otherEntryData = _getEntryData(pNodeId[0], "normal", relationType1, relationType2, prevObjectId, true);
- uids = uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 1));
- }
-
- for (let i = 0; i < uids.length; i++)
- {
- _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1, pRelationTypeData);
+ uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 1));
}
}
}
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 4497cff400..cc89716725 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.db");
import("system.vars");
import("system.result");
@@ -10,6 +11,9 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
if (vars.exists("$param.ExcludedObjectIds_param") && vars.get("$param.ExcludedObjectIds_param"))
excludedIds = JSON.parse(vars.get("$param.ExcludedObjectIds_param"));
+ logging.log("aa22aa" + vars.get("$param.ExcludedObjectIds_param").toSource())
+ logging.log("aa22aa" + vars.get("$param.ObjectType_param").toSource())
+
result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false, excludedIds)))
}
else
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index bbbd5c1c67..6e44479793 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -564,7 +564,7 @@
</entityParameter>
<entityConsumer>
<name>ObjectTrees</name>
- <title>Relation tree</title>
+ <title>Object relation</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 2e33f29ccd..eb5d2f205c 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -637,7 +637,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>ObjectTrees</name>
- <title>Relation tree</title>
+ <title>Object relation</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index db5e07b9e3..bc40627b52 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2742,9 +2742,60 @@
<entry>
<key>Salesproject phases</key>
</entry>
+ <entry>
+ <key>Object type 1</key>
+ </entry>
+ <entry>
+ <key>Object type 2</key>
+ </entry>
+ <entry>
+ <key>Objectrelation type</key>
+ </entry>
<entry>
<key>Key figures</key>
</entry>
+ <entry>
+ <key>Delete all usage</key>
+ </entry>
+ <entry>
+ <key>Deleted all usages of \"%0\".</key>
+ </entry>
+ <entry>
+ <key>promotion target ofc</key>
+ </entry>
+ <entry>
+ <key>Successful</key>
+ </entry>
+ <entry>
+ <key>Relation type 1</key>
+ </entry>
+ <entry>
+ <key>Relation type 2</key>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ </entry>
+ <entry>
+ <key>Context 1</key>
+ </entry>
+ <entry>
+ <key>Context 2</key>
+ </entry>
+ <entry>
+ <key>Title 1</key>
+ </entry>
+ <entry>
+ <key>Title 2</key>
+ </entry>
+ <entry>
+ <key>Hierarchy</key>
+ </entry>
+ <entry>
+ <key>Object relation</key>
+ </entry>
+ <entry>
+ <key>Type 2 enabled</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 e520e49219..7351586623 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3250,6 +3250,7 @@
</entry>
<entry>
<key>Object tree</key>
+ <value>Beziehungen</value>
</entry>
<entry>
<key>&Aufg / Term (%0/%1)</key>
@@ -3539,6 +3540,108 @@
<entry>
<key>Salesproject Phases</key>
</entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ </entry>
+ <entry>
+ <key>Key figures</key>
+ </entry>
+ <entry>
+ <key>Objectrelation type</key>
+ <value>Beziehungstyp</value>
+ </entry>
+ <entry>
+ <key>Kennzahlen</key>
+ </entry>
+ <entry>
+ <key>Count</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year </key>
+ </entry>
+ <entry>
+ <key>Chart</key>
+ </entry>
+ <entry>
+ <key>Salesproject Charts</key>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+ </entry>
+ <entry>
+ <key>test1eee</key>
+ </entry>
+ <entry>
+ <key>Object type 1</key>
+ <value>Typ 1</value>
+ </entry>
+ <entry>
+ <key>Object type 2</key>
+ <value>Typ 2</value>
+ </entry>
+ <entry>
+ <key>test2</key>
+ </entry>
+ <entry>
+ <key>Title 1</key>
+ <value>Titel 1</value>
+ </entry>
+ <entry>
+ <key>Title 2</key>
+ <value>Titel 2</value>
+ </entry>
+ <entry>
+ <key>Hierarchy</key>
+ <value>Hierarchie</value>
+ </entry>
+ <entry>
+ <key>Object relation</key>
+ <value>Beziehungen</value>
+ </entry>
+ <entry>
+ <key>Type 2 enabled</key>
+ <value>Typ 2 aktiviert</value>
+ </entry>
+ <entry>
+ <key>Relation type 1</key>
+ <value>Beziehungsart 1</value>
+ </entry>
+ <entry>
+ <key>Relation type 2</key>
+ <value>Beziehungsart 2</value>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ <value>Beziehungstyp</value>
+ </entry>
+ <entry>
+ <key>Context 1</key>
+ <value>Kontext 1</value>
+ </entry>
+ <entry>
+ <key>Context 2</key>
+ <value>Kontext2</value>
+ </entry>
+ <entry>
+ <key>Tochter</key>
+ </entry>
+ <entry>
+ <key>Delete all usage</key>
+ <value>Lösche jede Verwendung</value>
+ </entry>
+ <entry>
+ <key>Deleted all usages of \"%0\".</key>
+ <value>Jede Verwendung von \"%0\" wurde gelöscht.</value>
+ </entry>
+ <entry>
+ <key>promotion target ofc</key>
+ </entry>
+ <entry>
+ <key>Successful</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 0cd508f221..698a13751f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2776,6 +2776,54 @@
<entry>
<key>Key figures</key>
</entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Object type 1</key>
+ </entry>
+ <entry>
+ <key>Object type 2</key>
+ </entry>
+ <entry>
+ <key>Title 1</key>
+ </entry>
+ <entry>
+ <key>Title 2</key>
+ </entry>
+ <entry>
+ <key>Hierarchy</key>
+ </entry>
+ <entry>
+ <key>Object relation</key>
+ </entry>
+ <entry>
+ <key>Relation type 1</key>
+ </entry>
+ <entry>
+ <key>Relation type 2</key>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ </entry>
+ <entry>
+ <key>Context 1</key>
+ </entry>
+ <entry>
+ <key>Context 2</key>
+ </entry>
+ <entry>
+ <key>Delete all usage</key>
+ </entry>
+ <entry>
+ <key>Deleted all usages of \"%0\".</key>
+ </entry>
+ <entry>
+ <key>promotion target ofc</key>
+ </entry>
+ <entry>
+ <key>Successful</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/ObjectRelationType/ObjectRelationType.aod b/neonContext/ObjectRelationType/ObjectRelationType.aod
index f3285ed72a..5e82a52756 100644
--- a/neonContext/ObjectRelationType/ObjectRelationType.aod
+++ b/neonContext/ObjectRelationType/ObjectRelationType.aod
@@ -1,6 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>ObjectRelationType</name>
+ <title>Relation type</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>ObjectRelationTypeFilter_view</filterview>
+ <editview>ObjectRelationTypeEdit_view</editview>
+ <preview>ObjectRelationTypePreview_view</preview>
<entity>ObjectRelationType_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3bee0408-8a9b-4188-8ebf-0b9671bbf436</name>
+ <view>ObjectRelationTypeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>afb5b3c7-fb34-4511-8b72-34808d64e226</name>
+ <view>ObjectRelationTypeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b4cb3fc0-03ed-48d5-bd0c-725623865bc3</name>
+ <view>ObjectRelationTypePreview_view</view>
+ </neonViewReference>
+ </references>
</neonContext>
diff --git a/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod b/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
new file mode 100644
index 0000000000..0395015611
--- /dev/null
+++ b/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
@@ -0,0 +1,39 @@
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ObjectRelationTypeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>adb2c427-89fd-4f8d-abae-39c8273c9916</name>
+ <entityField>SOURCE_RELATION_TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ffaf9de0-6866-4d0a-80af-42b57169d83e</name>
+ <entityField>SOURCE_OBJECT_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0fd227e4-2896-4ce3-b699-8e5ce82a2862</name>
+ <entityField>DEST_RELATION_TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e7578539-f60d-4136-af56-9fd587ed34ec</name>
+ <entityField>DEST_OBJECT_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>945f613e-ce96-419d-8a71-f3196e41e444</name>
+ <entityField>HIERARCHY</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod b/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
new file mode 100644
index 0000000000..474bfcaaf5
--- /dev/null
+++ b/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
@@ -0,0 +1,38 @@
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ObjectRelationTypeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>RelationTypes</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>e526e3fb-2776-42f9-b75e-67a5dc7bde9d</name>
+ <entityField>SOURCE_RELATION_TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>89ee84eb-b50b-47e4-863c-7537c8a2c1d0</name>
+ <entityField>SOURCE_OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2230c73a-f5d9-44bb-bcfa-67d42a24881b</name>
+ <entityField>DEST_RELATION_TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>755d8ce7-3995-457c-b5f2-39f5aae361f6</name>
+ <entityField>DEST_OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3e9e27c1-e971-4431-9f47-1d8fe436be76</name>
+ <entityField>HIERARCHY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectRelationTypePreview_view/ObjectRelationTypePreview_view.aod b/neonView/ObjectRelationTypePreview_view/ObjectRelationTypePreview_view.aod
new file mode 100644
index 0000000000..0b02d9141e
--- /dev/null
+++ b/neonView/ObjectRelationTypePreview_view/ObjectRelationTypePreview_view.aod
@@ -0,0 +1,17 @@
+<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ObjectRelationTypePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>header</name>
+ <titleField>SOURCE_RELATION_TITLE</titleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 33c7ef2568..af17888c14 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -45,11 +45,6 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>ab7d3db4-af9d-4903-b28a-6347f2512a54</name>
- <entityField>ObjectRelations</entityField>
- <view>ObjectRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
<entityField>ObjectTrees</entityField>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 81c60ecc29..6720704e06 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -34,11 +34,6 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>a713a58e-eae0-4657-9cb0-ffffbd41d4ab</name>
- <entityField>ObjectRelations</entityField>
- <view>ObjectRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
<entityField>ObjectTrees</entityField>
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
index f44bc3ead9..710f0c64e9 100644
--- a/process/ObjectRelation_lib/process.js
+++ b/process/ObjectRelation_lib/process.js
@@ -13,59 +13,81 @@ function ObjectRelationUtils() {}
* Get all possible relationTypes by a objectType. (objectrelationtypeId and title)
* Normally it only returns the id and title. If you set pFullInfo to true, you will get additional information, too.
*
- * @param {String} pObjectType the object type to load the relation types for.]
- * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, objectrelationtypeId
+ * @param {String} [pObjectType=undefined] the object type to load the relation types for.]
+ * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, objectrelationtypeId, other title
*
* @return {String[][]}
*/
-ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
+ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo, pOnlyFirstSide, pRelationTypeId)
{
var sql = " from AB_OBJECTRELATIONTYPE main \n\
- left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where case when type2.OBJECT_TYPE is null then main.OBJECT_TYPE else type2.OBJECT_TYPE end = ? "
+ left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) ";
+ var cond = "";
- // only id and title:
- if (pFullInfo == undefined || pFullInfo == false)
+ var params = [];
+
+ if (pObjectType)
+ {
+ cond = "where case when type2.OBJECT_TYPE is null then main.OBJECT_TYPE else type2.OBJECT_TYPE end = ? "
+ params.push([pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]);
+ }
+
+ if (pRelationTypeId)
{
- pFullInfo = [];
+ if (!cond)
+ cond = "where ";
+ else
+ cond += " and ";
- return (db.table(
- ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE" + sql,
- [
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]
- ]
- ]));
+ cond += " main.AB_OBJECTRELATIONTYPEID = ? ";
+ params.push([pRelationTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]]);
+ }
+
+ if (pOnlyFirstSide == "1")
+ {
+ if (!cond)
+ cond = "where ";
+ else
+ cond += " and ";
+ cond += " main.SIDE = 1 "
}
- // full info:
- var relationTypes = (db.table(
- ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
+ sql += cond;
+
+ // only id and title:
+ if (pFullInfo == undefined || pFullInfo == false)
+ {
+ sql = "select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE" + sql;
+ }
+ else
+ {
+ sql = "select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
case when type2.AB_OBJECTRELATIONTYPEID is null then 'same' \n\
when main.SIDE = 1 then 'normal'\n\
else 'reverse'\n\
end direction,\n\
main.HIERARCHY, \n\
- type2.OBJECT_TYPE objectType, \n\
- main.OBJECT_TYPE objectType, \n\
+ type2.OBJECT_TYPE destObjectType, \n\
+ main.OBJECT_TYPE sourceObjectType, \n\
-- typeId of Object2\n\
case when main.SIDE = 1 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId1,\n\
-- typeId of Object1\n\
case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE, case when type2.AB_OBJECTRELATIONTYPEID is null then main.AB_OBJECTRELATIONTYPEID else type2.AB_OBJECTRELATIONTYPEID end" + sql,
- [
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]
- ]
- ]));
-
- return relationTypes;
+ main.SIDE,\n\
+ case when type2.AB_OBJECTRELATIONTYPEID is null then main.AB_OBJECTRELATIONTYPEID else type2.AB_OBJECTRELATIONTYPEID end,\n\
+ type2.RELATION_TITLE" + sql;
+ }
+
+ // full info:
+ return (db.table([sql, params]));
}
/**
* Get relationType by a RelationTypeId.
- * returns the objectrelationtypeId, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side,objectrelationtypeId
+ * returns the objectrelationtypeId, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side,objectrelationtypeId, other title
*
* @param {String} pRelationTypeId the RelationTypeId to load the full relation type for.
*
@@ -73,32 +95,9 @@ ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
*/
ObjectRelationUtils.getRelationType = function(pRelationTypeId)
{
- // TODO: funktionen evtl. zusammenfassen
- var sql = " from AB_OBJECTRELATIONTYPE main \n\
- left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where main.AB_OBJECTRELATIONTYPEID = ?"
-
- // full info:
- var relationType = (db.array(db.ROW,
- ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
- case when type2.AB_OBJECTRELATIONTYPEID is null then 'same' \n\
- when main.SIDE = 1 then 'normal'\n\
- else 'reverse'\n\
- end direction,\n\
- main.HIERARCHY, \n\
- type2.OBJECT_TYPE objectType, \n\
- main.OBJECT_TYPE objectType, \n\
- -- typeId of Object2\n\
- case when main.SIDE = 1 then main.AB_OBJECTRELATIONTYPEID\n\
- else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId1,\n\
- -- typeId of Object1\n\
- case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
- else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE, case when type2.AB_OBJECTRELATIONTYPEID is null then main.AB_OBJECTRELATIONTYPEID else type2.AB_OBJECTRELATIONTYPEID end" + sql,
- [
- [pRelationTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]],
- ]
- ]));
-
- return relationType;
+ var data = ObjectRelationUtils.getPossibleRelationTypes(undefined, true, false, pRelationTypeId);
+ if (data.length > 0)
+ return data[0];
+ else
+ return [];
}
\ No newline at end of file
--
GitLab
From 79fea45d93830b173e745f3c122f5ad87289b91f Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 9 Apr 2019 15:53:44 +0200
Subject: [PATCH 241/250] language
---
.../_____LANGUAGE_EXTRA.aod | 33 +++++++++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 10 ------
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 36 +++++++++++++++++++
3 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index bc40627b52..d879997ad2 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2796,6 +2796,39 @@
<entry>
<key>Type 2 enabled</key>
</entry>
+ <entry>
+ <key>test1eee</key>
+ </entry>
+ <entry>
+ <key>Kennzahlen</key>
+ </entry>
+ <entry>
+ <key>Count</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year </key>
+ </entry>
+ <entry>
+ <key>test2</key>
+ </entry>
+ <entry>
+ <key>Picture</key>
+ </entry>
+ <entry>
+ <key>Chart</key>
+ </entry>
+ <entry>
+ <key>Salesproject Charts</key>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Tochter</key>
+ </entry>
+ <entry>
+ <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </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 7351586623..418ed9962b 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1602,7 +1602,6 @@
</entry>
<entry>
<key>Key figures</key>
- <value>Kennzahlen</value>
</entry>
<entry>
<key>Person</key>
@@ -3537,15 +3536,6 @@
<entry>
<key>Salesproject Phases</key>
</entry>
- <entry>
- <key>Salesproject Phases</key>
- </entry>
- <entry>
- <key>Salesproject Phases</key>
- </entry>
- <entry>
- <key>Key figures</key>
- </entry>
<entry>
<key>Objectrelation type</key>
<value>Beziehungstyp</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 698a13751f..3dae32cda2 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2824,6 +2824,42 @@
<entry>
<key>Successful</key>
</entry>
+ <entry>
+ <key>Objectrelation type</key>
+ </entry>
+ <entry>
+ <key>test1eee</key>
+ </entry>
+ <entry>
+ <key>Kennzahlen</key>
+ </entry>
+ <entry>
+ <key>Count</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year </key>
+ </entry>
+ <entry>
+ <key>Type 2 enabled</key>
+ </entry>
+ <entry>
+ <key>test2</key>
+ </entry>
+ <entry>
+ <key>Picture</key>
+ </entry>
+ <entry>
+ <key>Chart</key>
+ </entry>
+ <entry>
+ <key>Salesproject Charts</key>
+ </entry>
+ <entry>
+ <key>Tochter</key>
+ </entry>
+ <entry>
+ <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab
From 9a767a9d15b0bab2f6c940c20190b9e1b5d00530 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 9 Apr 2019 16:01:40 +0200
Subject: [PATCH 242/250] CONTACTID in ObjectRowId param in Person_entity
---
.../360degreeobjects/children/objectrowid_param/valueProcess.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
index bdc67e9f84..0d3ba06fe9 100644
--- a/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.getString("$field.PERSONID"));
\ No newline at end of file
+result.string(vars.getString("$field.CONTACTID"));
\ No newline at end of file
--
GitLab
From b00386eed5c3d14b707ab26117204e9a760cb490 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 9 Apr 2019 16:04:08 +0200
Subject: [PATCH 243/250] fix object relation tree
---
.../recordcontainers/jdito/contentProcess.js | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 565597b0b4..fe657ea0e6 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.db");
import("system.translate");
import("system.result");
@@ -50,7 +51,7 @@ else
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData, pObjectRelationId)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData)
{
// prevent stack overflows
if (pLayer > 30)
@@ -68,12 +69,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
{
if (pLayer == 0)
{
- // load only one ObjectRelation (e.g. for edit mode)
- if (pObjectRelationId)
- {
-
- }
- else if (pObjectRelationTypeId)
+ if (pObjectRelationTypeId)
{
let relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
@@ -166,7 +162,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
if (direction == "same")
{
var otherEntryData = _getEntryData(pNodeId[0], "normal", relationType1, relationType2, prevObjectId, true);
- uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 1));
+ _insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 1);
}
}
}
--
GitLab
From 0b33256315da12492b69bdb247ee848becb0e15d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 9 Apr 2019 14:45:15 +0200
Subject: [PATCH 244/250] moved liquibase files: "others/dbchanges/" ->
".liquibase/"
---
.../2019.2/AditoBasic/init_ActivityCategory.xml | 0
.../basic/2019.2/AditoBasic/init_AddressType.xml | 0
.../init_AttributeKeyword_target_group.xml | 0
.../basic/2019.2/AditoBasic/init_AttributeType.xml | 0
.../2019.2/AditoBasic/init_CommunicationMedium.xml | 0
.../2019.2/AditoBasic/init_ContactContactrole.xml | 0
.../2019.2/AditoBasic/init_ContactDepartment.xml | 0
.../2019.2/AditoBasic/init_ContactPosition.xml | 0
.../basic/2019.2/AditoBasic/init_DeliveryTerm.xml | 0
.../2019.2/AditoBasic/init_OfferProbability.xml | 0
.../basic/2019.2/AditoBasic/init_PaymentTerm.xml | 0
.../init_SalesprojectCompetitionState.xml | 0
.../2019.2/AditoBasic/init_SalesprojectPhase.xml | 0
.../2019.2/AditoBasic/init_SalesprojectState.xml | 0
.../basic/2019.2/AditoBasic/init_TaskPriority.xml | 0
.../basic/2019.2/AditoBasic/init_TaskProgress.xml | 0
.../AditoBasic/insert_offer_status_keyword.xml | 0
.../insert_salesproject_state_keyword.xml | 0
.../2019.2/AditoBasic/update_Strength_Weakness.xml | 0
.../Data_alias/basic/2019.2/AttributeKeyword.xml | 0
.../Data_alias/basic/2019.2/ChangeNotes.txt | 0
.../Data_alias/basic/2019.2/Contact_add_columns.xml | 0
.../2019.2/Contactmanagement_added_ImageBlobs.xml | 0
.../ActivityCategory.xml | 0
.../KeywordRelatedStructureChanges/AddressType.xml | 0
.../CommunicationMedium.xml | 0
.../OfferProbability.xml | 0
.../SalesProjectCompetitionPhase.xml | 0
.../SalesProjectPhase.xml | 0
.../SalesProjectPricePolitics.xml | 0
.../SalesProjectState.xml | 0
.../SalesProjectStrength.xml | 0
.../SalesProjectWeakness.xml | 0
.../SalesprojectCompetitionState.xml | 0
.../KeywordRelatedStructureChanges/TaskPriority.xml | 0
.../Data_alias/basic/2019.2/Offer_terms.xml | 0
.../Data_alias/basic/2019.2/Product_remove_fk.xml | 0
.../basic/2019.2/SalesOrder_source_offer.xml | 0
.../basic/2019.2/Salesproject_add_column.xml | 0
.../activity_add_date_editnew_user_editnew.xml | 0
.../Data_alias/basic/2019.2/activity_add_parent.xml | 0
.../activitylink_add_date_editnew_user_editnew.xml | 0
.../basic/2019.2/add_ObjectRelation_type.xml | 0
.../address_add_date_editnew_user_editnew.xml | 0
...ributerelation_add_date_editnew_user_editnew.xml | 0
.../Data_alias/basic/2019.2/changelog.xml | 0
.../communication_add_date_editnew_user_editnew.xml | 0
.../contact_add_date_editnew_user_editnew.xml | 0
.../Data_alias/basic/2019.2/create_salutation.xml | 0
.../Data_alias/basic/2019.2/create_taskLink.xml | 0
.../data/AditoBasic/ObjectRelation_exampleData.xml | 0
.../basic/2019.2/data/ORGANISATION_private.xml | 0
.../2019.2/data/example_activity/ACTIVITY_gfk.xml | 0
.../example_activity/LOBs/subjectText_661a7b87.txt | 0
.../LOBs/subjectText_661a7b87_1.txt | 0
.../2019.2/data/example_attribute/Attribute.xml | 0
.../data/example_attribute/AttributeUsage.xml | 0
.../2019.2/data/example_contract/CONTRACT_1000.xml | 0
.../2019.2/data/example_contract/CONTRACT_1001.xml | 0
.../2019.2/data/example_contract/CONTRACT_1002.xml | 0
.../2019.2/data/example_contract/CONTRACT_1003.xml | 0
.../2019.2/data/example_contract/CONTRACT_1004.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1000.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1001.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1002.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1003.xml | 0
.../basic/2019.2/data/example_offer/OFFER_1004.xml | 0
.../data/example_organisation/ORGANISATION_gfk.xml | 0
.../ORGANISATION_kaeltetechnik.xml | 0
.../ORGANISATION_lichtenstein.xml | 0
.../data/example_organisation/ORGANISATION_mnf.xml | 0
.../ORGANISATION_pichelmaier.xml | 0
.../2019.2/data/example_person/PERSON_gruener.xml | 0
.../2019.2/data/example_person/PERSON_kanzler.xml | 0
.../2019.2/data/example_person/PERSON_leicht.xml | 0
.../2019.2/data/example_person/PERSON_lustig.xml | 0
.../2019.2/data/example_person/PERSON_muller.xml | 0
.../2019.2/data/example_person/PERSON_obermeier.xml | 0
.../2019.2/data/example_person/PERSON_pfiffig.xml | 0
.../2019.2/data/example_person/PERSON_smith.xml | 0
.../2019.2/data/example_person/PERSON_sommer.xml | 0
.../data/example_product/PRODUCT_42154311.xml | 0
.../data/example_salesorder/SALESORDER_1000.xml | 0
.../data/example_salesorder/SALESORDER_1001.xml | 0
.../data/example_salesorder/SALESORDER_1002.xml | 0
.../data/example_salesorder/SALESORDER_1003.xml | 0
.../data/example_salesorder/SALESORDER_1004.xml | 0
.../data/example_salesorder/SALESORDER_1005.xml | 0
.../data/example_salesorder/SALESORDER_1006.xml | 0
.../data/example_salesorder/SALESORDER_1007.xml | 0
.../data/example_salesorder/SALESORDER_1008.xml | 0
.../data/example_salesorder/SALESORDER_1009.xml | 0
.../data/example_salesproject/SALESPROJECT_gfk.xml | 0
.../data/example_salesproject/SALESPROJECT_jkl.xml | 0
.../basic/2019.2/data/example_task/base.xml | 0
.../basic/2019.2/drop_contact_id_sp_forecast.xml | 0
.../basic/2019.2/drop_estimation_salesproject.xml | 0
.../2019.2/drop_pricePolitics-weakness-strength.xml | 0
.../Data_alias/basic/2019.2/fix_sp_phases.xml | 0
.../basic/2019.2/indicesRefactor/Activity.xml | 0
.../2019.2/indicesRefactor/ContactManagement.xml | 0
.../basic/2019.2/indicesRefactor/Keyword.xml | 0
.../basic/2019.2/indicesRefactor/Task.xml | 0
.../2019.2/offer_add_date_editnew_user_editnew.xml | 0
.../organisation_add_date_editnew_user_editnew.xml | 0
.../2019.2/person_add_date_editnew_user_editnew.xml | 0
.../product_add_date_editnew_user_editnew.xml | 0
.../Data_alias/basic/2019.2/removeTaskCode.xml | 0
.../Data_alias/basic/2019.2/task_add_parent.xml | 0
.../basic/2019.2/update_Keyword_Essentials.xml | 0
.../basic/2019.2/update_TaskType_Task.xml | 0
.../basic/2019.2/update_pricelist_keyword.xml | 0
.../ab_countryinfo/ChangesLobFile/blob/AD.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AQ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AX.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/AZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BB.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BD.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BJ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BQ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BV.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/BZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CD.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CV.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CX.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/CZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/DE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/DJ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/DK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/DM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/DO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/DZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/EC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/EE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/EG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/EH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ER.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ES.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ET.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/FI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/FJ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/FK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/FM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/FO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/FR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GB.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GD.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GP.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GQ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/GY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/HK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/HM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/HN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/HR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/HT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/HU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ID.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IQ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/IT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/JE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/JM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/JO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/JP.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KP.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/KZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LB.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LV.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/LY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MD.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ME.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ML.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MP.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MQ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MV.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MX.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/MZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NP.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/NZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/OM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/PY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/QA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/RE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/RO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/RS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/RU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/RW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SB.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SD.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SJ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ST.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SV.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SX.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/SZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TD.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TH.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TJ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TL.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TO.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TR.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TV.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TW.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/TZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/UA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/UG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/UM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/US.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/UY.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/UZ.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/VA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/VC.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/VE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/VG.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/VI.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/VN.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/VU.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/WF.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/WS.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/XK.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/YE.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/YT.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ZA.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ZM.svg | 0
.../ab_countryinfo/ChangesLobFile/blob/ZW.svg | 0
.../ab_countryinfo/init_ab_countryinfo.xml | 0
.../init/data/AditoBasic/ab_keyword_attribute.xml | 0
.../init_SalesprojectProbability_percentValue.xml | 0
.../basic/init/data/AditoBasic/ab_keyword_entry.xml | 0
.../ab_keyword_entry/init_ActivityDirection.xml | 0
.../ab_keyword_entry/init_AttributeType.xml | 0
.../ab_keyword_entry/init_ContactStatus.xml | 0
.../ab_keyword_entry/init_ContractPayment.xml | 0
.../ab_keyword_entry/init_ContractStatus.xml | 0
.../ab_keyword_entry/init_ContractType.xml | 0
.../AditoBasic/ab_keyword_entry/init_Currency.xml | 0
.../ab_keyword_entry/init_KeywordAttributeType.xml | 0
.../ab_keyword_entry/init_OfferStatus.xml | 0
.../ab_keyword_entry/init_OrganisationType.xml | 0
.../ab_keyword_entry/init_PersonGender.xml | 0
.../ab_keyword_entry/init_ProductGroupcode.xml | 0
.../ab_keyword_entry/init_ProductPricelist.xml | 0
.../ab_keyword_entry/init_QuantityUnit.xml | 0
.../ab_keyword_entry/init_SalesorderState.xml | 0
.../init_SalesprojectMemberRole.xml | 0
.../init_SalesprojectPricePolitics.xml | 0
.../init_SalesprojectProbability.xml | 0
.../ab_keyword_entry/init_SalesprojectSource.xml | 0
.../ab_keyword_entry/init_SalesprojectStrength.xml | 0
.../ab_keyword_entry/init_SalesprojectWeakness.xml | 0
.../ab_keyword_entry/init_SalesprojectWonLost.xml | 0
.../ab_keyword_entry/init_StockWarehouse.xml | 0
.../AditoBasic/ab_keyword_entry/init_TaskStatus.xml | 0
.../AditoBasic/ab_keyword_entry/init_TaskType.xml | 0
.../basic/init/data/AditoBasic/init_ab_language.xml | 0
.../Data_alias/basic/init/init.xml | 0
.../init/struct/AditoBasic/create_ab_attribute.xml | 0
.../AditoBasic/create_ab_attributerelation.xml | 0
.../struct/AditoBasic/create_ab_attributeusage.xml | 0
.../struct/AditoBasic/create_ab_countryinfo.xml | 0
.../AditoBasic/create_ab_keyword_attribute.xml | 0
.../create_ab_keyword_attributerelation.xml | 0
.../struct/AditoBasic/create_ab_keyword_entry.xml | 0
.../init/struct/AditoBasic/create_ab_language.xml | 0
.../struct/AditoBasic/create_ab_objectrelation.xml | 0
.../basic/init/struct/create_activity.xml | 0
.../basic/init/struct/create_activitylink.xml | 0
.../Data_alias/basic/init/struct/create_address.xml | 0
.../basic/init/struct/create_appointmentlink.xml | 0
.../basic/init/struct/create_communication.xml | 0
.../Data_alias/basic/init/struct/create_contact.xml | 0
.../basic/init/struct/create_contract.xml | 0
.../Data_alias/basic/init/struct/create_offer.xml | 0
.../basic/init/struct/create_offeritem.xml | 0
.../basic/init/struct/create_organisation.xml | 0
.../Data_alias/basic/init/struct/create_person.xml | 0
.../basic/init/struct/create_prod2prod.xml | 0
.../Data_alias/basic/init/struct/create_product.xml | 0
.../basic/init/struct/create_productprice.xml | 0
.../basic/init/struct/create_salesorder.xml | 0
.../basic/init/struct/create_salesorderitem.xml | 0
.../basic/init/struct/create_salesproject.xml | 0
.../struct/create_salesproject_classification.xml | 0
.../init/struct/create_salesproject_competition.xml | 0
.../basic/init/struct/create_salesproject_cycle.xml | 0
.../init/struct/create_salesproject_forecast.xml | 0
.../init/struct/create_salesproject_member.xml | 0
.../init/struct/create_salesproject_source.xml | 0
.../Data_alias/basic/init/struct/create_stock.xml | 0
.../Data_alias/basic/init/struct/create_task.xml | 0
.../basic/init/struct/create_timetracking.xml | 0
.../Data_alias/changelog.xml | 0
.../init/data/defaultBlob/_____configuration.xml | 0
.../data/defaultBlob/_____system_sysdb_version.xml | 0
.../basic/init/data/defaultBlob/data_alias.xml | 0
.../example_asys_binaries/Birgit_Leicht_Image.xml | 0
.../example_asys_binaries/Harold_Smith_Image.xml | 0
.../Herbert_Obermeier_Image.xml | 0
.../example_asys_binaries/Lisa_Sommer_Image.xml | 0
.../example_asys_binaries/Susanne_Lustig_Image.xml | 0
.../example_asys_binaries/blob/Birgit_Leicht.png | Bin
.../blob/Birgit_Leicht_preview.jpeg | Bin
.../example_asys_binaries/blob/Harold_Smith.png | Bin
.../blob/Harold_Smith_preview.jpeg | Bin
.../blob/Herbert_Obermeier.png | Bin
.../blob/Herbert_Obermeier_preview.jpeg | Bin
.../data/example_asys_binaries/blob/Lisa_Sommer.png | Bin
.../blob/Lisa_Sommer_preview.jpeg | Bin
.../example_asys_binaries/blob/Susanne_Lustig.png | Bin
.../blob/Susanne_Lustig_preview.jpeg | Bin
.../init/data/example_asys_users/Birgit_Leicht.xml | 0
.../init/data/example_asys_users/Harold_Smith.xml | 0
.../data/example_asys_users/Herbert_Obermeier.xml | 0
.../init/data/example_asys_users/Lisa_Sommer.xml | 0
.../init/data/example_asys_users/Susanne_Lustig.xml | 0
.../basic/init/data/insert_asys_aliasconfig.xml | 0
.../basic/init/data/insert_asys_system.xml | 0
.../basic/init/data/insert_asys_users-admin.xml | 0
.../_____SYSTEMALIAS/basic/init/init.xml | 0
.../basic/init/struct/create_asys_aliasconfig.xml | 0
.../basic/init/struct/create_asys_binaries.xml | 0
.../init/struct/create_asys_calendarbackend.xml | 0
.../basic/init/struct/create_asys_calendarlink.xml | 0
.../struct/create_asys_dashletconfigurations.xml | 0
.../basic/init/struct/create_asys_dashlets.xml | 0
.../basic/init/struct/create_asys_notifications.xml | 0
.../basic/init/struct/create_asys_sequences.xml | 0
.../basic/init/struct/create_asys_system.xml | 0
.../basic/init/struct/create_asys_timer.xml | 0
.../basic/init/struct/create_asys_users.xml | 0
.../basic/init/system_aliasTestdata.xml | 0
.../_____SYSTEMALIAS/changelog.xml | 0
469 files changed, 0 insertions(+), 0 deletions(-)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/AttributeKeyword.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/ChangeNotes.txt (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/Contact_add_columns.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/Offer_terms.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/Product_remove_fk.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/SalesOrder_source_offer.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/Salesproject_add_column.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/activity_add_parent.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/add_ObjectRelation_type.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/changelog.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/create_salutation.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/create_taskLink.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/ORGANISATION_private.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/data/example_task/base.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/drop_estimation_salesproject.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/fix_sp_phases.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/indicesRefactor/Activity.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/indicesRefactor/Task.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/removeTaskCode.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/task_add_parent.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/update_Keyword_Essentials.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/update_TaskType_Task.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/2019.2/update_pricelist_keyword.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/init.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_activity.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_activitylink.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_address.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_appointmentlink.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_communication.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_contact.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_contract.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_offer.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_offeritem.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_organisation.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_person.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_prod2prod.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_product.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_productprice.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesorder.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesorderitem.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesproject.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesproject_classification.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesproject_competition.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesproject_cycle.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesproject_forecast.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesproject_member.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_salesproject_source.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_stock.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_task.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/basic/init/struct/create_timetracking.xml (100%)
rename {others/db_changes => .liquibase}/Data_alias/changelog.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/init.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml (100%)
rename {others/db_changes => .liquibase}/_____SYSTEMALIAS/changelog.xml (100%)
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml b/.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
rename to .liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/ChangeNotes.txt b/.liquibase/Data_alias/basic/2019.2/ChangeNotes.txt
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/ChangeNotes.txt
rename to .liquibase/Data_alias/basic/2019.2/ChangeNotes.txt
diff --git a/others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml b/.liquibase/Data_alias/basic/2019.2/Contact_add_columns.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml
rename to .liquibase/Data_alias/basic/2019.2/Contact_add_columns.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml b/.liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
rename to .liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/Offer_terms.xml b/.liquibase/Data_alias/basic/2019.2/Offer_terms.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Offer_terms.xml
rename to .liquibase/Data_alias/basic/2019.2/Offer_terms.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/Product_remove_fk.xml b/.liquibase/Data_alias/basic/2019.2/Product_remove_fk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Product_remove_fk.xml
rename to .liquibase/Data_alias/basic/2019.2/Product_remove_fk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/SalesOrder_source_offer.xml b/.liquibase/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
rename to .liquibase/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/Salesproject_add_column.xml b/.liquibase/Data_alias/basic/2019.2/Salesproject_add_column.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Salesproject_add_column.xml
rename to .liquibase/Data_alias/basic/2019.2/Salesproject_add_column.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/activity_add_parent.xml b/.liquibase/Data_alias/basic/2019.2/activity_add_parent.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/activity_add_parent.xml
rename to .liquibase/Data_alias/basic/2019.2/activity_add_parent.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml b/.liquibase/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
rename to .liquibase/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/changelog.xml
rename to .liquibase/Data_alias/basic/2019.2/changelog.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/create_salutation.xml b/.liquibase/Data_alias/basic/2019.2/create_salutation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/create_salutation.xml
rename to .liquibase/Data_alias/basic/2019.2/create_salutation.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/create_taskLink.xml b/.liquibase/Data_alias/basic/2019.2/create_taskLink.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/create_taskLink.xml
rename to .liquibase/Data_alias/basic/2019.2/create_taskLink.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
rename to .liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/ORGANISATION_private.xml b/.liquibase/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
rename to .liquibase/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml b/.liquibase/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt b/.liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
rename to .liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt b/.liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
rename to .liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml b/.liquibase/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_task/base.xml b/.liquibase/Data_alias/basic/2019.2/data/example_task/base.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_task/base.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_task/base.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml b/.liquibase/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
rename to .liquibase/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/drop_estimation_salesproject.xml b/.liquibase/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
rename to .liquibase/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml b/.liquibase/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
rename to .liquibase/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/fix_sp_phases.xml b/.liquibase/Data_alias/basic/2019.2/fix_sp_phases.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/fix_sp_phases.xml
rename to .liquibase/Data_alias/basic/2019.2/fix_sp_phases.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/Task.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/Task.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/removeTaskCode.xml b/.liquibase/Data_alias/basic/2019.2/removeTaskCode.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/removeTaskCode.xml
rename to .liquibase/Data_alias/basic/2019.2/removeTaskCode.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/task_add_parent.xml b/.liquibase/Data_alias/basic/2019.2/task_add_parent.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/task_add_parent.xml
rename to .liquibase/Data_alias/basic/2019.2/task_add_parent.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/update_Keyword_Essentials.xml b/.liquibase/Data_alias/basic/2019.2/update_Keyword_Essentials.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/update_Keyword_Essentials.xml
rename to .liquibase/Data_alias/basic/2019.2/update_Keyword_Essentials.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/update_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/update_TaskType_Task.xml
rename to .liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/update_pricelist_keyword.xml b/.liquibase/Data_alias/basic/2019.2/update_pricelist_keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/update_pricelist_keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/update_pricelist_keyword.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
diff --git a/others/db_changes/Data_alias/basic/init/init.xml b/.liquibase/Data_alias/basic/init/init.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/init.xml
rename to .liquibase/Data_alias/basic/init/init.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_activity.xml b/.liquibase/Data_alias/basic/init/struct/create_activity.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_activity.xml
rename to .liquibase/Data_alias/basic/init/struct/create_activity.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_activitylink.xml b/.liquibase/Data_alias/basic/init/struct/create_activitylink.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_activitylink.xml
rename to .liquibase/Data_alias/basic/init/struct/create_activitylink.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_address.xml b/.liquibase/Data_alias/basic/init/struct/create_address.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_address.xml
rename to .liquibase/Data_alias/basic/init/struct/create_address.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_appointmentlink.xml b/.liquibase/Data_alias/basic/init/struct/create_appointmentlink.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_appointmentlink.xml
rename to .liquibase/Data_alias/basic/init/struct/create_appointmentlink.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_communication.xml b/.liquibase/Data_alias/basic/init/struct/create_communication.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_communication.xml
rename to .liquibase/Data_alias/basic/init/struct/create_communication.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_contact.xml b/.liquibase/Data_alias/basic/init/struct/create_contact.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_contact.xml
rename to .liquibase/Data_alias/basic/init/struct/create_contact.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_contract.xml b/.liquibase/Data_alias/basic/init/struct/create_contract.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_contract.xml
rename to .liquibase/Data_alias/basic/init/struct/create_contract.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_offer.xml b/.liquibase/Data_alias/basic/init/struct/create_offer.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_offer.xml
rename to .liquibase/Data_alias/basic/init/struct/create_offer.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_offeritem.xml b/.liquibase/Data_alias/basic/init/struct/create_offeritem.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_offeritem.xml
rename to .liquibase/Data_alias/basic/init/struct/create_offeritem.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_organisation.xml b/.liquibase/Data_alias/basic/init/struct/create_organisation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_organisation.xml
rename to .liquibase/Data_alias/basic/init/struct/create_organisation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_person.xml b/.liquibase/Data_alias/basic/init/struct/create_person.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_person.xml
rename to .liquibase/Data_alias/basic/init/struct/create_person.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_prod2prod.xml b/.liquibase/Data_alias/basic/init/struct/create_prod2prod.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_prod2prod.xml
rename to .liquibase/Data_alias/basic/init/struct/create_prod2prod.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_product.xml b/.liquibase/Data_alias/basic/init/struct/create_product.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_product.xml
rename to .liquibase/Data_alias/basic/init/struct/create_product.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_productprice.xml b/.liquibase/Data_alias/basic/init/struct/create_productprice.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_productprice.xml
rename to .liquibase/Data_alias/basic/init/struct/create_productprice.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesorder.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesorder.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesorderitem.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorderitem.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesorderitem.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesorderitem.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_classification.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_classification.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_classification.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_classification.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_competition.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_competition.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_competition.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_competition.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_cycle.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_cycle.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_forecast.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_forecast.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_forecast.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_forecast.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_member.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_member.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_source.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_source.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_stock.xml b/.liquibase/Data_alias/basic/init/struct/create_stock.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_stock.xml
rename to .liquibase/Data_alias/basic/init/struct/create_stock.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_task.xml b/.liquibase/Data_alias/basic/init/struct/create_task.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_task.xml
rename to .liquibase/Data_alias/basic/init/struct/create_task.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_timetracking.xml b/.liquibase/Data_alias/basic/init/struct/create_timetracking.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_timetracking.xml
rename to .liquibase/Data_alias/basic/init/struct/create_timetracking.xml
diff --git a/others/db_changes/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
similarity index 100%
rename from others/db_changes/Data_alias/changelog.xml
rename to .liquibase/Data_alias/changelog.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/init.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/init.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml b/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/changelog.xml b/.liquibase/_____SYSTEMALIAS/changelog.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/changelog.xml
rename to .liquibase/_____SYSTEMALIAS/changelog.xml
--
GitLab
From 4b4ca1945b2108107b28e1ae4fa608ff9f9002d7 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 9 Apr 2019 16:59:20 +0200
Subject: [PATCH 245/250] fix activitylink
---
.../basic/2019.2/alter_activityLink_Derby.xml | 11 +++++++++++
.../basic/2019.2/alter_activityLink_notDerby.xml | 6 ++++++
.liquibase/Data_alias/basic/2019.2/changelog.xml | 3 +++
aliasDefinition/Data_alias/Data_alias.aod | 8 ++++----
4 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml
create mode 100644 .liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml
diff --git a/.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml
new file mode 100644
index 0000000000..42dad5d1fe
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml
@@ -0,0 +1,11 @@
+<?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 dbms="derby" author="j.hoermann" id="4e0bce38-7470-4289-a656-2f2e34cefd9c">
+ <sql>
+ ALTER TABLE ACTIVITYLINK ADD COLUMN ACTIVITY_ID_NEW CHAR(36);
+ UPDATE ACTIVITYLINK SET ACTIVITY_ID_NEW=ACTIVITY_ID;
+ ALTER TABLE ACTIVITYLINK DROP COLUMN ACTIVITY_ID;
+ RENAME COLUMN ACTIVITYLINK.ACTIVITY_ID_NEW TO ACTIVITY_ID;
+ </sql>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml
new file mode 100644
index 0000000000..1f3a0b842f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml
@@ -0,0 +1,6 @@
+<?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 dbms="!derby" author="j.hoermann" id="634590d7-8bcc-40f9-9615-9de7cd91e586">
+ <modifyDataType tableName="ACTIVITYLINK" columnName="ACTIVITY_ID" newDataType="CHAR(36)"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 11cb1aee9e..24be8bfd78 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -132,4 +132,7 @@
<include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
<include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
+
+ <include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" />
+ <include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" />
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 230be26a32..c50f192679 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4837,12 +4837,12 @@
<name>ACTIVITY_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
--
GitLab
From 064a6e3cdc000d4cbd8472332f8055ed9897645f Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 9 Apr 2019 17:28:10 +0200
Subject: [PATCH 246/250] fix activitylink
---
.liquibase/Data_alias/basic/2019.2/changelog.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 24be8bfd78..02937d7643 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -133,6 +133,7 @@
<include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
<include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
+ <!-- Derby needs special handling -->
<include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" />
<include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" />
</databaseChangeLog>
--
GitLab
From 58976b900d421f871446fea56d7d1820caa909ba Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Tue, 9 Apr 2019 18:01:32 +0200
Subject: [PATCH 247/250] KeywordEntry_entity isPageable -> false
---
entity/KeywordEntry_entity/KeywordEntry_entity.aod | 1 +
1 file changed, 1 insertion(+)
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 51e1e38163..3c8458d4e0 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -432,6 +432,7 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <isPageable v="false" />
<conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
--
GitLab
From c9137cabd870fbadb156eb30b2bfd8a5cb9fbb79 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Wed, 10 Apr 2019 07:43:31 +0200
Subject: [PATCH 248/250] salesproject analyses changes
---
entity/Document_entity/Document_entity.aod | 1 +
.../SalesprojectAnalyses_entity.aod | 70 +++++++++++++++++++
.../documentation.adoc | 3 +
.../open_salesprojects}/valueProcess.js | 2 +-
.../overall_forecast/titleProcess.js | 0
.../overall_forecast/valueProcess.js | 2 +-
.../overall_turnover/titleProcess.js | 0
.../overall_turnover/valueProcess.js | 2 +-
.../entityfields/sent_offers/valueProcess.js | 0
.../recordcontainers/jdito/contentProcess.js | 0
.../SalesprojectChart_entity.aod | 42 -----------
.../documentation.adoc | 3 -
.../Salesproject_entity.aod | 30 --------
neonContext/Salesproject/Salesproject.aod | 4 --
.../SalesprojectAnalyses.aod} | 11 +--
.../Vertriebsdashboard/Vertriebsdashboard.aod | 44 ++++++------
.../DocumentFilter_view.aod | 2 +-
.../SalesprojectPhases_view.aod} | 4 +-
.../SalesprojectScoreCard_view.aod | 14 ++--
19 files changed, 116 insertions(+), 118 deletions(-)
create mode 100644 entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
create mode 100644 entity/SalesprojectAnalyses_entity/documentation.adoc
rename entity/{Salesproject_entity/entityfields/open_saleprojects => SalesprojectAnalyses_entity/entityfields/open_salesprojects}/valueProcess.js (92%)
rename entity/{Salesproject_entity => SalesprojectAnalyses_entity}/entityfields/overall_forecast/titleProcess.js (100%)
rename entity/{Salesproject_entity => SalesprojectAnalyses_entity}/entityfields/overall_forecast/valueProcess.js (93%)
rename entity/{Salesproject_entity => SalesprojectAnalyses_entity}/entityfields/overall_turnover/titleProcess.js (100%)
rename entity/{Salesproject_entity => SalesprojectAnalyses_entity}/entityfields/overall_turnover/valueProcess.js (93%)
rename entity/{Salesproject_entity => SalesprojectAnalyses_entity}/entityfields/sent_offers/valueProcess.js (100%)
rename entity/{SalesprojectChart_entity => SalesprojectAnalyses_entity}/recordcontainers/jdito/contentProcess.js (100%)
delete mode 100644 entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
delete mode 100644 entity/SalesprojectChart_entity/documentation.adoc
rename neonContext/{SalesprojectChart/SalesprojectChart.aod => SalesprojectAnalyses/SalesprojectAnalyses.aod} (60%)
rename neonView/{SalesprojectChart_view/SalesprojectChart_view.aod => SalesprojectPhases_view/SalesprojectPhases_view.aod} (92%)
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 4bb45b3cd4..cc14877d0f 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -90,6 +90,7 @@
</entityParameter>
<entityField>
<name>UID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>DESCRIPTION</name>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
new file mode 100644
index 0000000000..70ffd19c82
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -0,0 +1,70 @@
+<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>SalesprojectAnalyses_entity</name>
+ <title>Salesproject Analyses</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
+ <iconId>VAADIN:PIE_CHART</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>SORTING</name>
+ <title>Parent</title>
+ </entityField>
+ <entityField>
+ <name>X_PHASE</name>
+ <title>Phase</title>
+ </entityField>
+ <entityField>
+ <name>Y_COUNT</name>
+ <title>Count</title>
+ </entityField>
+ <entityField>
+ <name>OVERALL_TURNOVER</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OVERALL_FORECAST</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SENT_OFFERS</name>
+ <title>Sent offers</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPEN_SALESPROJECTS</name>
+ <title>Open salesprojects</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>X_PHASE.value</element>
+ <element>Y_COUNT.value</element>
+ <element>SORTING.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectAnalyses_entity/documentation.adoc b/entity/SalesprojectAnalyses_entity/documentation.adoc
new file mode 100644
index 0000000000..75936e03b2
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/documentation.adoc
@@ -0,0 +1,3 @@
+== Salesproject Analyses ==
+
+This entity provides analyses to display different things of all salesproject.
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
similarity index 92%
rename from entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js
rename to entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
index 5bad01babc..d58be99a6a 100644
--- a/entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
@@ -11,4 +11,4 @@ var opensp = db.cell("select count(STATE) from SALESPROJECT \n\
join AB_KEYWORD_ENTRY on KEYID = STATE and CONTAINER = 'SalesprojectState' and TITLE = 'Open' \n\
group by KEYID, AB_KEYWORD_ENTRY.TITLE");
-result.string(opensp);
+result.string(opensp);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js
rename to entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js
diff --git a/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
similarity index 93%
rename from entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js
rename to entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
index 55161154b7..b1f1ae8c00 100644
--- a/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
@@ -11,4 +11,4 @@ var forecast = db.cell(SqlCondition.begin()
.andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
.buildSql("select sum(VOLUME * 1000) from SALESPROJECT_FORECAST", "1=2"));
-result.string(forecast);
+result.string(forecast);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js
rename to entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js
diff --git a/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
similarity index 93%
rename from entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js
rename to entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
index 1a9825c1ad..a08d40a129 100644
--- a/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
@@ -11,4 +11,4 @@ var turnover = db.cell(SqlCondition.begin()
.andPrepare("SALESORDER.SALESORDERDATE", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
.buildSql("select sum(NET + VAT) from SALESORDER", "1=2"));
-result.string(turnover);
+result.string(turnover);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js
rename to entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
diff --git a/entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
similarity index 100%
rename from entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js
rename to entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
diff --git a/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod b/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
deleted file mode 100644
index 865b746689..0000000000
--- a/entity/SalesprojectChart_entity/SalesprojectChart_entity.aod
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
- <name>SalesprojectChart_entity</name>
- <title>Salesproject Charts</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/SalesprojectChart_entity/documentation.adoc</documentation>
- <iconId>VAADIN:PIE_CHART</iconId>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>SORTING</name>
- <title>Parent</title>
- </entityField>
- <entityField>
- <name>X_PHASE</name>
- <title>Phase</title>
- </entityField>
- <entityField>
- <name>Y_COUNT</name>
- <title>Count</title>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/SalesprojectChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>X_PHASE.value</element>
- <element>Y_COUNT.value</element>
- <element>SORTING.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/SalesprojectChart_entity/documentation.adoc b/entity/SalesprojectChart_entity/documentation.adoc
deleted file mode 100644
index eff361e152..0000000000
--- a/entity/SalesprojectChart_entity/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-== Salesproject Chart ==
-
-This entity provides charts to display the Phases / Status / ... of the Salesproject.
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 01fc627bc1..fc82706d67 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -517,36 +517,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>OVERALL_TURNOVER</name>
- <title>Turnover actual year</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OVERALL_FORECAST</name>
- <title>Forecast actual year</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OPEN_SALEPROJECTS</name>
- <title>Open salesprojects</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/open_saleprojects/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SENT_OFFERS</name>
- <title>Sent offers</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
- </entityField>
<entityProvider>
<name>openSalesprojects</name>
<fieldType>DEPENDENCY_IN</fieldType>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index fe73d71fbb..feef456053 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -30,9 +30,5 @@
<name>d7fb7e2b-c932-4b96-be2c-ae5ec3d36beb</name>
<view>SalesprojectCycle_view</view>
</neonViewReference>
- <neonViewReference>
- <name>f93ffaae-a097-41d6-8ca8-fad02323a909</name>
- <view>SalesprojectScoreCard_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/SalesprojectChart/SalesprojectChart.aod b/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
similarity index 60%
rename from neonContext/SalesprojectChart/SalesprojectChart.aod
rename to neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
index 7697361d4a..712d9ac63b 100644
--- a/neonContext/SalesprojectChart/SalesprojectChart.aod
+++ b/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>SalesprojectChart</name>
+ <name>SalesprojectAnalyses</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectChart_view</filterview>
- <entity>SalesprojectChart_entity</entity>
+ <entity>SalesprojectAnalyses_entity</entity>
<references>
<neonViewReference>
<name>c50b2e10-86ca-4a5b-83d4-946a78c18786</name>
- <view>SalesprojectChart_view</view>
+ <view>SalesprojectPhases_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ccb97c28-966a-4206-b981-140e87e680bf</name>
+ <view>SalesprojectScoreCard_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index 27a6720df4..d78d8f1556 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -12,60 +12,60 @@
<defaultDashlets>
<neonDashlet>
<name>Dashlet</name>
- <viewName>SalesprojectFilter_view</viewName>
- <configName>OpenSalesprojectsDashlet</configName>
+ <viewName>SalesprojectScoreCard_view</viewName>
+ <configName>KeyFigures</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="1" />
- <yPos v="5" />
- <colspan v="2" />
+ <yPos v="0" />
+ <colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet2</name>
- <viewName>SalesprojectScoreCard_view</viewName>
- <configName>KeyFigures</configName>
+ <name>Dashlet4</name>
+ <viewName>OrganisationFilter_view</viewName>
+ <configName>AllOrgsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="1" />
+ <xPos v="2" />
<yPos v="0" />
<colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet3</name>
- <viewName>SalesprojectChart_view</viewName>
- <configName>Salesproject phases</configName>
+ <name>Dashlet5</name>
+ <viewName>TurnoverChart_view</viewName>
+ <configName>TurnoverDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
- <yPos v="5" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet4</name>
- <viewName>OrganisationFilter_view</viewName>
- <configName>AllOrgsDashlet</configName>
+ <name>Dashlet2</name>
+ <viewName>SalesprojectFilter_view</viewName>
+ <configName>OpenSalesprojectsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="2" />
- <yPos v="0" />
- <colspan v="1" />
+ <xPos v="1" />
+ <yPos v="5" />
+ <colspan v="2" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet5</name>
- <viewName>TurnoverChart_view</viewName>
- <configName>TurnoverDashlet</configName>
+ <name>Dashlet3</name>
+ <viewName>SalesprojectPhases_view</viewName>
+ <configName>Salesproject phases</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
- <yPos v="0" />
+ <yPos v="5" />
<colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index 4806bb86be..88007b4a1c 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -2,7 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DocumentFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="false" />
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
similarity index 92%
rename from neonView/SalesprojectChart_view/SalesprojectChart_view.aod
rename to neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
index ee90ac3e60..c4de8f137b 100644
--- a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod
+++ b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
@@ -1,13 +1,13 @@
<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectChart_view</name>
+ <name>SalesprojectPhases_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<dashletConfigurations>
<neonDashletConfiguration>
<name>Salesproject phases</name>
<title>Salesproject phases</title>
<description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
- <fragment>SalesprojectChart/full</fragment>
+ <fragment>SalesprojectAnalyses/full</fragment>
<singleton v="true" />
<icon>VAADIN:FUNNEL</icon>
<categories>
diff --git a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
index 2f5f49c297..70df58282a 100644
--- a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
+++ b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
@@ -6,8 +6,8 @@
<neonDashletConfiguration>
<name>KeyFigures</name>
<title>Key figures</title>
- <description>Kennzahlen</description>
- <fragment>Salesproject/full</fragment>
+ <description>Wichtigste Kennzahlen zu den Vertriebsprojekten.</description>
+ <fragment>SalesprojectAnalyses/full</fragment>
<singleton v="true" />
<icon>VAADIN:GRID_BIG</icon>
<categories>
@@ -29,19 +29,19 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>9c2ca675-1a37-4ceb-ad49-279bddc1150b</name>
+ <name>44449f24-ed9d-4053-8202-db4b43032067</name>
<entityField>OVERALL_TURNOVER</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>23433d4d-94cb-4a25-99c1-88df451fcc34</name>
+ <name>3377fe1b-1f29-4c49-88c8-7a1b1ee6d0ce</name>
<entityField>OVERALL_FORECAST</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>da6c1a0b-723c-43d4-a168-1732ebe3bd34</name>
- <entityField>OPEN_SALEPROJECTS</entityField>
+ <name>2ba5a5e7-0ae6-4001-84a6-9444730d6611</name>
+ <entityField>OPEN_SALESPROJECTS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>c376674f-fe29-4527-a2b3-db67e1dca085</name>
+ <name>f98b6e67-7337-45ac-b9e6-9d36241ae828</name>
<entityField>SENT_OFFERS</entityField>
</entityFieldLink>
</fields>
--
GitLab
From d4d171c9d7caa746b46379a1a0eb76d6423d1361 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 10 Apr 2019 08:54:29 +0200
Subject: [PATCH 249/250] =?UTF-8?q?message=20im=20onDelete=20/=20update=20?=
=?UTF-8?q?wird=20nicht=20m=C3=B6glich=20sein?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../recordcontainers/jdito/onDelete.js | 2 +-
.../recordcontainers/jdito/onUpdate.js | 2 +-
neonContext/ObjectRelationType/ObjectRelationType.aod | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
index 78bb374858..0c99d246e9 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
@@ -18,6 +18,6 @@ if (usageCount <= 0)
}
else
{
- // TODO: server hängt bei question.showMessage
+ // TODO: Show message hier nicht möglich: mit Grant-Prozess ausführung komplett verhindern, wenn es diese gibt.
//question.showMessage(translate.withArguments("There are still %0 relations using the type %1.", [usageCount, translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.WARNING, translate.text("Cannot remove relation type"))
}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
index 4df0c2df9e..bca1f7d347 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
@@ -82,7 +82,7 @@ if (usageCount <= 0)
}
else
{
- // TODO: server hängt bei question.showMessage
+ // TODO: Show message hier nicht möglich: mit Grant-Prozess ausführung komplett verhindern, wenn es diese gibt.
//question.showMessage(translate.withArguments("There are still %0 relations using the type %1.", [usageCount, translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.WARNING, translate.text("Cannot remove relation type"))
}
diff --git a/neonContext/ObjectRelationType/ObjectRelationType.aod b/neonContext/ObjectRelationType/ObjectRelationType.aod
index 5e82a52756..2cfbf3567d 100644
--- a/neonContext/ObjectRelationType/ObjectRelationType.aod
+++ b/neonContext/ObjectRelationType/ObjectRelationType.aod
@@ -3,6 +3,7 @@
<name>ObjectRelationType</name>
<title>Relation type</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:SPLIT</icon>
<filterview>ObjectRelationTypeFilter_view</filterview>
<editview>ObjectRelationTypeEdit_view</editview>
<preview>ObjectRelationTypePreview_view</preview>
--
GitLab
From d1ca37651b60c25a6bfd444ec4089902cf4a6423 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 10 Apr 2019 10:46:57 +0200
Subject: [PATCH 250/250] ActivityTimeline: db-row-limit 500
---
neonView/ActivityFilter_view/ActivityFilter_view.aod | 12 ++++--------
.../ActivityTimeline_view/ActivityTimeline_view.aod | 2 ++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index e9f268d010..23705e8e11 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -55,15 +55,11 @@
</groupLayout>
</layout>
<children>
- <timelineViewTemplate>
- <name>ActivitiesTimeline</name>
- <dateField>ENTRYDATE</dateField>
- <titleField>SUBJECT_DETAILS</titleField>
- <descriptionField>INFO</descriptionField>
- <iconIdField>DIRECTION_ICON</iconIdField>
- <hideTime v="true" />
+ <neonViewReference>
+ <name>0e5e5791-af45-4f3f-a8fb-44656e1556c3</name>
<entityField>#ENTITY</entityField>
- </timelineViewTemplate>
+ <view>ActivityTimeline_view</view>
+ </neonViewReference>
<tableViewTemplate>
<name>ActivitiesTable</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
index 9056b55d31..843f80320f 100644
--- a/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
+++ b/neonView/ActivityTimeline_view/ActivityTimeline_view.aod
@@ -14,7 +14,9 @@
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>INFO</descriptionField>
<iconIdField>DIRECTION_ICON</iconIdField>
+ <hideTime v="true" />
<entityField>#ENTITY</entityField>
+ <maxDBRow v="500" />
</timelineViewTemplate>
</children>
</neonView>
--
GitLab