Skip to content
Snippets Groups Projects
Commit 3a772669 authored by Maximilian Hofmann's avatar Maximilian Hofmann Committed by Johannes Hörmann
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1034406][Klärung und Refactoring -... 

[Projekt: Entwicklung - Neon][TicketNr.: 1034406][Klärung und Refactoring - Wie sind die Codingguidlines für View-Templates?]
parent dbd3e9df
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 176 additions and 130 deletions
entity/Task_entity/entityfields/keywordpriority/children/containername_param/valueProcess.js → .merge_file_a07900
+ 1
− 1
View file @ 3a772669
......@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
result.string($KeywordRegistry.addressType());
\ No newline at end of file
aliasDefinition/Data_alias/Data_alias.aod
+ 104
− 56
View file @ 3a772669
......@@ -90,48 +90,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>STRENGTH</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>WEAKNESS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PRICE_POLITICS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ORGANISATIONID</name>
<dbName></dbName>
......@@ -3820,11 +3778,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT2_TYPE</name>
<name>OBJECT1_ROWID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="63" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
......@@ -3834,27 +3792,27 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT1_TYPE</name>
<name>AB_OBJECTRELATIONID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT1_ROWID</name>
<name>AB_OBJECTRELATIONTYPE1</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -3862,14 +3820,14 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>AB_OBJECTRELATIONID</name>
<name>AB_OBJECTRELATIONTYPE2</name>
<dbName></dbName>
<primaryKey v="true" />
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
......@@ -4880,6 +4838,96 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>AB_OBJECTRELATIONTYPE</name>
<dbName></dbName>
<idColumn>AB_OBJECTRELATIONTYPEID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
<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>AB_OBJECTRELATIONTYPEID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>SIDE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_TITLE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="80" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 3
− 3
View file @ 3a772669
......@@ -15,7 +15,7 @@
<entityField>
<name>OBJECT_TYPE</name>
<title>Object type</title>
<consumer>Contexts</consumer>
<consumer>Context</consumer>
<linkedContext>Context</linkedContext>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
......@@ -31,7 +31,7 @@
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>Link</name>
<name>Links</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>OBJECT_TYPE</targetContextField>
<targetIdField>OBJECT_ROWID</targetIdField>
......@@ -68,7 +68,7 @@
</children>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
<name>Context</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......
entity/Activity_entity/Activity_entity.aod
+ 21
− 15
View file @ 3a772669
......@@ -37,7 +37,7 @@
<entityField>
<name>CATEGORY</name>
<title>Category</title>
<consumer>KeywordCategory</consumer>
<consumer>KeywordCategories</consumer>
<mandatory v="false" />
<groupable v="true" />
</entityField>
......@@ -159,7 +159,7 @@
<dependency>
<name>dependency</name>
<entityName>ActivityLink_entity</entityName>
<fieldName>Link</fieldName>
<fieldName>Links</fieldName>
</dependency>
<children>
<entityParameter>
......@@ -179,8 +179,9 @@
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
......@@ -268,16 +269,20 @@
<dependency>
<name>dependency</name>
<entityName>ModuleTree_entity</entityName>
<fieldName>TreeProvider</fieldName>
<fieldName>TreeProviders</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContextName</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js</valueProcess>
<name>ContextName_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
<expose v="false" />
<mandatory v="false" />
</entityParameter>
<entityParameter>
<name>ID</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id/valueProcess.js</valueProcess>
<name>ID_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
<expose v="false" />
<mandatory v="false" />
</entityParameter>
</children>
</entityConsumer>
......@@ -321,7 +326,7 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_context/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>KeywordCategory</name>
<name>KeywordCategories</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -330,8 +335,9 @@
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js</valueProcess>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keywordcategories/children/containername_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</children>
</entityConsumer>
......@@ -352,12 +358,12 @@
</dependency>
<children>
<entityParameter>
<name>objectRowId_param</name>
<triggerRecalculation v="true" />
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>objectType_param</name>
<triggerRecalculation v="true" />
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
......
entity/Activity_entity/afterOperatingState.js
+ 14
− 14
View file @ 3a772669
import("system.util");
import("system.db");
import("system.neon");
import("system.vars");
import("Context_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
&& vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
&& vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
{
neon.addRecord(null, "Links", {
"OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
"OBJECT_ROWID" : vars.get("$param.RowId_param")
});
import("system.util");
import("system.db");
import("system.neon");
import("system.vars");
import("Context_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
&& vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
&& vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
{
neon.addRecord(null, "Links", {
"OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
"OBJECT_ROWID" : vars.get("$param.RowId_param")
});
}
\ No newline at end of file
entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 3a772669
import("system.result");
import("Context_lib");
result.string(ContextUtils.getCurrentContextId());
entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js → entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js
+ 1
− 1
View file @ 3a772669
import("system.vars");
import("system.result");
result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
entity/Activity_entity/entityfields/newactivity/tooltipProcess.js
+ 3
− 3
View file @ 3a772669
import("system.translate");
import("system.result");
import("system.translate");
import("system.result");
result.string(translate.text("New activity"));
\ No newline at end of file
entity/Activity_entity/entityfields/subject/onValueChange.js
+ 14
− 14
View file @ 3a772669
import("system.util");
import("system.db");
import("system.neon");
import("system.vars");
import("Context_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
&& vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
&& vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
{
neon.addRecord(null, "Links", {
"OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
"OBJECT_ROWID" : vars.get("$param.RowId_param")
});
import("system.util");
import("system.db");
import("system.neon");
import("system.vars");
import("Context_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
&& vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
&& vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
{
neon.addRecord(null, "Links", {
"OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
"OBJECT_ROWID" : vars.get("$param.RowId_param")
});
}
\ No newline at end of file
entity/AddressType_entity/AddressType_entity.aod
+ 3
− 4
View file @ 3a772669
......@@ -25,20 +25,19 @@
<entityDependency>
<name>b6ddc934-51ac-43a5-8aa9-7239423ea14d</name>
<entityName>Address_entity</entityName>
<fieldName>KeywordAddressType</fieldName>
<fieldName>KeywordAddressTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>usageFilter_param</name>
<expose v="true" />
<name>UsageFilter_param</name>
<mandatory v="true" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
<name>usageFilter_param</name>
<name>UsageFilter_param</name>
<title></title>
<expose v="true" />
<description>PARAMETER</description>
......
entity/Address_entity/Address_entity.aod
+ 4
− 5
View file @ 3a772669
......@@ -26,7 +26,7 @@
<name>ADDR_TYPE</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
<title>Addresstype</title>
<consumer>KeywordAddressType</consumer>
<consumer>KeywordAddressTypes</consumer>
</entityField>
<entityField>
<name>BUILDINGNO</name>
......@@ -106,7 +106,6 @@
<entityProvider>
<name>ContactAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
......@@ -161,7 +160,7 @@
<entityParameter>
<name>ContactType_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js</valueProcess>
<expose v="true" />
<expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
......@@ -187,7 +186,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>KeywordAddressType</name>
<name>KeywordAddressTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -196,7 +195,7 @@
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
......
entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js
+ 1
− 3
View file @ 3a772669
import("system.result");
import("Contact_lib");
result.object(Contact.TYPES.Contact);
\ No newline at end of file
result.object(2);
\ No newline at end of file
entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js deleted 100644 → 0
+ 0
− 4
View file @ dbd3e9df
import("system.result");
import("Contact_lib");
result.object(Contact.TYPES.Organisation);
\ No newline at end of file
entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js deleted 100644 → 0
+ 0
− 4
View file @ dbd3e9df
import("system.result");
import("Contact_lib");
result.object(Contact.TYPES.Organisation);
\ No newline at end of file
entity/AnyContact_entity/AnyContact_entity.aod
+ 3
− 3
View file @ 3a772669
......@@ -73,17 +73,17 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/ContactId_param/valueProcess.js</valueProcess>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Organisation</name>
<name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
<fieldName>Organisation</fieldName>
<fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
......
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