Skip to content
Snippets Groups Projects
Commit d2b4e4ad authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'Produktmanagement' 

# Conflicts:
#	aliasDefinition/Data_alias/Data_alias.aod
#	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
#	entity/Org_entity/Org_entity.aod
#	others/db_changes/masterChangelog.xml
#	process/Keyword_lib/process.js
parents 89265954 7ed01ef7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 602 additions and 0 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 201
− 0
View file @ d2b4e4ad
......@@ -1377,6 +1377,207 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>PRODUCT</name>
<dbName></dbName>
<idColumn>PRODUCTID</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>ORG_ID</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>UNIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</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>ADVERTISING</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="1" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCTID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCTNAME</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCTCODE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<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" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>MINSTOCK</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>GROUPCODEID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<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" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>STANDARD</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
entity/Org_entity/Org_entity.aod
+ 21
− 0
View file @ d2b4e4ad
......@@ -196,6 +196,12 @@
<fieldName>ContractOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
<entityDependency>
<name>25e5cc50-0443-4e79-8690-a47197706936</name>
<entityName>Product_entity</entityName>
<fieldName>ProductOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityOutgoingField>
......@@ -260,6 +266,21 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityOutgoingField>
<name>OrgProduct_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Product_entity</entityName>
<fieldName>OrgProduct_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>OrgId_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/orgproduct_dfo/children/orgid_param/code.js</code>
</entityParameter>
</children>
</entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
......
entity/Org_entity/entityfields/orgproduct_dfo/children/orgid_param/code.js 0 → 100644
+ 4
− 0
View file @ d2b4e4ad
import("system.result");
import("system.vars");
result.string(vars.get("$field.ORGID"));
\ No newline at end of file
entity/Product_entity/Product_entity.aod 0 → 100644
+ 161
− 0
View file @ d2b4e4ad
<?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.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
<name>Product_entity</name>
<title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<recordContainerType>DB</recordContainerType>
<caption>Product</caption>
<entityFields>
<entityField>
<name>ADVERTISING</name>
<tableName>PRODUCT</tableName>
<columnName>ADVERTISING</columnName>
<caption>Werbemittel</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<tableName>PRODUCT</tableName>
<columnName>DATE_EDIT</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<tableName>PRODUCT</tableName>
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>GROUPCODEID</name>
<tableName>PRODUCT</tableName>
<columnName>GROUPCODEID</columnName>
<caption>Produktgruppe</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/groupcodeid/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>MINSTOCK</name>
<tableName>PRODUCT</tableName>
<columnName>MINSTOCK</columnName>
<caption>Min.-Bestand</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.##</outputFormat>
</entityField>
<entityField>
<name>ORG_ID</name>
<tableName>PRODUCT</tableName>
<columnName>ORG_ID</columnName>
<caption>Hersteller</caption>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/org_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PRODUCTCODE</name>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTCODE</columnName>
<caption>Produkt-Nr.</caption>
<mandatory v="true" />
<onValidation>%aditoprj%/entity/Product_entity/entityfields/productcode/onValidation.js</onValidation>
</entityField>
<entityField>
<name>PRODUCTID</name>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTID</columnName>
</entityField>
<entityField>
<name>PRODUCTNAME</name>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTNAME</columnName>
<caption>Produktname</caption>
<mandatory v="true" />
</entityField>
<entityField>
<name>STANDARD</name>
<tableName>PRODUCT</tableName>
<columnName>STANDARD</columnName>
</entityField>
<entityField>
<name>STATUS</name>
<tableName>PRODUCT</tableName>
<columnName>STATUS</columnName>
<caption>Aktiv</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/status/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>UNIT</name>
<tableName>PRODUCT</tableName>
<columnName>UNIT</columnName>
<caption>Einheit</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<tableName>PRODUCT</tableName>
<columnName>USER_EDIT</columnName>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<tableName>PRODUCT</tableName>
<columnName>USER_NEW</columnName>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityOutgoingField>
<name>ProductOrg_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
<fieldName>Org_dfi</fieldName>
</dependency>
</entityOutgoingField>
<entityIncomingField>
<name>OrgProduct_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>49cbec11-7d2e-4898-b63f-2e36aac9181e</name>
<entityName>Org_entity</entityName>
<fieldName>OrgProduct_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityField>
<name>STOCKCOUNT</name>
<caption>Lagerbestand</caption>
</entityField>
<entityParameter>
<name>OrgId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>currentPurchasePrice</name>
<caption>akt. EK-Preis</caption>
</entityField>
<entityField>
<name>currentSalesPrice</name>
<caption>akt. VK-Preis</caption>
</entityField>
</entityFields>
<linkInformation>
<linkInformation>
<name>43c30a2b-7b59-46a2-9d8f-57ce4cde5d36</name>
<tableName>PRODUCT</tableName>
<primaryKey>PRODUCTID</primaryKey>
<isUIDTable v="true" />
</linkInformation>
</linkInformation>
</entity>
entity/Product_entity/entityfields/advertising/possibleItemsProcess.js 0 → 100644
+ 7
− 0
View file @ d2b4e4ad
import("system.translate");
import("system.result");
result.object([
["Y", translate.text("Ja")]
,["N", translate.text("Nein")]
]);
\ No newline at end of file
entity/Product_entity/entityfields/advertising/valueProcess.js 0 → 100644
+ 6
− 0
View file @ d2b4e4ad
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string("N");
\ No newline at end of file
entity/Product_entity/entityfields/date_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ d2b4e4ad
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
entity/Product_entity/entityfields/date_new/valueProcess.js 0 → 100644
+ 8
− 0
View file @ d2b4e4ad
import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
entity/Product_entity/entityfields/groupcodeid/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ d2b4e4ad
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("GROUPCODE");
result.object(items);
\ No newline at end of file
entity/Product_entity/entityfields/org_id/valueProcess.js 0 → 100644
+ 12
− 0
View file @ d2b4e4ad
import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
if(vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param") != null)
result.string(vars.getString("$param.OrgId_param"));
}
else
result.string(vars.get("$this.value"));
entity/Product_entity/entityfields/productcode/onValidation.js 0 → 100644
+ 12
− 0
View file @ d2b4e4ad
import("system.db");
import("system.vars");
import("system.swing");
import("system.result");
import("system.translate");
//Productcode has to be unique
if(db.cell("select count(PRODUCTID) from PRODUCT where PRODUCTCODE = '" + vars.get("$local.value")
+ "' and PRODUCTID != '" + vars.get("$field.PRODUCTID") + "'") != 0)
{
result.string( translate.text("Die Produktnummer exisitiert bereits!") );
}
\ No newline at end of file
entity/Product_entity/entityfields/status/possibleItemsProcess.js 0 → 100644
+ 7
− 0
View file @ d2b4e4ad
import("system.translate");
import("system.result");
result.object([
["1", translate.text("Ja")]
,["2", translate.text("Nein")]
]);
\ No newline at end of file
entity/Product_entity/entityfields/status/valueProcess.js 0 → 100644
+ 6
− 0
View file @ d2b4e4ad
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string("1");
\ No newline at end of file
entity/Product_entity/entityfields/unit/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ d2b4e4ad
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("UNIT");
result.object(items);
\ No newline at end of file
entity/Product_entity/entityfields/user_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ d2b4e4ad
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
entity/Product_entity/entityfields/user_new/valueProcess.js 0 → 100644
+ 6
− 0
View file @ d2b4e4ad
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
neonContext/Product_context/Product_context.aod 0 → 100644
+ 29
− 0
View file @ d2b4e4ad
<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
<name>Product_context</name>
<title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<mainview>ProductMain_view</mainview>
<filterview>ProductFilter_view</filterview>
<editview>ProductEdit_view</editview>
<preview>ProductPreview_view</preview>
<entity>Product_entity</entity>
<references>
<neonViewReference>
<name>8a0bd726-b3f6-4c5a-bd2a-251285b9ad90</name>
<view>ProductMain_view</view>
</neonViewReference>
<neonViewReference>
<name>ecb98950-5460-44ab-8da8-757bd143c03e</name>
<view>ProductEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>cc985c0d-755f-46bd-89a2-71c5c6227198</name>
<view>ProductFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
<view>ProductPreview_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/ProductEdit_view/ProductEdit_view.aod 0 → 100644
+ 51
− 0
View file @ d2b4e4ad
<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>ProductEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>ProductEdit_generic</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>d5cfa031-1bce-43b3-b1c1-d79a4c1205dc</name>
<entityField>ADVERTISING</entityField>
</entityFieldLink>
<entityFieldLink>
<name>950b57a7-df15-42a3-9f94-3377ed757ba3</name>
<entityField>GROUPCODEID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
<entityField>MINSTOCK</entityField>
</entityFieldLink>
<entityFieldLink>
<name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
<entityField>ORG_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
<entityField>PRODUCTCODE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>0019c5bd-368f-457a-b6e3-dd1d12cbe19e</name>
<entityField>PRODUCTNAME</entityField>
</entityFieldLink>
<entityFieldLink>
<name>49b07dd2-1ee1-4b80-88a7-daf4879848d2</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>a068f12a-ed45-4997-9e94-c865ccffee2a</name>
<entityField>UNIT</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/ProductFilter_view/ProductFilter_view.aod 0 → 100644
+ 38
− 0
View file @ d2b4e4ad
<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>ProductFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<tableViewTemplate>
<name>Table_template</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>346eab87-8fea-4828-8ea6-86af61f973ce</name>
<entityField>GROUPCODEID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ee627d12-c60c-48c2-a86e-2a144f5853e6</name>
<entityField>PRODUCTCODE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>cd013f0c-b9b0-4c5a-866b-53a9f69ad75e</name>
<entityField>PRODUCTNAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>4d23de03-5729-4568-a65d-3f0bdb67f66e</name>
<entityField>UNIT</entityField>
</neonTableColumn>
<neonTableColumn>
<name>3e774e1c-0998-4b2c-b876-22e99a79cb55</name>
<entityField>ORG_ID</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
</neonView>
neonView/ProductMain_view/ProductMain_view.aod 0 → 100644
+ 5
− 0
View file @ d2b4e4ad
<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>ProductMain_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
</neonView>
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