diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 1ebd7e030b6965eb6f06bcc68959c7052b5cc240..9b6b3552fc21d4878115882b5b0dbf086cf72315 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4147,20 +4147,6 @@
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
- <entityFieldDb>
- <name>MEDIUM</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
@@ -4287,6 +4273,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CATEGORY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 3a7cefb053135ca4734036d7bcee95cf1a5bc931..4b06d1d2e18d1f2fae72c73363091b50ec7e9526 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -34,10 +34,10 @@
<mandatory v="false" />
</entityField>
<entityField>
- <name>MEDIUM</name>
- <title>Medium</title>
+ <name>CATEGORY</name>
+ <title>Category</title>
<mandatory v="false" />
- <possibleItemsProcess>%aditoprj%/entity/Activity_entity/entityfields/medium/possibleItemsProcess.js</possibleItemsProcess>
+ <possibleItemsProcess>%aditoprj%/entity/Activity_entity/entityfields/category/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
</entityField>
<entityField>
@@ -272,10 +272,6 @@
<name>INFO.value</name>
<recordfield>ACTIVITY.INFO</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MEDIUM.value</name>
- <recordfield>ACTIVITY.MEDIUM</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SUBJECT.value</name>
<recordfield>ACTIVITY.SUBJECT</recordfield>
@@ -288,6 +284,10 @@
<name>USER_NEW.value</name>
<recordfield>ACTIVITY.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CATEGORY.value</name>
+ <recordfield>ACTIVITY.CATEGORY</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/medium/possibleItemsProcess.js b/entity/Activity_entity/entityfields/category/possibleItemsProcess.js
similarity index 50%
rename from entity/Activity_entity/entityfields/medium/possibleItemsProcess.js
rename to entity/Activity_entity/entityfields/category/possibleItemsProcess.js
index 46bed657d5dbcf0ace1ae5e6daed85fb461f3a39..168963b6169be0c94c701a7633a6ad8c1ef6f73a 100644
--- a/entity/Activity_entity/entityfields/medium/possibleItemsProcess.js
+++ b/entity/Activity_entity/entityfields/category/possibleItemsProcess.js
@@ -1,7 +1,5 @@
import("system.result");
import("Keyword_lib");
-var items;
-
-items = KeywordUtils.getStandardArray("ACTIVITY.MEDIUM");
+var items = KeywordUtils.getStandardArray("ACTIVITY.CATEGORY");
result.object(items);
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/icon/valueProcess.js b/entity/Activity_entity/entityfields/icon/valueProcess.js
index 1b79490f997310b7f45167662e936c10269fa77d..6f78dfcee1f8ed5135d1d95d7e4770387308cb19 100644
--- a/entity/Activity_entity/entityfields/icon/valueProcess.js
+++ b/entity/Activity_entity/entityfields/icon/valueProcess.js
@@ -1,23 +1,10 @@
import("system.vars");
import("system.result");
import("system.neon");
+import("Keyword_lib");
-var medium = vars.getString("$field.MEDIUM");
+var category = vars.getString("$field.CATEGORY");
+var kwd = KeywordUtils.createKeyword("ACTIVITY.CATEGORY");
+var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);
-switch (medium) {
- case "0":
- result.string("VAADIN:PHONE");
- break;
- case "1":
- result.string("VAADIN:AT");
- break;
- case "2":
- result.string("VAADIN:PHONE");
- break;
- case "3":
- result.string("VAADIN:LINK");
- break;
- default:
- result.string("NEON:HISTORY");
- break;
-}
\ No newline at end of file
+result.string(icon || "NEON:HISTORY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index 9a383c7494db7a7d7c5fe57502bef7cf1b624a60..3cba44d10afbf3f366822381953ae1e3463a523e 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -3,7 +3,7 @@ import("system.result");
import("Keyword_lib");
var histMedium;
-histMedium = vars.get("$field.MEDIUM");
+histMedium = vars.get("$field.CATEGORY");
if (histMedium){
- result.string(vars.get("$field.SUBJECT") + " (" + KeywordUtils.getViewValue("ACTIVITY.MEDIUM", histMedium) + ")");
+ result.string(vars.get("$field.SUBJECT") + " (" + KeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")");
}
\ No newline at end of file
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index b1b9385114d2be9c667db2ade656d60510fee2ed..ff037128fb65720e7c309fa29bc07405e1a1fb64 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -33,8 +33,8 @@
<entityField>ENTRYDATE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>a8cd83af-272b-4539-a4e9-02338e04106d</name>
- <entityField>MEDIUM</entityField>
+ <name>921a6690-43dc-488b-ae0a-4a0ab88a99ab</name>
+ <entityField>CATEGORY</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index e364432b31cd0a5e7558d894f6b1146d4045d973..1b59c632c4471c1d52188a22b22d60a369751531 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -77,7 +77,7 @@
</neonTableColumn>
<neonTableColumn>
<name>37a279c7-be95-4d40-a355-ea2595e36bf2</name>
- <entityField>MEDIUM</entityField>
+ <entityField>CATEGORY</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 23802418fac09a7840b8fdd95c0e4b770509fd6b..eaa45e929fc6184e171a216cc0ad63b6ed15cace 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -25,8 +25,8 @@
<entityField>DIRECTION</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>52b4623c-1648-458f-a6de-33024bc743ae</name>
- <entityField>MEDIUM</entityField>
+ <name>ad41c89c-2f4a-414c-90c8-d5a5df24aeaa</name>
+ <entityField>CATEGORY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b0673d1d-af3d-4daa-b6ec-511f18367e7f</name>
diff --git a/others/db_changes/data/example_activity/example_activity.xml b/others/db_changes/data/example_activity/example_activity.xml
index 7d11bc63f3326b656b987bdcc0bd47d28b834bb6..9144846b72bbfc583f4c9656cadcf4a9ba65ca59 100644
--- a/others/db_changes/data/example_activity/example_activity.xml
+++ b/others/db_changes/data/example_activity/example_activity.xml
@@ -7,7 +7,7 @@
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
<column name="SUBJECT" value="call from Haråld"/>
<column name="INFO" valueClobFile="/data/example_activity/LOBs/subjectText_de410a35.txt"/>
- <column name="MEDIUM" valueNumeric="2"/>
+ <column name="CATEGORY" valueNumeric="2"/>
<column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-08-03T12:41:22"/>
</insert>
diff --git a/others/db_changes/data/example_activity/example_activity_gfk.xml b/others/db_changes/data/example_activity/example_activity_gfk.xml
index 7377b7109b7b376641ae59dc08e844aa32f15cdc..5fcb5adf4cf8ada177db65438dbb19582731dfb0 100644
--- a/others/db_changes/data/example_activity/example_activity_gfk.xml
+++ b/others/db_changes/data/example_activity/example_activity_gfk.xml
@@ -5,7 +5,7 @@
<column name="ACTIVITYID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
<column name="SUBJECT" value="Webinar: Transparentes Kampagnen- und Veranstaltungsmanagement"/>
<column name="INFO" value="Hat teilgenommen und Feedback gegeben: begeistert von den neuen Möglichkeiten und der Webinar-Qualität"/>
- <column name="MEDIUM" valueNumeric="1"/>
+ <column name="CATEGORY" valueNumeric="1"/>
<column name="DIRECTION" value="o"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
@@ -23,7 +23,7 @@
<column name="ACTIVITYID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
<column name="SUBJECT" value="Webinar-Aufzeichnung"/>
<column name="INFO" value="Aufzeichnungen zum Thema "Transparentes Kampagnen- und Veranstaltungsmanagement" verschickt."/>
- <column name="MEDIUM" valueNumeric="2"/>
+ <column name="CATEGORY" valueNumeric="2"/>
<column name="DIRECTION" value="o"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-07-31T12:02:52"/>
@@ -41,7 +41,7 @@
<column name="ACTIVITYID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
<column name="SUBJECT" value="Daten-update"/>
<column name="INFO" value="Hat uns Zusatzinfos geschickt - diese wurden an allen entsprechenden Stellen hinterlegt und final eingepflegt"/>
- <column name="MEDIUM" valueNumeric="3"/>
+ <column name="CATEGORY" valueNumeric="3"/>
<column name="DIRECTION" value="i"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
@@ -59,7 +59,7 @@
<column name="ACTIVITYID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
<column name="SUBJECT" value="Prüfung durchgeführt"/>
<column name="INFO" value="Abgleich der Bestandsdaten wurde gemacht."/>
- <column name="MEDIUM" valueNumeric="3"/>
+ <column name="CATEGORY" valueNumeric="3"/>
<column name="DIRECTION" value="i"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-06T12:02:52"/>
@@ -77,7 +77,7 @@
<column name="ACTIVITYID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
<column name="SUBJECT" value="weiterer Vertrag"/>
<column name="INFO" value="Vertragsgrundlagen besprochen. Wird in den nächsten Tagen definiert"/>
- <column name="MEDIUM" valueNumeric="2"/>
+ <column name="CATEGORY" valueNumeric="2"/>
<column name="DIRECTION" value="o"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-04T12:02:52"/>
@@ -95,7 +95,7 @@
<column name="ACTIVITYID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
<column name="SUBJECT" value="Standortwechsel"/>
<column name="INFO" value="Ein Standortwechsel steht an und die neuen Daten wurden erfasst."/>
- <column name="MEDIUM" valueNumeric="2"/>
+ <column name="CATEGORY" valueNumeric="2"/>
<column name="DIRECTION" value="i"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-09T12:02:52"/>
@@ -113,7 +113,7 @@
<column name="ACTIVITYID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
<column name="SUBJECT" value="Einladung Messe"/>
<column name="INFO" value="Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut"/>
- <column name="MEDIUM" valueNumeric="1"/>
+ <column name="CATEGORY" valueNumeric="1"/>
<column name="DIRECTION" value="o"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-04T12:02:52"/>
@@ -131,7 +131,7 @@
<column name="ACTIVITYID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
<column name="SUBJECT" value="Präsentation: Terminvorschlag"/>
<column name="INFO" value="Terminvorschlag gesendet. Aufgabe gestellt"/>
- <column name="MEDIUM" valueNumeric="1"/>
+ <column name="CATEGORY" valueNumeric="1"/>
<column name="DIRECTION" value="i"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-12T12:02:52"/>
@@ -149,7 +149,7 @@
<column name="ACTIVITYID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
<column name="SUBJECT" value="Einladung zum GfK-Abend"/>
<column name="INFO" value="Einladung von Kunden, Interessenten und Zulieferern zu einer internen Veranstaltung in unserem Haus"/>
- <column name="MEDIUM" valueNumeric="0"/>
+ <column name="CATEGORY" valueNumeric="0"/>
<column name="DIRECTION" value="o"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2018-08-11T12:02:52"/>
diff --git a/others/db_changes/data/example_activity/extendHLink_62330df6.xml b/others/db_changes/data/example_activity/extendHLink_62330df6.xml
index 1e83765eff185d40223f46edce2920ec53ea6d10..78cfa9a7b7f31c9eaa50520e31bfa9df896e5745 100644
--- a/others/db_changes/data/example_activity/extendHLink_62330df6.xml
+++ b/others/db_changes/data/example_activity/extendHLink_62330df6.xml
@@ -6,7 +6,7 @@
<column name="DATE_NEW" valueDate="2018-08-03T12:12:52"/>
<column name="SUBJECT" value="interesting information from the customer visit"/>
<column name="INFO" valueClobFile="/data/example_activity/LOBs/subjectText_1050d93f.txt"/>
- <column name="MEDIUM" valueNumeric="2"/>
+ <column name="CATEGORY" valueNumeric="2"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-08-03T14:41:22"/>
</insert>
diff --git a/others/db_changes/data/example_org/ORG_gfk.xml b/others/db_changes/data/example_org/ORG_gfk.xml
index 1b4ab630fbdcd1abbf7c90758b91462a3fdb427d..daa007f99938fa84137194331aaa7f170705a869 100644
--- a/others/db_changes/data/example_org/ORG_gfk.xml
+++ b/others/db_changes/data/example_org/ORG_gfk.xml
@@ -71,7 +71,7 @@
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
<column name="SUBJECT" value="Produktpalette"/>
<column name="INFO" value="seit November neuer Einkäufer bei Schulz. Herr Traum wird unsere Spezifikation aber in jedem Fall auch 1997 festschreiben. Dennoch Vorsicht: Besuch"/>
- <column name="MEDIUM" valueNumeric="2"/>
+ <column name="CATEGORY" valueNumeric="2"/>
<column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-08-03T12:41:22"/>
</insert>
@@ -90,7 +90,7 @@
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
<column name="SUBJECT" value="Nachfassen"/>
<column name="INFO" value="Informationen sind zu seiner Zufriedenheit gewesen, sendet eine Email mit einer konkreten Anfrage."/>
- <column name="MEDIUM" valueNumeric="3"/>
+ <column name="CATEGORY" valueNumeric="3"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2017-04-13T12:41:22"/>
</insert>
@@ -110,7 +110,7 @@
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
<column name="SUBJECT" value="Kauf der Maschine von KUKA, Augsburg"/>
<column name="INFO" value="erworben von Roboterabteilung"/>
- <column name="MEDIUM" valueNumeric="1"/>
+ <column name="CATEGORY" valueNumeric="1"/>
<column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-02-22T14:41:22"/>
</insert>
diff --git a/others/db_changes/data/example_pers/PERS_pfiffig.xml b/others/db_changes/data/example_pers/PERS_pfiffig.xml
index 15b22c221e02da0d6d4fe2d056743058eee50029..6103a84c51059ab1af44e6e4aa7dc3f75e7ab815 100644
--- a/others/db_changes/data/example_pers/PERS_pfiffig.xml
+++ b/others/db_changes/data/example_pers/PERS_pfiffig.xml
@@ -63,7 +63,7 @@
<column name="DATE_NEW" valueDate="2018-08-03T12:02:52"/>
<column name="SUBJECT" value="Muster"/>
<column name="INFO" value="Spezifikation ausgefüllt und abgeschickt"/>
- <column name="MEDIUM" valueNumeric="1"/>
+ <column name="CATEGORY" valueNumeric="1"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-06-03T12:41:22"/>
</insert>
diff --git a/others/db_changes/data/example_pers/PERS_sommer.xml b/others/db_changes/data/example_pers/PERS_sommer.xml
index f0e4ed75f2b19179f9c1fac91ba20f5623d17d94..fc858c5e7dc6852e38b7806db5d8a9487844112d 100644
--- a/others/db_changes/data/example_pers/PERS_sommer.xml
+++ b/others/db_changes/data/example_pers/PERS_sommer.xml
@@ -63,7 +63,7 @@
<column name="DATE_NEW" valueDate="2018-02-12T12:02:52"/>
<column name="SUBJECT" value="Angebot nachfassen"/>
<column name="INFO" value="Angebot nachfassen, wir liegen vor Wettbewerb"/>
- <column name="MEDIUM" valueNumeric="1"/>
+ <column name="CATEGORY" valueNumeric="1"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-06-03T12:41:22"/>
</insert>
diff --git a/others/db_changes/struct/create_activity.xml b/others/db_changes/struct/create_activity.xml
index 3c5e2c2a1f3380c37c886a26aa889aef5d44cab7..0ea48ad0f0510f4b00a98a4cd33ef4056b576b44 100644
--- a/others/db_changes/struct/create_activity.xml
+++ b/others/db_changes/struct/create_activity.xml
@@ -4,7 +4,7 @@
<createTable tableName="ACTIVITY">
<column name="SUBJECT" type="NVARCHAR(254)"/>
<column name="INFO" type="NCLOB"/>
- <column name="MEDIUM" type="INTEGER"/>
+ <column name="CATEGORY" type="INTEGER"/>
<column name="DIRECTION" type="CHAR(1)"/>
<column name="ENTRYDATE" type="TIMESTAMP"/>
<column name="ACTIVITYID" type="CHAR(36)">
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 377b2137a828e5a2f7df55df67f767e93e491c28..3e68ef8deb0e07337af63990fa7d082f306a8b3e 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -113,16 +113,17 @@ function KeywordUtils(){
valueContainer = _createKeywordEntriesContainer([
_createKeywordEntry("i", translate.text("Incoming"))
,_createKeywordEntry("o", translate.text("Outgoing"))
+ ,_createKeywordEntry("p", translate.text("Internal"))
]);
break;
- case "ACTIVITY.MEDIUM":
+ case "ACTIVITY.CATEGORY":
valueContainer = _createKeywordEntriesContainer([
- _createKeywordEntry("0", translate.text("Visit"))
- ,_createKeywordEntry("1", translate.text("E-Mail"))
- ,_createKeywordEntry("2", translate.text("Phone"))
- ,_createKeywordEntry("3", translate.text("Internal"))
- ,_createKeywordEntry("4", translate.text("Online-Meeting"))
+ _createKeywordEntry("0", translate.text("Visit"), null, {defaultAvatarRepresentation: "VAADIN:TRAIN"})
+ ,_createKeywordEntry("1", translate.text("E-Mail"), null, {defaultAvatarRepresentation: "VAADIN:AT"})
+ ,_createKeywordEntry("2", translate.text("Phone"), null, {defaultAvatarRepresentation: "VAADIN:PHONE"})
+ ,_createKeywordEntry("3", translate.text("Online-Meeting"), null, {defaultAvatarRepresentation: "VAADIN:GLOBE_WIRE"})
]);
+ break;
case "COMM.MEDIUM":
valueContainer = _createKeywordEntriesContainer([
_createKeywordEntry("0", translate.text("Mobile"), null, {category: "PHONE", contentType: "TELEPHONE"})