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

Merge origin/master 

Conflicts:
	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents a4892097 b0d1ce53
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 117 deletions
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+ 0
− 8
View file @ 4f693ec9
......@@ -25,14 +25,6 @@
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
<node name="PREFERENCES" kind="123" title="Administration">
<icon>VAADIN:WRENCH</icon>
<node name="Group3" kind="123" title="">
<node name="Options_Context" kind="10077" />
<node name="Countries_Context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
</entityNode>
<company>
<name>company</name>
......
entity/Comm_entity/entityfields/commid/valueProcess.js
+ 8
− 2
View file @ 4f693ec9
import("system.vars");
vars.get("$param.RelId_param")
\ No newline at end of file
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(util.getNewUUID());
\ No newline at end of file
entity/Contract_entity/Contract_entity.aod
+ 0
− 9
View file @ 4f693ec9
......@@ -234,15 +234,6 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityField>
<name>ORG_NAME</name>
</entityField>
<entityField>
<name>PERS_FIRSTNAME</name>
</entityField>
<entityField>
<name>PERS_LASTNAME</name>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
+ 2
− 5
View file @ 4f693ec9
import("system.result");
import("system.vars");
import("Relation_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrg("$field.RELATION_PERS_ID",
"$field.RELATION_ORG_ID",
"$field.PERS_FIRSTNAME",
"$field.PERS_LASTNAME",
"$field.ORG_NAME"));
\ No newline at end of file
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
+ 2
− 2
View file @ 4f693ec9
import("system.vars");
import("system.result");
import("Relation_lib");
result.string(RelationUtils.getContextByPersOrg("$field.RELATION_PERS_ID",
"$field.RELATION_ORG_ID"));
\ No newline at end of file
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
entity/Offer_entity/Offer_entity.aod
+ 12
− 21
View file @ 4f693ec9
......@@ -72,10 +72,13 @@
<entityField>
<name>SALESPROJECT_ID</name>
<title>Salesproject</title>
<linkedContext>Salesproject_context</linkedContext>
<mandatory v="true" />
<outgoingField>OfferSalesproject_dfo</outgoingField>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>STATUS</name>
......@@ -316,15 +319,15 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityField>
<name>PERS_FIRSTNAME</name>
</entityField>
<entityField>
<name>PERS_LASTNAME</name>
</entityField>
<entityField>
<name>ORG_NAME</name>
</entityField>
<entityOutgoingField>
<name>OfferSalesproject_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
<fieldName>#INCOMING</fieldName>
</dependency>
</entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -445,18 +448,6 @@
<name>RELATION_PERS_ID.value</name>
<recordfield>RELATION.PERS_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<recordfield>ORG.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERS_FIRSTNAME.value</name>
<recordfield>PERS.FIRSTNAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERS_LASTNAME.value</name>
<recordfield>PERS.LASTNAME</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Offer_entity/entityfields/relation_id/displayValueProcess.js
+ 3
− 5
View file @ 4f693ec9
import("system.result");
import("system.vars");
import("Relation_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrg("$field.RELATION_PERS_ID",
"$field.RELATION_ORG_ID",
"$field.PERS_FIRSTNAME",
"$field.PERS_LASTNAME",
"$field.ORG_NAME"));
\ No newline at end of file
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js
+ 2
− 2
View file @ 4f693ec9
import("system.vars");
import("system.result");
import("Relation_lib");
result.string(RelationUtils.getContextByPersOrg("$field.RELATION_PERS_ID",
"$field.RELATION_ORG_ID"));
\ No newline at end of file
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
entity/Offer_entity/entityfields/relation_id/valueProcess.js
+ 2
− 2
View file @ 4f693ec9
import("system.result");
import("system.vars");
if (vars.exists("$param.RelationId_param"))
if (vars.exists("$param.RelationId_param"))
{
result.string(vars.get("$param.RelationId_param"))
result.string(vars.get("$param.RelationId_param"));
}
\ No newline at end of file
entity/Offer_entity/entityfields/salesproject_id/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ 4f693ec9
import("system.vars");
import("system.result");
import("Salesproject_lib");
result.string(Salesproject.getSalesProjectTitleById(vars.getString("$field.SALESPROJECT_ID")));
\ No newline at end of file
entity/Order_entity/Order_entity.aod
+ 30
− 8
View file @ 4f693ec9
......@@ -5,7 +5,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
<grantUpdateProcess>%aditoprj%/entity/Order_entity/grantUpdateProcess.js</grantUpdateProcess>
<iconId>VAADIN:FILE_TEXT_O</iconId>
<iconId>VAADIN:DOLLAR</iconId>
<recordContainer>db</recordContainer>
<entityFields>
<entityIncomingField>
......@@ -57,6 +57,7 @@
<linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<outgoingField>OrderRelation_dfo</outgoingField>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Order_entity/entityfields/relation_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
......@@ -65,10 +66,12 @@
<entityField>
<name>SALESPROJECT_ID</name>
<title>Salesproject</title>
<linkedContext>Salesproject_context</linkedContext>
<mandatory v="true" />
<outgoingField>OrderSalesproject_dfo</outgoingField>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
<valueProcess></valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>STATUS</name>
......@@ -290,6 +293,15 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityOutgoingField>
<name>OrderSalesproject_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
<fieldName>#INCOMING</fieldName>
</dependency>
</entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -301,19 +313,33 @@
<onDBDelete>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>ab8d856d-4776-4373-b675-37a1a672a7a6</name>
<name>f84d86a8-867d-44ea-bce5-3489bbee55a0</name>
<tableName>SALESORDER</tableName>
<primaryKey>SALESORDERID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
<name>0580b93e-94bf-4a52-a4c0-3746733e559c</name>
<name>2c489a72-00ee-4bad-929f-25ef82dbc714</name>
<tableName>RELATION</tableName>
<primaryKey>RELATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
<name>3888fb8c-6d2a-42e6-8abd-e4a9ac7a74ac</name>
<tableName>ORG</tableName>
<primaryKey>ORGID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
<name>75470798-2097-41a2-95c2-22cf80d2f0c4</name>
<tableName>PERS</tableName>
<primaryKey>PERSID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
......@@ -384,10 +410,6 @@
<name>RELATION_ID.value</name>
<recordfield>SALESORDER.RELATION_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATION_ID.displayValue</name>
<recordfield>RELATION.RELATIONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATION_ORG_ID.value</name>
<recordfield>RELATION.ORG_ID</recordfield>
......
entity/Order_entity/entityfields/relation_id/displayValueProcess.js 0 → 100644
+ 6
− 0
View file @ 4f693ec9
import("system.result");
import("system.vars");
import("Relation_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
entity/Order_entity/entityfields/relation_id/linkedContextProcess.js
+ 3
− 16
View file @ 4f693ec9
import("system.result");
import("system.vars");
import("Relation_lib")
import("system.result");
import("Relation_lib");
if(!vars.get("$field.RELATION_PERS_ID") && !vars.get("$field.RELATION_ORG_ID"))
result.string("");
else {
switch (RelationUtils.getRelationTypeByPersOrg(vars.get("$field.RELATION_PERS_ID"), vars.get("$field.RELATION_ORG_ID")))
{
case 1: // Org
result.string("Org_context")
break;
case 2: // private Pers
case 3: // Pers
result.string("Pers_context")
default:
}
}
\ No newline at end of file
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
entity/Order_entity/entityfields/salesproject_id/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ 4f693ec9
import("system.vars");
import("system.result");
import("Salesproject_lib");
result.string(Salesproject.getSalesProjectTitleById(vars.getString("$field.SALESPROJECT_ID")));
\ No newline at end of file
entity/Org_entity/Org_entity.aod
+ 19
− 7
View file @ 4f693ec9
......@@ -328,6 +328,13 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
<name>openEditDefaultsView</name>
<fieldType>ACTION</fieldType>
<title>Edit defaults</title>
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
<iconId>NEON:WRENCH</iconId>
</entityActionField>
<entityActionField>
<name>newOffer</name>
<fieldType>ACTION</fieldType>
......@@ -366,18 +373,16 @@
<possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityActionField>
<name>openEditDefaultsView</name>
<fieldType>ACTION</fieldType>
<title>Edit defaults</title>
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
<iconId>NEON:WRENCH</iconId>
</entityActionField>
<entityField>
<name>STANDARD_EMAIL_COMM</name>
<title>standard email</title>
<outgoingField>OrgCommEmail_dfo</outgoingField>
<onValueChange>%aditoprj%/entity/Org_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>RECORD</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMM</name>
......@@ -423,6 +428,13 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityActionField>
<name>newActivity</name>
<fieldType>ACTION</fieldType>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Org_entity/entityfields/image/onValueChange.js
+ 2
− 10
View file @ 4f693ec9
import("system.vars");
import("system.neon");
import("Entity_lib");
// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process
if (vars.get("$field.IMAGE"))
{
vars.set("$image.changedImage", true);
}
else
{
vars.set("$image.changedImage", "deleted");
}
FieldChanges.setChange("$field.IMAGE");
\ No newline at end of file
entity/Org_entity/entityfields/newactivity/onActionProcess.js 0 → 100644
+ 4
− 0
View file @ 4f693ec9
import("system.vars");
import("Activity_lib");
ActivityUtils.createNewActivity(vars.getString("$field.RELATIONID"));
\ No newline at end of file
entity/Org_entity/entityfields/newoffer/onActionProcess.js 0 → 100644
+ 4
− 0
View file @ 4f693ec9
import("system.vars");
import("Offer_lib");
OfferUtils.createNewOffer(null, vars.getString("$field.RELATIONID"));
\ No newline at end of file
entity/Org_entity/entityfields/standard_email_comm/onValueChange.js
+ 2
− 10
View file @ 4f693ec9
import("system.vars");
import("system.neon");
import("Entity_lib");
// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process
if (vars.get("$field.STANDARD_EMAIL_COMM"))
{
vars.set("$image.changedStandardEmail", true);
}
else
{
vars.set("$image.changedStandardEmail", "deleted");
}
FieldChanges.setChange("$field.STANDARD_EMAIL_COMM");
\ No newline at end of file
entity/Org_entity/entityfields/standard_phone_comm/onValueChange.js
+ 2
− 10
View file @ 4f693ec9
import("system.vars");
import("system.neon");
import("Entity_lib");
// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process
if (vars.get("$field.STANDARD_PHONE_COMM"))
{
vars.set("$image.changedStandardPhone", true);
}
else
{
vars.set("$image.changedStandardPhone", "deleted");
}
FieldChanges.setChange("$field.STANDARD_PHONE_COMM");
\ 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