activity: MEDIUM -> CATEGORY

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>

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>

entity/Activity_entity/entityfields/medium/possibleItemsProcess.js → entity/Activity_entity/entityfields/category/possibleItemsProcess.js

 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

entity/Activity_entity/entityfields/icon/valueProcess.js

 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

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

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>

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>

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>

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>

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 &quot;Transparentes Kampagnen- und Veranstaltungsmanagement&quot; 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"/>

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>

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>

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>

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>

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)">

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"})