diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 3032d15a7f9cfa12ed50a252ae4551ceadb4e0da..19200a77d9fa5e23d745fab789b98709c7f8c658 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -23,6 +23,7 @@
<title>Type</title>
<consumer>KeywordAttributeType</consumer>
<mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
</entityField>
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b768fb2fba7336e45a6e5c99d6224d9e623d4e5b
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+{
+ 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
diff --git a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
index 1a5a7ef8aa7f0828ba0791f1ea8a2acd3e99f354..bdd0ea7449ed0bd35470a8ac8dffb388034951c6 100644
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
@@ -7,24 +7,8 @@ import("Attribute_lib");
var condition = "AB_ATTRIBUTE.ATTRIBUTE_TYPE = '" + $AttributeTypes.GROUP + "'";
if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
- condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
+ condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
else if (vars.get("$param.attrParentId_param") !== "")
condition = "";
result.string(condition);
-
-function getAllChildren (pAttributeId)
-{
- var childIds = [];
- var attributes= [pAttributeId];
- while (attributes.length > 0)
- {
- attributes = db.array(db.COLUMN, SqlCondition.begin()
- .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
- .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
- );
- if (attributes.length > 0)
- childIds = childIds.concat(attributes);
- }
- return childIds;
-}
diff --git a/entity/Attribute_entity/recordcontainers/db/onDBDelete.js b/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
index 504e2d5e4f82c9ccbdeb7b380f546003c3f5f9a8..7d1eb8b477436101b8cacb2fa7aa00241708adae 100644
--- a/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
@@ -1,11 +1,29 @@
import("system.vars");
import("system.db");
import("Sql_lib");
+import("Attribute_lib");
var attributeId = vars.get("$field.AB_ATTRIBUTEID");
-var usageCondition = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId)
+
+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", usageCondition);
\ No newline at end of file
+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/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 9e2338a3cef1e448c82e6b74c022c7a571a0977f..7b3e2ab6138984a1302898521d9b51806d25396d 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2348,7 +2348,6 @@
</entry>
<entry>
<key>Print Offer</key>
- <key>Touchpoint</key>
</entry>
<entry>
<key>Touchpoints</key>
@@ -2362,6 +2361,9 @@
<entry>
<key>Days inactive</key>
</entry>
+ <entry>
+ <key>Touchpoint</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 c31e4d2d49ec1633572bdd9d49602d6f827d7a78..8c68c088ff01651d9834eb2738ee6efaa5cb1852 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1063,6 +1063,10 @@
<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>
@@ -2644,6 +2648,7 @@
</entry>
<entry>
<key>Checkbox</key>
+ <value></value>
</entry>
<entry>
<key>Numeric value</key>
@@ -2665,6 +2670,7 @@
</entry>
<entry>
<key>${NUMBER}</key>
+ <value>Zahl</value>
</entry>
<entry>
<key>Name \&quot;%0\&quot; already used for container \&quot;%1\&quot;</key>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 7fdcc7c68792930a848c0b46a65caf996eb6a9b8..755d9c190519f25facadb77f0c98302f89293b33 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -5,8 +5,8 @@ import("system.db");
import("Sql_lib");
/**
- * Provides functions for the work with attributes, like setting or getting the value of an attribute
- * or listing the available attributes for a context.
+ * Provides functions for the work with attributes, like
+ * listing the available attributes for a context.
* Don't instanciate this!
*
* @class
@@ -91,14 +91,55 @@ AttributeUtil.getSimpleAttributeName = function (pAttributeId)
}
/**
- * gets the value of an attribute for one dataset (e. g. a person)
+ * returns the ids of all subordinated attributes of an attribute
+ *
+ * @param {String} pAttributeId the id of the attribute
+ *
+ * @result {String[]} array with the ids of every subordinated attribute
*/
-AttributeUtil.getAttribute = function (pAttributeId, pObjectType, pObjectRowId, pGetIdValue)
+AttributeUtil.getAllChildren = function (pAttributeId)
{
- //TODO: implement
+ var childIds = [];
+ var attributes= [pAttributeId];
+ while (attributes.length > 0)
+ {
+ attributes = db.array(db.COLUMN, SqlCondition.begin()
+ .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
+ .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
+ );
+ if (attributes.length > 0)
+ childIds = childIds.concat(attributes);
+ }
+ return childIds;
+}
+
+/*********************************************************************************************************************/
+
+/**
+ * Provides functions for the work with attributeRelations, getting the value of an attributeRelation for an object.
+ * Don't instanciate this!
+ *
+ * @class
+ */
+function AttributeRelationUtils () {}
+
+/**
+ * gets the value of an attributeRelation for one dataset (e. g. a person)
+ */
+AttributeRelationUtils.getAttribute = function (pAttributeId, pObjectRowId, pObjectType)
+{
+ var attrCond = SqlCondition().begin()
+ .andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", pAttributeId)
+ .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId);
+ if (pObjectType != null)
+ attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pAttributeId);
+
+ var attrSql = AttributeRelationUtils.getSqlUtil();
+ var attributeValues = db.array(db.ROW, attrCond.buildSql(attrSql.sqlSelect));
+ return attrSql.getFieldFromType(attributeValues);
}
-AttributeUtil.getAttributes = function ()
+AttributeRelationUtils.getAttributes = function ()
{
//TODO: implement maybe
}
@@ -106,11 +147,62 @@ AttributeUtil.getAttributes = function ()
/**
* sets the value of an attribute for one dataset (e. g. a person)
*/
-AttributeUtil.setAttribute = function ()
+AttributeRelationUtils.setAttribute = function ()
{
//TODO: implement
}
+/**
+ * Builds an object for the work with the values of attributeRelations. This should make
+ * the attribute type definition more flexible, the returned object has the following properties
+ * and methods:
+ *
+ * columns = array of all database columns in AB_ATTRIBUTERELATION that hold attribute values
+ * typeColMap = object with the attribute type as key and the index in the columns-array with the column holding
+ * the value for that attribute type as value
+ * sqlSelect = an sql-select string where the columns are the type of the attribute plus the value columns
+ * getFieldFromType = a method that takes a one-dimensional array that has been created with a query using the 'sqlSelect' property
+ * and returns the value at the right position of that array depending on the type. For example:
+ * //type, values
+ * vals = ["TEXT", "abcdef", "", "", "", ""];
+ * the method would return "abcdef", because it looks at the first position where the type is, e. g. "TEXT"
+ * and then it gets the value at, for example, index 1 because the typeColMap object says that the value for type "TEXT"
+ * is at position 1.
+ *
+ */
+AttributeRelationUtils.getSqlUtil = function ()
+{
+ var types = Object.keys($AttributeTypes);
+ var sqlMap = {
+ columns : [],
+ typeColMap : {}
+ };
+ types.forEach(function (type)
+ {
+ var typeKey = type.toString();
+ var colIndex = this.columns.indexOf(type.databaseField);
+ if (colIndex == -1)
+ {
+ colIndex = this.columns.length;
+ this.columns.push(type.databaseField);
+ }
+ this.typeColMap[typeKey] = colIndex;
+ }, sqlMap);
+
+ sqlMap.sqlSelect = "select ATTRIBUTE_TYPE, " + sqlMap.columns.join(", ") + " from AB_ATTRIBUTERELATION "
+ + " join AB_ATTRIBUTE on AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID ";
+
+ sqlMap.getFieldFromType = function (pTypeAndValues)
+ {
+ if (pTypeAndValues.length > 0)
+ return pTypeAndValues[this.typeColMap[pTypeAndValues[0]] + 1];
+ return null;
+ }
+
+ return sqlMap;
+}
+
+/*********************************************************************************************************************/
/**
* This is used in the AttributeRelation enitiy to make the work with attributes there
@@ -195,6 +287,7 @@ AttributeHandler.prototype.setAttributeValue = function (pValue)
* should be done in AttributeUtils.
* The values for each type are:
*
+ * keyword = the key of the corresponding keyword
* contentType = the value that is returned in the contentType process for the attribute
* databaseField = the database field that holds values of attributes with the type
* entityField = the field in the AttributeRelation enity that holds the value of the attribute for that type
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 9ab33e49c0e8d669b344c37a0ec76ff19e7aa30a..716a56fb2ae06122dde7cf8903132805185f100f 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -312,6 +312,14 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
}
};
CopyModuleUtils.copyModule(InputMapping);
+
+ var oiUtils = new OfferItemUtils(pTargetOfferId);
+
+ //update order price
+ cols = ["NET", "VAT"];
+ var vals = oiUtils.getNetAndVat();
+
+ db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", pTargetOfferId, "1 = 2"));
}
/**
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 0c927b0ed370eb84461c5b0d40ee5c5b69f1a08e..818de7d7027bb5c0994fe4ae5743764e5a69c31f 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -82,62 +82,36 @@ OrderUtils.createNewOrder = function(pSalesprojectId, pRelationId)
*
* @param {String} pOfferId the offer to get the items from
* @param {String} pOrderId the order to create the items for
- *
- * @return {Number[]} Array with the ids of the inserted orderItems
*/
OrderUtils.copyOfferItemsToOrder = function (pOfferId, pOrderId)
{
- var cols = [
- "UNIT",
- "QUANTITY",
- "GROUPCODEID",
- "ASSIGNEDTO",
- "PRICE",
- "ITEMSORT",
- "PRODUCT_ID",
- "VAT",
- "ITEMNAME",
- "OPTIONAL",
- "DISCOUNT",
- "ITEMPOSITION",
- "INFO"
- ];
- var offerItemSql = SqlCondition.begin()
- .andPrepare("OFFERITEM.OFFER_ID", pOfferId)
- .buildSql("select " + cols.concat(["OFFERITEMID"]).join(", ") + " from OFFERITEM", "1=0");
- var offerItems = db.table(offerItemSql);
-
- var table = "SALESORDERITEM";
- cols = cols.concat(["SALESORDERITEMID", "SALESORDER_ID"]);
- var types = db.getColumnTypes(table, cols);
-
- //the rows need new UIDs, but because items can be related over ASSIGNEDTO, ASSIGNEDTO must also be
- //changed to the newly generated id of the parent item, so the "oldId : newId" pairs have to be stored
- //to set ASSIGNEDTO correctly
- var idMap = {};
-
- var toInsert = [];
- while (offerItems.length > 0)
- for (let i = 0; i < offerItems.length; i++)
- {
- var row = offerItems[i];
-
- //checks if the parent attribute has already been put into the insert-array,
- //otherwise the foreign-key ASSIGNEDTO could have the id of a row that hasn't been inserted yet
- // -> toInsert needs to be in the correct order
- if (row[3] == "" || row[3] in idMap)
- {
- row[3] = idMap[row[3]] || "";
- var newId = util.getNewUUID();
- idMap[row[13]] = newId;
- row[13] = newId; //replace the UID
- toInsert.push([table, cols, types, row.concat([pOrderId])]);
- offerItems.splice(i, 1); //remove the row from offerItems
- i--;
+ var InputMapping = {
+ "OFFERITEM": {
+ destinationModuleName : "SALESORDERITEM",
+ DestinationColumnMapping : {
+ "OFFERITEMID" : "SALESORDERITEMID",
+ "ITEMPOSITION" : "ITEMPOSITION",
+ "GROUPCODEID" : "GROUPCODEID",
+ "OFFER_ID" : "SALESORDER_ID",
+ "ASSIGNEDTO" : "ASSIGNEDTO",
+ "PRODUCT_ID" : "PRODUCT_ID",
+ "QUANTITY" : "QUANTITY",
+ "ITEMSORT" : "ITEMSORT",
+ "ITEMNAME" : "ITEMNAME",
+ "OPTIONAL" : "OPTIONAL",
+ "DISCOUNT" : "DISCOUNT",
+ "PRICE" : "PRICE",
+ "UNIT" : "UNIT",
+ "INFO" : "INFO",
+ "VAT" : "VAT"
+ },
+ condition: "OFFER_ID = '" + pOfferId + "' order by ITEMSORT",
+ ValueMapping: {
+ "OFFER_ID" : pOrderId
}
}
-
- db.inserts(toInsert);
+ };
+ CopyModuleUtils.copyModule(InputMapping);
var oiUtils = new OrderItemUtils(pOrderId);
@@ -146,11 +120,6 @@ OrderUtils.copyOfferItemsToOrder = function (pOfferId, pOrderId)
var vals = oiUtils.getNetAndVat();
db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", pOrderId, "1 = 2"));
-
- return Object.keys(idMap).map(function (id)
- {
- return idMap[id];
- });
}