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

refactor Contract entity

parent 36e91321
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 38 deletions
entity/Activity_entity/Activity_entity.aod
+ 1
− 1
View file @ a8665488
......@@ -243,7 +243,7 @@
<entityDependency>
<name>549af7f6-3828-4c15-8357-72f0c6fc4f0c</name>
<entityName>Contract_entity</entityName>
<fieldName>ContractActivity_dfo</fieldName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
......
entity/Contract_entity/Contract_entity.aod
+ 19
− 26
View file @ a8665488
......@@ -80,7 +80,7 @@
<name>RELATION_ID</name>
<documentation>%aditoprj%/entity/Contract_entity/entityfields/relation_id/documentation.adoc</documentation>
<title>Connection</title>
<consumer>ContractRelation_dfo</consumer>
<consumer>Relations</consumer>
<linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
......@@ -101,26 +101,19 @@
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>PersContract_dfi</name>
<name>Contracts</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>2146b082-6377-4b34-be6b-3dad18885614</name>
<entityName>Contact_entity</entityName>
<name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
<entityName>Organisation_entity</entityName>
<fieldName>Contracts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityProvider>
<name>OrgContract_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
<entityName>Organisation_entity</entityName>
<name>3698fe59-fd02-427b-8c95-a90c7d8036e5</name>
<entityName>Contact_entity</entityName>
<fieldName>Contracts</fieldName>
<isConsumer v="false" />
</entityDependency>
......@@ -129,6 +122,7 @@
<entityParameter>
<name>RelId_param</name>
<expose v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
......@@ -147,7 +141,7 @@
</fields>
</entityFieldGroup>
<entityConsumer>
<name>ContractActivity_dfo</name>
<name>Activities</name>
<title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
......@@ -158,12 +152,12 @@
<children>
<entityParameter>
<name>RowId_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractactivity_dfo/children/rowid_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ContractRelation_dfo</name>
<name>Relations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -181,7 +175,7 @@
<name>RELATION_PERS_ID</name>
</entityField>
<entityConsumer>
<name>ContractDocument_dfo</name>
<name>Documents</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
......@@ -192,23 +186,23 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractdocument_dfo/children/assignmentname_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentname_param/code.js</code>
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractdocument_dfo/children/assignmentrowid_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractdocument_dfo/children/assignmenttable_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
<triggerRecalculation v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ContractMainDocuments_dfo</name>
<name>MainDocuments</name>
<title>Maindocuments</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
......@@ -219,19 +213,19 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractmaindocuments_dfo/children/assignmentname_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractmaindocuments_dfo/children/assignmentrowid_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractmaindocuments_dfo/children/assignmenttable_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
<entityParameter>
<name>Keyword_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractmaindocuments_dfo/children/keyword_param/code.js</code>
<code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/keyword_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
......@@ -354,4 +348,3 @@
</dbRecordContainer>
</recordContainers>
</entity>
entity/Contract_entity/recordcontainers/db/conditionProcess.js
+ 6
− 5
View file @ a8665488
import("system.db");
import("system.result");
import("system.vars");
import("Sql_lib");
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null && vars.get("$param.RelId_param") != "")
result.string("CONTRACT.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
else
result.string("1 = 1");
\ No newline at end of file
var cond = SqlCondition.begin().andPrepareVars("CONTRACT.RELATION_ID", "$param.RelId_param");
//TODO: use a preparedCondition when available
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
entity/Document_entity/Document_entity.aod
+ 2
− 2
View file @ a8665488
......@@ -127,7 +127,7 @@
<entityDependency>
<name>383095e7-a75f-4d20-96c4-413e79a9020a</name>
<entityName>Contract_entity</entityName>
<fieldName>ContractDocument_dfo</fieldName>
<fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
......@@ -144,7 +144,7 @@
<entityDependency>
<name>1e35c51a-8527-4cf0-be94-654363390cd8</name>
<entityName>Contract_entity</entityName>
<fieldName>ContractMainDocuments_dfo</fieldName>
<fieldName>MainDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
......
entity/Organisation_entity/Organisation_entity.aod
+ 1
− 1
View file @ a8665488
......@@ -253,7 +253,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<dependency>
<name>dependency</name>
<entityName>Contract_entity</entityName>
<fieldName>OrgContract_dfi</fieldName>
<fieldName>Contracts</fieldName>
</dependency>
<children>
<entityParameter>
......
neonView/ContractMain_view/ContractMain_view.aod
+ 2
− 2
View file @ a8665488
......@@ -16,12 +16,12 @@
</neonViewReference>
<neonViewReference>
<name>8c6be607-ccce-4ad7-8dba-875b24d821e7</name>
<entityField>ContractActivity_dfo</entityField>
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>1bf6faf5-9a22-4900-a497-54b6c225584b</name>
<entityField>ContractDocument_dfo</entityField>
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
......
neonView/ContractPreview_view/ContractPreview_view.aod
+ 1
− 1
View file @ a8665488
......@@ -48,7 +48,7 @@
</genericViewTemplate>
<neonViewReference>
<name>90de7332-5d4c-4d72-a93a-1bd2c06d12a4</name>
<entityField>ContractMainDocuments_dfo</entityField>
<entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>
......
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