diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index bca85b0c87e56bac660c7d2def3f890507b8ba61..9cc12f720221706a63168933678366a516c9167a 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -253,9 +253,11 @@
</entityActionField>
<entityField>
<name>RELATION_ORG_ID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>RELATION_PERS_ID</name>
+ <searchable v="false" />
</entityField>
<entityOutgoingField>
<name>OfferRelation_dfo</name>
diff --git a/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js b/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
index 46d56eb03b84207c7f7ab4fac99c8f01d2f38162..12f66fd002f51eef98f0f2e7d2728eddabd19188 100644
--- a/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
+++ b/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
@@ -1,7 +1,4 @@
import("system.result");
import("Keyword_lib");
-var kwdUtils, items;
-
-items = KeywordUtils.getStandardArray("OFFER.PROBABILITY");
-result.object(items);
\ No newline at end of file
+result.object(KeywordUtils.getStandardArray("OFFER.PROBABILITY"));
\ No newline at end of file
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 1ff1fe9806afb209ff3d03e7f217b67733b28220..fb99dad5878bdf7963090e95ee5a000cb223b94e 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -296,6 +296,12 @@
<fieldName>PersEditor_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
+ <entityDependency>
+ <name>b72f99e9-0c8d-4b54-863b-b47eafbb0189</name>
+ <entityName>SalesprojectMember_entity</entityName>
+ <fieldName>PersLookup_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
</dependencies>
</entityIncomingField>
<entityField>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 796d7ef2e640db676bd117f1e8638118d5a57fba..73938370be41f70551e7798c299fdc48cfaf3750 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -1,7 +1,7 @@
<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.1.1">
<name>SalesprojectMember_entity</name>
- <title>Member</title>
+ <title>${SALESPROJECT_MEMBER}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
<entityFields>
@@ -10,14 +10,20 @@
</entityIncomingField>
<entityField>
<name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
- <title>Member</title>
- <state>READONLY</state>
+ <title>Person</title>
+ <linkedContext>Pers_context</linkedContext>
+ <outgoingField>PersLookup_dfo</outgoingField>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
@@ -34,9 +40,12 @@
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityIncomingField>
<name>SalesprojectMember_dfi</name>
@@ -91,7 +100,7 @@
<state>READONLY</state>
</entityField>
<entityOutgoingField>
- <name>PersSalesprojectMember_dfo</name>
+ <name>SalesprojectMemberPers_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -115,11 +124,20 @@
</entityField>
<entityField>
<name>RELATIONSHIP</name>
+ <title>Relationship</title>
+ <description>Overrules RELATION_RELATIONSHIP</description>
+ <contentType>NUMBER</contentType>
<onValueChange>%aditoprj%/entity/SalesprojectMember_entity/entityfields/relationship/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
</entityField>
<entityField>
<name>RELATION_RELATIONSHIP</name>
+ <title>Relationship</title>
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
+ <contentType>NUMBER</contentType>
</entityField>
<entityFieldGroup>
<name>resultingRelation_fieldGroup</name>
@@ -130,6 +148,15 @@
<element>RELATIONSHIP</element>
</fields>
</entityFieldGroup>
+ <entityOutgoingField>
+ <name>PersLookup_dfo</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Pers_entity</entityName>
+ <fieldName>#INCOMING</fieldName>
+ </dependency>
+ </entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -236,6 +263,10 @@
<name>RELATION_RELATIONSHIP.value</name>
<recordfield>RELATION.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RELATION_ID.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..710ac8a06a9911f82ff222c7d9d231846ca93fb2
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a0d59096cd2de39b6098f1ed95af580dcebfce0
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
index 1c524f43115d86ab9cb5af46bd26269f997b5d00..9fbba891587b6972c4dfdba2f3badfaf76752d59 100644
--- a/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
@@ -1,13 +1,12 @@
import("system.result");
import("system.vars");
-// TODO: auf displayValue umbauen statt fieldGroup
var localRelationship = vars.get("$field.RELATIONSHIP");
if (localRelationship)
{
- result.string(localRelationship);
+ result.string("loc" + alRelationship);
}
else
{
- result.string(vars.get("$field.RELATION_RELATIONSHIP"));
+ result.string("rem" + vars.get("$field.RELATION_RELATIONSHIP"));
}
diff --git a/entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1581e18d9763043ae602b98658f87cb0a3b0c967
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c566863b493d778b72dea7d8822f6a59333e77d
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..00b5fa7447a54ccd53c3125e6f9b8081f0157e90
--- /dev/null
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Pers_lib");
+
+result.string(PersUtils.getResolvingDisplaySubSql("RELATION_ID"))
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index ed6d0e5edf64e1a2b7a51b3dbdae37c73cfdbf53..3e43eb36fbc8e9e77a53e502ef552b8b230ac41c 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -52,6 +52,7 @@
</entityField>
<entityField>
<name>ESTIMATIONVALUE</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>INFO</name>
@@ -127,16 +128,8 @@
<entityField>
<name>PROBABILITY</name>
<title>Probability</title>
+ <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
- <entityFieldGroup>
- <name>PROBABILITY_DISPLAY_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_display_fieldgroup/valueProcess.js</valueProcess>
- <title>Probability</title>
- <description>FIELDGROUP</description>
- <fields>
- <element>PROBABILITY</element>
- </fields>
- </entityFieldGroup>
<entityFieldGroup>
<name>VOLUME_DISPLAY_fieldGroup</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js</valueProcess>
@@ -254,7 +247,7 @@
</entityOutgoingField>
<entityOutgoingField>
<name>SalesprojectMember_dfo</name>
- <title>Member</title>
+ <title>${SALESPROJECT_MEMBER}</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..69979090d87a0c3149a65fd7ceeb751addee4ec4
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.object(KeywordUtils.getStandardArray("SALESPROJECT.PROBABILITY"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/probability_display_fieldgroup/valueProcess.js b/entity/Salesproject_entity/entityfields/probability_display_fieldgroup/valueProcess.js
deleted file mode 100644
index be4266eb3e2846f4eda59ed1332d4fcc7b717240..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/probability_display_fieldgroup/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.PROBABILITY") + "%");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js b/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js
index a06f72f14a7f26f1f601d114e85ea178881b3c35..eee86d7eef08aa2a0a16e7665d539f12a193c9ec 100644
--- a/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("system.vars");
import("system.translate");
-result.string(vars.get("$field.PROBABILITY") + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"));
\ No newline at end of file
+result.string(vars.get("$field.VOLUME") + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"));
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 00bb37e12ba34f25467a6f2a0d84871afd4a620d..2b839216346e76e05f23c3771f85db8eb5813093 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -5,6 +5,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
<icon>VAADIN:TASKS</icon>
+ <onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
<iconId>VAADIN:TASKS</iconId>
<recordContainer>db</recordContainer>
<entityFields>
@@ -13,11 +14,13 @@
</entityIncomingField>
<entityField>
<name>CODE</name>
+ <documentation>%aditoprj%/entity/Task_entity/entityfields/code/documentation.adoc</documentation>
<title>task number</title>
<contentType>NUMBER</contentType>
<outputFormat>0000000</outputFormat>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/code/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SUBJECT</name>
@@ -75,7 +78,7 @@
<entityField>
<name>DESCRIPTION</name>
<title>description</title>
- <contentType>HTML</contentType>
+ <contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>PROTECTIONLEVEL</name>
@@ -88,25 +91,34 @@
<entityField>
<name>TASKID</name>
<mandatory v="true" />
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/taskid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <title>{$DATE_NEW}</title>
<contentType>DATE</contentType>
<resolution>SECOND</resolution>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
+ <title>{$USER_NEW}</title>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <title>{$DATE_EDIT}</title>
<contentType>DATE</contentType>
<resolution>SECOND</resolution>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <title>{$USER_EDIT}</title>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityOutgoingField>
<name>PersEditor_dfo</name>
diff --git a/entity/Task_entity/entityfields/code/documentation.adoc b/entity/Task_entity/entityfields/code/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..418cfa22905051736503922471bcb74502b2508d
--- /dev/null
+++ b/entity/Task_entity/entityfields/code/documentation.adoc
@@ -0,0 +1,3 @@
+The `CODE` field is a automatically increased sequential number.
+It cannot be set by the user.
+Therefore it's only visible after creation of a `TASK` record.
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/valueProcess.js b/entity/Task_entity/entityfields/code/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7175621de3beecb887b38e37d160d505af2b2c42
--- /dev/null
+++ b/entity/Task_entity/entityfields/code/valueProcess.js
@@ -0,0 +1,18 @@
+import("system.logging");
+import("system.neon");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+
+//if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+//{
+// var maskingHelper = new SqlMaskingUtils();
+// var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
+// newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
+// if (isNaN(newCodeNumber))
+// throw new TypeError();//TODO:add Message
+// ++newCodeNumber;
+// logging.log("newCodeNumber: " + newCodeNumber)
+// vars.set("$field.CODE", newCodeNumber);
+//}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/date_edit/valueProcess.js b/entity/Task_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..710ac8a06a9911f82ff222c7d9d231846ca93fb2
--- /dev/null
+++ b/entity/Task_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/date_new/valueProcess.js b/entity/Task_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..408c498a4c90f59cd95eafbf74a8ea2683bab068
--- /dev/null
+++ b/entity/Task_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.date"));
+
diff --git a/entity/Task_entity/entityfields/user_edit/valueProcess.js b/entity/Task_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1581e18d9763043ae602b98658f87cb0a3b0c967
--- /dev/null
+++ b/entity/Task_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/user_new/valueProcess.js b/entity/Task_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c566863b493d778b72dea7d8822f6a59333e77d
--- /dev/null
+++ b/entity/Task_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Task_entity/onValidation.js b/entity/Task_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..adec45e2126cefedb731170f258d89d77162deb9
--- /dev/null
+++ b/entity/Task_entity/onValidation.js
@@ -0,0 +1,16 @@
+import("system.db");
+import("system.vars");
+import("system.text");
+import("system.neon");
+import("Sql_lib");
+
+//TODO: crashes server
+//if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+//{
+// var maskingHelper = new SqlMaskingUtils();
+// var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
+// newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
+// if (isNaN(newCodeNumber))
+// throw new TypeError();//TODO:add Message
+// neon.setFieldValue("$field.CODE", text.formatLong(++newCodeNumber, "0000000"));
+//}
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/onDBInsert.js b/entity/Task_entity/recordcontainers/db/onDBInsert.js
index 664a88059701f55a8f39e55f19dff38d4a3c9776..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/entity/Task_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Task_entity/recordcontainers/db/onDBInsert.js
@@ -1,15 +0,0 @@
-import("system.db");
-import("system.vars");
-import("system.neon");
-import("Sql_lib");
-
-if (!vars.get("$field.CODE"))
-{
- var maskingHelper = new SqlMaskingUtils();
- var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
- newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
- if (isNaN(newCodeNumber))
- throw new TypeError();//TODO:add Message
-
- neon.setFieldValue("$field.CODE", ++newCodeNumber);
-}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index b5285eef306cb95635f50305a96ac23e675726f3..a6b15592693cc0ae3333433d9c3c31de7cb1132e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1414,7 +1414,19 @@
<key>Angebot</key>
</entry>
<entry>
- <key>responsible</key>
+ <key>{$DATE_NEW}</key>
+ </entry>
+ <entry>
+ <key>{$USER_NEW}</key>
+ </entry>
+ <entry>
+ <key>{$USER_EDIT}</key>
+ </entry>
+ <entry>
+ <key>details</key>
+ </entry>
+ <entry>
+ <key>{$DATE_EDIT}</key>
</entry>
<entry>
<key>maturity date</key>
@@ -1437,6 +1449,15 @@
<entry>
<key>Employee</key>
</entry>
+ <entry>
+ <key>Month</key>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_MEMBER}</key>
+ </entry>
+ <entry>
+ <key>responsible</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 3afab6b640314593a91bff646aa1d356d66732dd..133c768f66871f7c83e350f0379360dc98120f61 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -78,6 +78,10 @@
<key>German (Germany)</key>
<value>Deutsch (Deutschland)</value>
</entry>
+ <entry>
+ <key>${SALESPROJECT_MEMBER}</key>
+ <value>Projektteam</value>
+ </entry>
<entry>
<key>Incoming</key>
<value>Eingehend</value>
@@ -1138,6 +1142,7 @@
</entry>
<entry>
<key>Member</key>
+ <value>Teammitglied</value>
</entry>
<entry>
<key>A reason is only possible if a date is given.</key>
@@ -1149,6 +1154,7 @@
</entry>
<entry>
<key>Role</key>
+ <value>Rolle</value>
</entry>
<entry>
<key>End date</key>
@@ -1831,6 +1837,25 @@
<entry>
<key>Angebot</key>
</entry>
+ <entry>
+ <key>{$DATE_NEW}</key>
+ <value>Erstelldatum</value>
+ </entry>
+ <entry>
+ <key>{$USER_NEW}</key>
+ <value>Ersteller</value>
+ </entry>
+ <entry>
+ <key>{$USER_EDIT}</key>
+ <value>Bearbeiter</value>
+ </entry>
+ <entry>
+ <key>details</key>
+ </entry>
+ <entry>
+ <key>{$DATE_EDIT}</key>
+ <value>Änderungsdatum</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 709fb0f20feaeb680c673bb55de1c0541f53f869..e851009f1d3001359ae878ae5a154c6814d51002 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1303,6 +1303,7 @@
</entry>
<entry>
<key>{$TASK_STATUS}</key>
+ <value>status</value>
</entry>
<entry>
<key>Task</key>
@@ -1312,6 +1313,7 @@
</entry>
<entry>
<key>{$TASK_REQUESTOR}</key>
+ <value>requestor</value>
</entry>
<entry>
<key>start date</key>
@@ -1321,6 +1323,7 @@
</entry>
<entry>
<key>{$TASK_EDITOR}</key>
+ <value>editor</value>
</entry>
<entry>
<key>description</key>
@@ -1333,6 +1336,7 @@
</entry>
<entry>
<key>{$TASK_PRIORITY_HIGH}</key>
+ <value>high</value>
</entry>
<entry>
<key>Seite</key>
@@ -1363,12 +1367,14 @@
</entry>
<entry>
<key>{$TASK_PRIORITY_LOW}</key>
+ <value>low</value>
</entry>
<entry>
<key>Nur Eigene anzeigen</key>
</entry>
<entry>
<key>{$TASK_PRIORITY_NORMAL}</key>
+ <value>normal</value>
</entry>
<entry>
<key>new</key>
@@ -1405,6 +1411,7 @@
</entry>
<entry>
<key>{$TASK_PRIORITY_NONE}</key>
+ <value>none</value>
</entry>
<entry>
<key>vielleicht</key>
@@ -1431,7 +1438,23 @@
<key>Angebot</key>
</entry>
<entry>
- <key>responsible</key>
+ <key>{$DATE_NEW}</key>
+ <value>creation date</value>
+ </entry>
+ <entry>
+ <key>{$USER_NEW}</key>
+ <value>creation user</value>
+ </entry>
+ <entry>
+ <key>{$USER_EDIT}</key>
+ <value>edit user</value>
+ </entry>
+ <entry>
+ <key>details</key>
+ </entry>
+ <entry>
+ <key>{$DATE_EDIT}</key>
+ <value>edit date</value>
</entry>
<entry>
<key>maturity date</key>
@@ -1454,6 +1477,16 @@
<entry>
<key>Employee</key>
</entry>
+ <entry>
+ <key>Month</key>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_MEMBER}</key>
+ <value>Project member</value>
+ </entry>
+ <entry>
+ <key>responsible</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Task_context/Task_context.aod b/neonContext/Task_context/Task_context.aod
index afaf210f1dd58231f0f144bb563cd4c21b1781a1..d6459a17b6e3a705b34defe319bee538cfb4173c 100644
--- a/neonContext/Task_context/Task_context.aod
+++ b/neonContext/Task_context/Task_context.aod
@@ -27,5 +27,9 @@
<name>83309ef0-d1c0-4f74-bb44-41fd8e054b4b</name>
<view>TaskMain_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b2d84509-c72b-497e-9422-e4efae2e6b68</name>
+ <view>TaskMainPreview_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/OfferDetail_view/OfferDetail_view.aod b/neonView/OfferDetail_view/OfferDetail_view.aod
index 3e6da584b81c8ad725337688e574c7717b79399c..44b2b4f31c87b0e24d4b7421f1ca315a2d3083d9 100644
--- a/neonView/OfferDetail_view/OfferDetail_view.aod
+++ b/neonView/OfferDetail_view/OfferDetail_view.aod
@@ -11,7 +11,10 @@
<children>
<genericViewTemplate>
<name>OfferDetail_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Detail</drawerCaption>
<entityField>#ENTITY</entityField>
+ <title></title>
<fields>
<entityFieldLink>
<name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index 12b971259c10f78e28b129e6117a8004e8051eec..f25f05c8d5839b09a93d25f92d5866c59d1a4abc 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -14,16 +14,16 @@
<entityField>#ENTITY</entityField>
<view>OfferPreview_view</view>
</neonViewReference>
- <neonViewReference>
- <name>da7c8cef-a4f0-4614-a330-d81221abe566</name>
- <entityField>OfferOfferitem_dfo</entityField>
- <view>OfferitemFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>e6b12eed-d67e-467c-9302-f6340f901235</name>
<entityField>#ENTITY</entityField>
<view>OfferDetail_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>da7c8cef-a4f0-4614-a330-d81221abe566</name>
+ <entityField>OfferOfferitem_dfo</entityField>
+ <view>OfferitemFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>e96f2fec-1a98-4380-895a-82ab78ba408a</name>
<entityField>OfferDocument_dfo</entityField>
diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
index 1c8ef81225ed1098bcc032267f05b7754f49379a..446720d67ac9402c34bd4ce59d26763688b84907 100644
--- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
+++ b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
@@ -10,12 +10,14 @@
<children>
<cardViewTemplate>
<name>SalesprojectMemberHeader_template</name>
- <titleField>PERS_FULL_NAME</titleField>
+ <titleField>RELATION_ID</titleField>
<descriptionField>SALESPROJECT_ROLE</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>SalesprojectMemberInfo_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index f59d42bff44af9a3de100da0305551742205d64b..22341863c9bb9aca35324959ff83f5d7f74ea86c 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -41,8 +41,8 @@
<entityField>ENDDATE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>c622af3d-81d2-4583-a2d6-1ac61e3d3535</name>
- <entityField>PROBABILITY_DISPLAY_fieldGroup</entityField>
+ <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
+ <entityField>PROBABILITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>fbd92799-b2e9-40e9-8700-f95765befa55</name>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 941e4f7a9b2219e13cf1a97abbae476cd544875b..01dc1876945f01e1f00a54ce5d68fbeba89d714d 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -2,6 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>TaskFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..55b3e271dd2ca54553b0b26756528796e93c7b88
--- /dev/null
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -0,0 +1,53 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>TaskMainPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>head</name>
+ <iconField>#ICON</iconField>
+ <titleField>SUBJECT</titleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>extendedData</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>0bfb984a-1a1b-404d-beb9-a1b8002ebed2</name>
+ <entityField>CODE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
+ <entityField>START_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
+ <entityField>MATURITY_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>95c12be2-3cbe-4bc6-8879-91fad6916dad</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
+ <entityField>PRIORITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
+ <entityField>REQUESTOR_RELATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
+ <entityField>EDITOR_RELATION_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index 4073f67d0a527c47dbcaa242f335bb12b4ddfe6e..77f3e8ab66102189f842836610088e14cb198713 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -5,20 +5,29 @@
<layout>
<masterSlaveLayout>
<name>layout</name>
- <master>c8294ae1-65d8-4cee-a003-931a4759c619</master>
+ <master>339e160e-e482-4be2-9550-fc06131fbffe</master>
</masterSlaveLayout>
</layout>
<children>
<neonViewReference>
- <name>c8294ae1-65d8-4cee-a003-931a4759c619</name>
+ <name>339e160e-e482-4be2-9550-fc06131fbffe</name>
<entityField>#ENTITY</entityField>
- <view>TaskPreview_view</view>
+ <view>TaskMainPreview_view</view>
</neonViewReference>
<genericViewTemplate>
<name>details</name>
+ <showDrawer v="true" />
<entityField>#ENTITY</entityField>
<title>details</title>
<fields>
+ <entityFieldLink>
+ <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
+ <entityField>PROTECTIONLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e73dda40-22cd-4d2d-abcf-c7fc59ea2e67</name>
+ <entityField>TYPE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>fea59f13-750b-427d-bf33-cc1bead95446</name>
<entityField>DESCRIPTION</entityField>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 2eaf021b12e3c236b33c9aba54695528ad6a2a36..7dfd8aa77a434c8598ef96f25f4e0705113e56cf 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -32,10 +32,6 @@
<name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
<entityField>MATURITY_DATE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>95c12be2-3cbe-4bc6-8879-91fad6916dad</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
<entityField>PRIORITY</entityField>
@@ -58,5 +54,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
+ <entityField>MainDocument_dfo</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 5edf76c7779d54bddc411de7cb54029b31b8bf2f..1fcf8c780820f5852cd9b64a0e60e7f18eec3766 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic5</projectName>
+ <projectName>xRM-Basic TIKAL</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 9f343c7ebcf372ca3007a01e80c696e30e1c8922..5079b0f98dbd98f89bc007f4f67fdffaa2b36019 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -338,6 +338,15 @@ function KeywordUtils(){
})
]);
break;
+ case "SALESPROJECT.PROBABILITY":
+ valueContainer = _createKeywordEntriesContainer([
+ _createKeywordEntry("1", translate.text("0 %"), null, {percentValue: 0})
+ ,_createKeywordEntry("2", translate.text("25 %"), null, {percentValue: 25})
+ ,_createKeywordEntry("3", translate.text("50 %"), null, {percentValue: 50})
+ ,_createKeywordEntry("4", translate.text("75 %"), null, {percentValue: 75})
+ ,_createKeywordEntry("5", translate.text("100 %"), null, {percentValue: 100})
+ ]);
+ break;
case "CLASS.BRANCHE":
valueContainer = _createKeywordEntriesContainer([
_createKeywordEntry("1", translate.text("Industry 1"), null, {points: 50})