diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 7133dd9f28d68ba2fb43e3ed44295e3ada6886bc..7d67a5cab7f0ec222d3e4ba870b83a086864a1dc 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -42,6 +42,10 @@
<key>processing time</key>
<value>Bearbeitungszeit</value>
</entry>
+ <entry>
+ <key>Finished Tickets last 4 weeks</key>
+ <value>Abgeschlossene Tickets der letzten 4 Wochen</value>
+ </entry>
<entry>
<key>Ticket number of the original ticket</key>
<value>Ticketnummer des originalen Tickets</value>
@@ -295,7 +299,7 @@
</entry>
<entry>
<key>Move down</key>
- <value>Nach unten verschieben</value>
+ <value>Nach unten verschieben</value>
</entry>
<entry>
<key>Value is too big, the maximum is %0</key>
@@ -14309,6 +14313,36 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Weighted(€)</key>
</entry>
+ <entry>
+ <key>Ticket returned</key>
+ </entry>
+ <entry>
+ <key>Returned by</key>
+ </entry>
+ <entry>
+ <key>Ticket was reopen by</key>
+ </entry>
+ <entry>
+ <key>Employee group already selected.</key>
+ </entry>
+ <entry>
+ <key>Ticket returned to pool</key>
+ </entry>
+ <entry>
+ <key>Employee already selected.</key>
+ </entry>
+ <entry>
+ <key>Original editor</key>
+ </entry>
+ <entry>
+ <key>Name has to be unique.</key>
+ </entry>
+ <entry>
+ <key>Ticket reopen</key>
+ </entry>
+ <entry>
+ <key>Employee for Employee groups</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonDashboard/Service/Service.aod b/neonDashboard/Service/Service.aod
index 87d9b5766d6414b9869669fe1cc0d5d521275567..bc8d08ea8f092bd3adf738f26afce47a44cecdff 100644
--- a/neonDashboard/Service/Service.aod
+++ b/neonDashboard/Service/Service.aod
@@ -6,6 +6,9 @@
<icon>VAADIN:AREA_SELECT</icon>
<dashboardType>PUBLIC</dashboardType>
<editRoles>
+ <element>PROJECT_ServiceAdmin</element>
+ <element>PROJECT_ServiceAgent</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
<element>INTERNAL_DESIGNER</element>
</editRoles>
<fixedDashlets v="true" />
@@ -31,15 +34,63 @@
</neonDashlet>
<neonDashlet>
<name>Dashlet3</name>
- <viewName>SupportTicketFilter_view</viewName>
- <configName>mytickets</configName>
+ <viewName>InboxTicketChart_view</viewName>
+ <configName>InboxTicketsChart</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="2" />
- <yPos v="5" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="4" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet4</name>
+ <viewName>TaskFilter_view</viewName>
+ <configName>DashletConfig</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="1" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="4" />
</uiConfiguration>
</neonDashlet>
+ <neonDashlet>
+ <name>Dashlet5</name>
+ <viewName>SupportTicketFilter_view</viewName>
+ <configName>myUnfinishedTickets</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="4" />
+ <colspan v="3" />
+ <rowspan v="4" />
+ </uiConfiguration>
+ <parameters>
+ <neonDashletParameter>
+ <name>BasedOnRoles_param</name>
+ <value>true</value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet6</name>
+ <viewName>SupportTicketFilter_view</viewName>
+ <configName>myFinishedTickets4Weeks</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="8" />
+ <colspan v="3" />
+ <rowspan v="4" />
+ </uiConfiguration>
+ <parameters>
+ <neonDashletParameter>
+ <name>BasedOnRoles_param</name>
+ <value>true</value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashlet>
</defaultDashlets>
</neonDashboard>
diff --git a/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod b/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
index 0254dcd151082f13187a0f2cb2173976f25cad8c..aa07f7be590bac5cc90cdcee42a29f781724bf88 100644
--- a/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
+++ b/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
@@ -6,7 +6,8 @@
<icon>VAADIN:CHART_TIMELINE</icon>
<dashboardType>PUBLIC</dashboardType>
<editRoles>
- <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_ServiceAdmin</element>
+ <element>PROJECT_ServiceAgent</element>
<element>INTERNAL_ADMINISTRATOR</element>
<element>INTERNAL_DESIGNER</element>
</editRoles>
@@ -16,22 +17,12 @@
<name>DashletInboxList</name>
<viewName>InboxFilter_view</viewName>
<configName>InboxList</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="2" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="6" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>DashletReporting</name>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
- <yPos v="0" />
- <colspan v="2" />
- <rowspan v="6" />
+ <yPos v="6" />
+ <colspan v="3" />
+ <rowspan v="4" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
@@ -41,7 +32,7 @@
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
- <yPos v="6" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="6" />
</uiConfiguration>
@@ -53,7 +44,7 @@
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="1" />
- <yPos v="6" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="6" />
</uiConfiguration>
@@ -65,7 +56,7 @@
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="2" />
- <yPos v="6" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="6" />
</uiConfiguration>
diff --git a/neonView/InboxFilter_view/InboxFilter_view.aod b/neonView/InboxFilter_view/InboxFilter_view.aod
index cf8707b5038dc41e20a00f57d5bbb14809810f4a..401566d988a01a8255b1493cc54218c50102e86b 100644
--- a/neonView/InboxFilter_view/InboxFilter_view.aod
+++ b/neonView/InboxFilter_view/InboxFilter_view.aod
@@ -11,7 +11,10 @@
<fragment>Inbox/filter</fragment>
<singleton v="false" />
<storeRoles>
- <element>PROJECT_ProjectManagement</element>
+ <element>PROJECT_ServiceAdmin</element>
+ <element>PROJECT_ServiceAgent</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ <element>INTERNAL_DESIGNER</element>
</storeRoles>
<icon>VAADIN:ENVELOPES_O</icon>
<categories>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index b37bfa90c06298d9f9b23811471aeb239f891195..ce7e05c377004a8736ec1c6a45f2257fba71fb81 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -5,25 +5,14 @@
<filterable v="true" />
<dashletConfigurations>
<neonDashletConfiguration>
- <name>myTicketsInWork</name>
+ <name>myUnfinishedTickets</name>
<title>Tickets in process</title>
- <description>Show my tickets that are in process</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJhYmdlc2NobG9zc2VuIiwia2V5IjoiRU5ERUQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiVEFTS19FRElUT1JfQ09OVEFDVF9JRCIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6IkljaCIsImtleSI6IiQkJGdsb2JhbC51c2VyLmNvbnRhY3RJZCQkJCIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%3D</fragment>
+ <description>Show my tickets that are in process.</description>
+ <fragment>SupportTicket/filter?hidden-columns=%23GROUPING&search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJhYmdlc2NobG9zc2VuIiwia2V5IjoiRU5ERUQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiVElDS0VUX0VESVRPUl9DT05UQUNUX0lEIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiSWNoIiwia2V5IjoiJCQkZ2xvYmFsLnVzZXIuY29udGFjdElkJCQkIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
<singleton v="true" />
<storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
+ <element>PROJECT_ServiceAdmin</element>
<element>PROJECT_ServiceAgent</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
</storeRoles>
<icon>VAADIN:EDIT</icon>
<categories>
@@ -34,123 +23,16 @@
</categories>
</neonDashletConfiguration>
<neonDashletConfiguration>
- <name>myWorkedTickets</name>
- <title>Resolved tickets</title>
- <description>Show resolved tickets</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImFiZ2VzY2hsb3NzZW4iLCJrZXkiOiJFTkRFRCIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX0VESVRPUl9DT05UQUNUX0lEIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiSWNoIiwia2V5IjoiJCQkZ2xvYmFsLnVzZXIuY29udGFjdElkJCQkIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
+ <name>myFinishedTickets4Weeks</name>
+ <title>Finished Tickets last 4 weeks</title>
+ <description>Show the finished Tickets in the last 4 weeks</description>
+ <fragment>SupportTicket/filter?hidden-columns=%23GROUPING&search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUSUNLRVRfRURJVE9SX0NPTlRBQ1RfSUQiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJJY2giLCJrZXkiOiIkJCRnbG9iYWwudXNlci5jb250YWN0SWQkJCQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiVEFTS19TVEFUVVMiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJhYmdlc2NobG9zc2VuIiwia2V5IjoiRU5ERUQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiREFURV9FTkQiLCJvcGVyYXRvciI6IlRJTUVGUkFNRV9QQVNUIiwidmFsdWUiOiI0IFdvY2hlbiIsImtleSI6IlJFTD1GSVhFRDtTVEFSVD1QLTI4RCIsImNvbnRlbnR0eXBlIjoiREFURSJ9XX0%3D</fragment>
<singleton v="true" />
- <requiresConfiguration v="false" />
<storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
+ <element>PROJECT_ServiceAdmin</element>
<element>PROJECT_ServiceAgent</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
</storeRoles>
- <icon>NEON:MQC</icon>
- <categories>
- <neonDashletCategory>
- <name>service</name>
- <title>Service</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>notFinishedTickets</name>
- <title>Unresolved tickets</title>
- <description>Show unresolved tickets</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJFcmxlZGlndCIsImtleSI6IkRPTkUgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJSw7xja2ZyYWdlIEludGVybiIsImtleSI6IklOVEVOQUxSRVBMWSAgICAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJSw7xja2ZyYWdlIiwia2V5IjoiUkVRVUVTVCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
- <singleton v="true" />
- <storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
- <element>PROJECT_ServiceAgent</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
- </storeRoles>
- <icon>VAADIN:EDIT</icon>
- <categories>
- <neonDashletCategory>
- <name>service</name>
- <title>Service</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>BasedOnRoles_param</name>
- <value>true</value>
- </neonDashletParameter>
- <neonDashletParameter>
- <name>InboxId_param</name>
- <value></value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>mytickets</name>
- <title>My Tickets</title>
- <description>Show tickets I am the editor of</description>
- <fragment>SupportTicket/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <storeRoles>
- <element>PROJECT_ServiceAgent</element>
- </storeRoles>
- <icon>VAADIN:TASKS</icon>
- <categories>
- <neonDashletCategory>
- <name>service</name>
- <title>Service</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>FilterOnlyOwnTicket_param</name>
- <value>true</value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>myOpenTickets</name>
- <title>Open Tickets</title>
- <description>Show Tickets in process</description>
- <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6IkVpbmdhbmciLCJrZXkiOiJFTlRSWSIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%3D</fragment>
- <singleton v="true" />
- <storeRoles>
- <element>PROJECT_FieldStaff</element>
- <element>PROJECT_HumanResources</element>
- <element>PROJECT_Marketing</element>
- <element>PROJECT_OfficeStaff</element>
- <element>PROJECT_ProjectManagement</element>
- <element>PROJECT_ServiceAgent</element>
- <element>PROJECT_Workflow</element>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_CANARY</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- <element>INTERNAL_DESIGNER</element>
- <element>INTERNAL_GROUPWARE</element>
- <element>INTERNAL_SNMP</element>
- <element>INTERNAL_TECHNICAL</element>
- <element>INTERNAL_WEBSERVICE</element>
- </storeRoles>
- <provider></provider>
- <icon>VAADIN:ENVELOPE_OPEN</icon>
+ <icon>VAADIN:CHECK_SQUARE_O</icon>
<categories>
<neonDashletCategory>
<name>service</name>