Skip to content
Snippets Groups Projects
Commit d095efeb authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

revert to old Product logic

parent 7ea0c38c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 146 additions and 71 deletions
entity/Prod2prod_entity/Prod2prod_entity.aod
+ 2
− 2
View file @ d095efeb
......@@ -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>
......
entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+ 1
− 0
View file @ d095efeb
import("system.logging");
import("system.neon");
import("system.result");
import("system.vars");
......
neonContext/Prod2prod/Prod2prod.aod
+ 4
− 0
View file @ d095efeb
......@@ -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>
neonView/Prod2prodTable_view/Prod2prodTable_view.aod 0 → 100644
+ 38
− 0
View file @ d095efeb
<?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>
neonView/ProductMain_view/ProductMain_view.aod
+ 5
− 0
View file @ d095efeb
......@@ -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>
......
process/OfferOrder_lib/process.js
+ 2
− 3
View file @ d095efeb
......@@ -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)
......
process/Product_lib/process.js
+ 94
− 66
View file @ d095efeb
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment