[Projekt: Entwicklung - Neon][TicketNr.: 1032517][Bei den Aktivitäten ...

[Projekt: Entwicklung - Neon][TicketNr.: 1032517][Bei den Aktivitäten  Timeline als Standardansicht setzen]

entity/Activity_entity/entityfields/icon/valueProcess.js

@@ -7,4 +7,4 @@ var category = vars.getString("$field.CATEGORY");
 var kwd = KeywordUtils.createKeyword("ACTIVITY.CATEGORY");
 var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);
 
-result.string(icon || "NEON:HISTORY");
\ No newline at end of file
+result.string(icon || "NEON:HISTORY");

entity/Task_entity/Task_entity.aod

@@ -4,9 +4,9 @@
   <title>Task</title>
   <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>
+  <iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityIncomingField>
@@ -32,6 +32,7 @@
       <title>{$TASK_STATUS}</title>
       <mandatory v="true" />
       <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+      <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/status/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
@@ -39,6 +40,7 @@
       <title>priority</title>
       <mandatory v="true" />
       <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/priority/possibleItemsProcess.js</possibleItemsProcess>
+      <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
@@ -59,6 +61,7 @@
       <title>start date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
       <onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
     </entityField>
@@ -74,6 +77,7 @@
       <name>TYPE</name>
       <title>type</title>
       <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess>
+      <groupable v="true" />
     </entityField>
     <entityField>
       <name>DESCRIPTION</name>

entity/Task_entity/iconIdProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Keyword_lib");
+
+var category = vars.getString("$field.PRIORITY");
+var kwd = KeywordUtils.createKeyword("TASK.PRIORITY");
+var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);
+
+result.string(icon || "VAADIN:TASKS");
\ No newline at end of file

neonContext/Task_context/Task_context.aod

@@ -4,7 +4,6 @@
   <title>Task</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/neonContext/Task_context/documentation.adoc</documentation>
-  <icon>VAADIN:TASKS</icon>
   <mainview>TaskMain_view</mainview>
   <filterview>TaskFilter_view</filterview>
   <editview>TaskEdit_view</editview>

neonView/ActivityFilter_view/ActivityFilter_view.aod

@@ -55,6 +55,14 @@
     </groupLayout>
   </layout>
   <children>
+    <timelineViewTemplate>
+      <name>TimelineFilter_template</name>
+      <dateField>ENTRYDATE</dateField>
+      <titleField>SUBJECT_DETAILS</titleField>
+      <descriptionField>INFO</descriptionField>
+      <iconIdField>DIRECTION_ICON</iconIdField>
+      <entityField>#ENTITY</entityField>
+    </timelineViewTemplate>
     <tableViewTemplate>
       <name>table_template</name>
       <entityField>#ENTITY</entityField>
@@ -81,14 +89,6 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <timelineViewTemplate>
-      <name>TimelineFilter_template</name>
-      <dateField>ENTRYDATE</dateField>
-      <titleField>SUBJECT_DETAILS</titleField>
-      <descriptionField>INFO</descriptionField>
-      <iconIdField>DIRECTION_ICON</iconIdField>
-      <entityField>#ENTITY</entityField>
-    </timelineViewTemplate>
     <treetableViewTemplate>
       <name>Treetable_template</name>
       <titleField>SUBJECT</titleField>

neonView/TaskFilter_view/TaskFilter_view.aod

@@ -4,11 +4,19 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
+    <timelineViewTemplate>
+      <name>mainTimeline</name>
+      <dateField>START_DATE</dateField>
+      <titleField>SUBJECT</titleField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <iconIdField>#ICON</iconIdField>
+      <entityField>#ENTITY</entityField>
+    </timelineViewTemplate>
     <tableViewTemplate>
       <name>mainTable</name>
       <entityField>#ENTITY</entityField>
@@ -41,5 +49,12 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treetableViewTemplate>
+      <name>mainTreetable</name>
+      <titleField>SUBJECT</titleField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <iconField>#ICON</iconField>
+      <entityField>#ENTITY</entityField>
+    </treetableViewTemplate>
   </children>
 </neonView>