impl

Issue #600
imixs · Sep 6, 2024 · a73caae · a73caae
1 parent 7efe031
commit a73caae
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 45 deletions.
diff --git a/imixs-office-workflow-app/src/main/webapp/pages/monitoring_board.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/monitoring_board.xhtml
@@ -98,10 +98,7 @@
 
 
 					<div class="imixs-body" style="margin-left: 10px;">
-
-
 						<!-- *** Chart Overview -->
-
 						<div class="monitoring-section">
 							<h2>Monitoring
 								<a href="javascript:imixsOfficeMonitor.initMainWorkflowCharts();"
@@ -111,34 +108,27 @@
 									style="margin-left:16px;" title="Table View"><span
 										class="typcn typcn-th-list-outline"></span></a>
 
-
-
-								<!-- date range
+								<!-- date range -->
 								<span class="imixs-form-section-3" style="font-size: 14px;margin-left: 50px;">
-									
-									<f:ajax render="@form">
-										<strong>#{message['worklist.date_range']}: </strong>
-										<h:inputText value="#{monitorController.filter.item['date.from']}"
-											title="#{message['worklist.date_range_help']}" class="imixs-date">
-											<f:convertDateTime pattern="#{message.datePatternShort}"
-												timeZone="#{message.timeZone}" />
-										</h:inputText>
-										-
-										<h:inputText value="#{monitorController.filter.item['date.to']}"
-											title="#{message['worklist.date_range_help']}" class="imixs-date">
-											<f:convertDateTime pattern="#{message.datePatternShort}"
-												timeZone="#{message.timeZone}" />
-										</h:inputText>
-
-										<h:commandLink actionListener="#{monitorController.reset()}"
-											styleClass="imixs-portlet-refresh" title="#{message.refresh}"
-											style="font-size: 24px;margin-left: 10px;"><span
-												class="typcn typcn-arrow-sync"></span>
-
-										</h:commandLink>
-									</f:ajax>
+									<strong>#{message['worklist.date_range']}: </strong>
+									<h:inputText value="#{monitorController.filter.item['date.from']}"
+										title="#{message['worklist.date_range_help']}" class="imixs-date">
+										<f:convertDateTime pattern="#{message.datePatternShort}"
+											timeZone="#{message.timeZone}" />
+									</h:inputText>
+									-
+									<h:inputText value="#{monitorController.filter.item['date.to']}"
+										title="#{message['worklist.date_range_help']}" class="imixs-date">
+										<f:convertDateTime pattern="#{message.datePatternShort}"
+											timeZone="#{message.timeZone}" />
+									</h:inputText>
+									<h:commandLink actionListener="#{monitorController.refresh()}"
+										styleClass="imixs-portlet-refresh" title="#{message.refresh}"
+										style="font-size: 24px;margin-left: 5px;"><span
+											class="typcn typcn-arrow-sync"></span>
+									</h:commandLink>
 								</span>
-								 -->
+
 							</h2>
 							<div class="monitoring-container">
 
@@ -151,7 +141,6 @@
 									</div>
 								</ui:repeat>
 
-
 							</div>
 						</div>
 

diff --git a/...office-workflow-util/src/main/java/org/imixs/workflow/office/views/MonitorController.java b/...office-workflow-util/src/main/java/org/imixs/workflow/office/views/MonitorController.java
@@ -87,7 +87,6 @@ public class MonitorController implements Serializable {
 
     public MonitorController() {
         super();
-        filter = new ItemCollection();
     }
 
     /**
@@ -105,7 +104,6 @@ public void init() {
         workflowGroups = modelService.getGroups();
         // reset borad stats...
         reset();
-
     }
 
     public ItemCollection getFilter() {
@@ -173,20 +171,8 @@ public long countTotalWorkitems(String group) {
      * 
      */
     public void reset() {
-        // initalize the task list...
-        buildBoardCategories();
-
-        // find active groups..
-        activeWorkflowGroups = new ArrayList<String>();
-        for (BoardCategory cat : boardCategories) {
-            if (!activeWorkflowGroups.contains(cat.getWorkflowGroup())) {
-                activeWorkflowGroups.add(cat.getWorkflowGroup());
-            }
-        }
-
-        // sort active workflowGroups
-        Collections.sort(activeWorkflowGroups);
         filter = new ItemCollection();
+        refresh();
     }
 
     /**