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

fixes, documentation

parent 64f29bd2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 51 deletions
entity/Comm_entity/Comm_entity.aod
+ 0
− 1
View file @ 1f25db88
......@@ -150,7 +150,6 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
<description></description>
</entityParameter>
<entityParameter>
<name>CommMediumIds_param</name>
......
entity/Org_entity/Org_entity.aod
+ 6
− 6
View file @ 1f25db88
......@@ -175,12 +175,6 @@
<fieldName>PersOrg_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>
<entityDependency>
<name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
<entityName>Salesproject_entity</entityName>
......@@ -193,6 +187,12 @@
<fieldName>RelationOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
<entityDependency>
<name>8bc24adb-78f1-49bb-a41d-79fb29175b27</name>
<entityName>Product_entity</entityName>
<fieldName>ProductOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityOutgoingField>
......
entity/Pers_entity/Pers_entity.aod
+ 1
− 1
View file @ 1f25db88
......@@ -211,7 +211,7 @@
</children>
</entityOutgoingField>
<entityOutgoingField>
<name>PersComm_dfo</name>
<name>PersComm_dfod</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
......
entity/Product_entity/Product_entity.aod
+ 7
− 26
View file @ 1f25db88
......@@ -241,28 +241,13 @@
<name>RELATION_ID</name>
<title>Developer</title>
<linkedContextProcess>%aditoprj%/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<outgoingField>ProductRelation_dfo</outgoingField>
<outgoingField>ProductOrg_dfo</outgoingField>
<displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>RELATION_ORG_ID</name>
</entityField>
<entityField>
<name>RELATION_PERS_ID</name>
</entityField>
<entityOutgoingField>
<name>ProductRelation_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Relation_entity</entityName>
<fieldName>ProductRelation_dfi</fieldName>
</dependency>
</entityOutgoingField>
<entityField>
<name>INFO</name>
<title>Description</title>
......@@ -319,6 +304,9 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityField>
<name>ORG_NAME</name>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -330,33 +318,26 @@
<onDBDelete>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>eeb4101a-56ed-4af7-815f-ad29aa8c2099</name>
<name>ce4af12f-66c7-43d2-aefe-512260f3b24b</name>
<tableName>PRODUCT</tableName>
<primaryKey>PRODUCTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
<name>03a18aff-d666-4752-bec3-1b160ff9aaa8</name>
<name>774f098d-8c86-4f0a-8eab-de79a43b8609</name>
<tableName>RELATION</tableName>
<primaryKey>RELATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
<name>6b5a5d3e-bab9-4afc-945c-d905aed59997</name>
<name>2120f83c-6e14-4683-a5ad-9d0c88970d57</name>
<tableName>ORG</tableName>
<primaryKey>ORGID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
<name>903d626f-a61c-439f-a026-04b38e845d2f</name>
<tableName>PERS</tableName>
<primaryKey>PERSID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
......
entity/Product_entity/entityfields/relation_id/displayValueProcess.js
+ 1
− 1
View file @ 1f25db88
......@@ -3,4 +3,4 @@ import("system.vars");
import("Relation_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
result.string(vars.getString("$field.ORG_NAME"));
\ No newline at end of file
entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
+ 1
− 1
View file @ 1f25db88
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Relation_lib");
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
result.string("Org_context");
\ No newline at end of file
entity/Product_entity/recordcontainers/db/fromClauseProcess.js
+ 1
− 1
View file @ 1f25db88
import("system.result");
result.string("PRODUCT left join RELATION on RELATION.RELATIONID = PRODUCT.RELATION_ID \n\
left join ORG on ORG.ORGID = RELATION.ORG_ID left join PERS on PERS.PERSID = RELATION.PERS_ID");
\ No newline at end of file
left join ORG on ORG.ORGID = RELATION.ORG_ID");
\ No newline at end of file
entity/Relation_entity/Relation_entity.aod
+ 0
− 13
View file @ 1f25db88
......@@ -90,19 +90,6 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
</entityParameter>
</children>
</entityOutgoingField>
<entityIncomingField>
<name>ProductRelation_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>2537ae2b-ee99-41bd-9cd5-ec482cb20a56</name>
<entityName>Product_entity</entityName>
<fieldName>ProductRelation_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityField>
<name>ORG_NAME</name>
<title>Organisation name</title>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 1
− 0
View file @ 1f25db88
......@@ -1693,6 +1693,7 @@
</entry>
<entry>
<key>Note</key>
<value>Notiz</value>
</entry>
<entry>
<key>Senden per E-Mail</key>
......
neonContext/Prod2prod_context/Prod2prod_context.aod
+ 1
− 0
View file @ 1f25db88
......@@ -2,6 +2,7 @@
<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>Prod2prod_context</name>
<title></title>
<comment>Prod2Prod is mainly used for the parts list of products</comment>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>Prod2prodFilter_view</filterview>
<preview>Prod2prodPreview_view</preview>
......
neonView/OfferPreview_view/OfferPreview_view.aod
+ 4
− 0
View file @ 1f25db88
......@@ -34,6 +34,10 @@
<name>49e446b5-015e-45ad-9417-c5c50f9756f1</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce062531-603e-4c33-8a6b-935d2f07f516</name>
<entityField>ChosenAddress</entityField>
</entityFieldLink>
<entityFieldLink>
<name>447f5c6e-3653-49dd-ba8b-18c21a9bd6f9</name>
<entityField>ADDRESS</entityField>
......
neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+ 4
− 1
View file @ 1f25db88
......@@ -12,7 +12,6 @@
<name>OfferitemPreview_header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
<descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
......@@ -20,6 +19,10 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>3b207cf2-c621-4e7d-b7aa-32feace5fe04</name>
<entityField>INFO</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9868560c-41c7-4641-b0f1-627a61b796b3</name>
<entityField>TotalPrice</entityField>
......
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