From 8520f8957ff3de7a479ffe7bd59894fb93e97ddd Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Wed, 27 Mar 2024 11:51:04 +0100
Subject: [PATCH] some improvements

---
 .../resources/bundle/messages_de.properties   |   8 +-
 .../resources/bundle/messages_en.properties   |   9 +-
 .../webapp/pages/workitems/worklist.xhtml     | 173 ++++++++++--------
 .../pages/workitems/worklist_header.xhtml     |  67 +++----
 .../office/views/SearchController.java        |   5 +-
 pom.xml                                       |   6 +-
 6 files changed, 147 insertions(+), 121 deletions(-)

diff --git a/imixs-office-workflow-app/src/main/resources/bundle/messages_de.properties b/imixs-office-workflow-app/src/main/resources/bundle/messages_de.properties
index 9bc9ed3b..12228a53 100644
--- a/imixs-office-workflow-app/src/main/resources/bundle/messages_de.properties
+++ b/imixs-office-workflow-app/src/main/resources/bundle/messages_de.properties
@@ -149,8 +149,6 @@ hourly=Stündlich
 type=Typ
 summary=Zusammenfassung
 
-
-
 ####################
 # Month
 ####################
@@ -238,6 +236,12 @@ worklist.all=Alle
 worklist.in_progress=in Bearbeitung
 worklist.archive=Archiv
 worklist.archive_selection=Nur archivierte Vorgänge anzeigen
+worklist.type=Vorgänge
+worklist.type_workitem=Aktuell in Bearbeitung
+worklist.type_workitemarchive=Archiviert
+worklist.tasklist_by=Aufgaben von
+worklist.created_by=Erstellt von
+worklist.edited_by=Bearbeitet von
 worklist.deletions=Gelöscht
 worklist.search_phrase=Suchbegriff
 worklist.workflowgroup=Workflow
diff --git a/imixs-office-workflow-app/src/main/resources/bundle/messages_en.properties b/imixs-office-workflow-app/src/main/resources/bundle/messages_en.properties
index 1c3f4400..0be7f3c3 100644
--- a/imixs-office-workflow-app/src/main/resources/bundle/messages_en.properties
+++ b/imixs-office-workflow-app/src/main/resources/bundle/messages_en.properties
@@ -147,8 +147,7 @@ yearly=Yearly
 daily=Daily
 hourly=Hourly
 type=Type
-
-
+summary=Summary
 
 ####################
 # Month
@@ -237,6 +236,12 @@ worklist.all=All
 worklist.in_progress=in progress
 worklist.archive=Archive
 worklist.archive_selection=Show archive only
+worklist.type=Requests
+worklist.type_workitem=Currently in progress
+worklist.type_workitemarchive=Archived
+worklist.tasklist_by=Tasks of
+worklist.created_by=Created by
+worklist.edited_by=Edited by
 worklist.deletions=Deleted
 worklist.search_phrase=Search phrase
 worklist.workflowgroup=Workflow
diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist.xhtml
index 3f68b3ba..a8cd412a 100644
--- a/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist.xhtml
+++ b/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist.xhtml
@@ -1,7 +1,5 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	template="/layout/template.xhtml">
 
 
@@ -12,43 +10,46 @@
 		</f:metadata>
 	</h:head>
 
-	
+
 	<ui:define name="scripts">
 		<script type="text/javascript"
 			src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.worklist.js?build=#{app.application_build_timestamp}"></script>
 		<script type="text/javascript"
 			src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.worklist.custom.js?build=#{app.application_build_timestamp}"></script>
 	</ui:define>
-		
-	
+
+
 
 	<ui:define name="content">
 		<f:view>
 			<h:form>
 				<ui:param name="searchresult" value="#{viewHandler.getData(searchController)}"></ui:param>
 				<ui:param name="searchresultCount" value="#{searchController.getCount()}"></ui:param>
-				
-				
-				<h:panelGroup styleClass="imixs-view imixs-search" layout="block" id="serach_view">				
-				
-				
+
+
+				<h:panelGroup styleClass="imixs-view imixs-search" layout="block" id="serach_view">
+
+
 					<div class="imixs-header">
 						<h1 id="worklist-title">
 							<!-- Back Link to board -->
 							<ui:fragment rendered="#{!empty searchController.process}">
-								<h:link outcome="/pages/notes_board?processref=#{searchController.process.uniqueID}"><span class="typcn typcn-th-large-outline" style="margin-right:5px;"></span></h:link>
+								<h:link outcome="/pages/notes_board?processref=#{searchController.process.uniqueID}">
+									<span class="typcn typcn-th-large-outline" style="margin-right:5px;"></span>
+								</h:link>
 								<h:outputText value="#{searchController.process.item['Name']}" />
 							</ui:fragment>
 							<!-- Search -->
 							<ui:fragment rendered="#{empty searchController.process}">
 								<h:outputText value="#{message.search}" />
-								<h:outputText rendered="#{!empty searchController.title}" value=" » #{searchController.title}" />
-								</ui:fragment>
+								<h:outputText rendered="#{!empty searchController.title}"
+									value=" » #{searchController.title}" />
+							</ui:fragment>
 						</h1>
 					</div>
-				
-				
-				
+
+
+
 					<div class="imixs-body">
 						<!-- *** Header **** -->
 						<ui:fragment rendered="#{empty searchController.defaultQuery}">
@@ -56,43 +57,68 @@
 								<!-- *** Header **** -->
 								<ui:include src="/pages/workitems/worklist_header.xhtml" />
 							</div>
-							</ui:fragment>
-							
-							
-							<div class="imixs-view-submit-panel">
-								<!-- Search Button and Search Order -->
-							
-							
-								<h:commandButton value="#{message.search}" action="#{searchController.refreshSearch()}">
-									<f:ajax render="@form" execute="@form" onevent="updateSearchForm" />
-								</h:commandButton>
-								<h:commandButton value="#{message.reset}" action="#{searchController.resetSearch()}">
-									<f:ajax render="@form" execute="@form" onevent="updateSearchForm" />
-								</h:commandButton>
-							
-								<!-- Sort Order -->
-								<div style="float: right; padding: 0 10px;" class="pull-right ui-button ui-widget ui-state-default ui-corner-all">
-									<h:outputText title="#{message['worklist.sortorder_help']}" value="#{message['worklist.sortorder']}: " />
-									<h:selectOneMenu style="background:#fff;" value="#{searchController.searchFilter.item['sortorder']}">
-										<f:selectItem itemValue="" itemLabel="#{message['worklist.sortorder_relevance']}" />
-										<f:selectItem itemValue="1" itemLabel="#{message['worklist.sortorder_newest']}" />
-										<f:selectItem itemValue="2" itemLabel="#{message['worklist.sortorder_oldest']}" />
-										<f:ajax event="change" render="@form" listener="#{searchController.refreshSearch}"
+						</ui:fragment>
+
+
+						<div class="imixs-view-submit-panel">
+							<!-- Search Button and Search Order -->
+
+
+							<h:commandButton value="#{message.search}" action="#{searchController.refreshSearch()}">
+								<f:ajax render="@form" execute="@form" onevent="updateSearchForm" />
+							</h:commandButton>
+							<h:commandButton value="#{message.reset}" action="#{searchController.resetSearch()}">
+								<f:ajax render="@form" execute="@form" onevent="updateSearchForm" />
+							</h:commandButton>
+
+							<!-- Sort Order -->
+							<div class="pull-right ">
+								<div class=" ui-button ui-widget ui-state-default ui-corner-all"
+									style="padding: 0 10px;">
+									<h:outputText title="#{message['worklist.sortorder_help']}"
+										value="#{message['worklist.sortorder']}: " />
+									<h:selectOneMenu style="background:#fff;"
+										value="#{searchController.searchFilter.item['sortorder']}">
+										<f:selectItem itemValue=""
+											itemLabel="#{message['worklist.sortorder_relevance']}" />
+										<f:selectItem itemValue="1"
+											itemLabel="#{message['worklist.sortorder_newest']}" />
+										<f:selectItem itemValue="2"
+											itemLabel="#{message['worklist.sortorder_oldest']}" />
+										<f:ajax event="change" render="@form"
+											listener="#{searchController.refreshSearch}"
 											onevent="imixsOfficeMain.layoutAjaxEvent" />
 									</h:selectOneMenu>
 								</div>
+								<h:commandButton actionListener="#{viewHandler.back(searchController)}"
+									style="height: 31px;" disabled="#{searchController.pageIndex==0}"
+									value="◀◀  #{message.prev}">
+									<f:ajax render="serach_view"
+										onevent="function(data) { imixsOfficeMain.layoutAjaxEvent(data, '#{component.parent.parent.clientId}') }" />
+								</h:commandButton>
+								<h:commandButton actionListener="#{viewHandler.forward(searchController)}"
+									style="height: 31px;" disabled="#{searchController.endOfList}"
+									value="#{message.next}  ▶▶">
+									<f:ajax render="serach_view"
+										onevent="function(data) { imixsOfficeMain.layoutAjaxEvent(data, '#{component.parent.parent.clientId}') }" />
+								</h:commandButton>
+
+
+							</div>
 
 						</div>
 
 
 						<ui:param name="noresult"
-							value="#{(empty searchresult) and (empty searchController.searchFilter.item['phrase'])}"></ui:param>
-	
+							value="#{(empty searchresult) and (empty searchController.searchFilter.item['phrase'])}">
+						</ui:param>
+
 						<ui:fragment rendered="#{!noresult}">
 							<h:panelGroup layout="block" id="worklist-body">
-							
-							
-								<div class="search-result-summary">#{message.total_result} #{searchresultCount} #{message.serach_hits}</div>
+
+
+								<div class="search-result-summary">#{message.total_result} #{searchresultCount}
+									#{message.serach_hits}</div>
 
 								<!-- display search result  -->
 								<ui:repeat var="workitem" value="#{searchresult}">
@@ -100,18 +126,17 @@
 										<ui:param name="workitem" value="#{workitem}" />
 									</ui:include>
 								</ui:repeat>
-	
-	
+
+
 								<!-- display empty search result  -->
 								<h:panelGroup
 									rendered="#{(empty searchresult) and (empty facesContext.maximumSeverity)}">
 									<h2>#{message.empty_worklist}</h2>
 								</h:panelGroup>
-	
-	
+
+
 								<!-- display parsing error -->
-								<h:panelGroup rendered="#{! empty facesContext.maximumSeverity}"
-									styleClass="ui-widget">
+								<h:panelGroup rendered="#{! empty facesContext.maximumSeverity}" styleClass="ui-widget">
 									<div class="ui-state-error"
 										style="padding: .7em; margin-bottom: .7em; border: none;">
 										<h3>
@@ -124,35 +149,33 @@
 									</div>
 								</h:panelGroup>
 							</h:panelGroup>
-	
-	
+
+
 							<div class="imixs-footer">
-								<h:commandButton actionListener="#{viewHandler.back(searchController)}"
-									disabled="#{searchController.pageIndex==0}" value="#{message.prev}">
-									<f:ajax render="serach_view"
-									onevent="function(data) { imixsOfficeMain.layoutAjaxEvent(data, '#{component.parent.parent.clientId}') }"
-										 />
-								</h:commandButton>
-								<h:commandButton actionListener="#{viewHandler.forward(searchController)}"
-									disabled="#{searchController.endOfList}" value="#{message.next}">
-									
-									<f:ajax render="serach_view"
-									onevent="function(data) { imixsOfficeMain.layoutAjaxEvent(data, '#{component.parent.parent.clientId}') }"
-										 />
-						
-								</h:commandButton>
+								<div class="pull-right ">
+									<h:commandButton actionListener="#{viewHandler.back(searchController)}"
+										disabled="#{searchController.pageIndex==0}" value="◀◀  #{message.prev}">
+										<f:ajax render="serach_view"
+											onevent="function(data) { imixsOfficeMain.layoutAjaxEvent(data, '#{component.parent.parent.clientId}') }" />
+									</h:commandButton>
+									<h:commandButton actionListener="#{viewHandler.forward(searchController)}"
+										disabled="#{searchController.endOfList}" value="#{message.next}  ▶▶">
+										<f:ajax render="serach_view"
+											onevent="function(data) { imixsOfficeMain.layoutAjaxEvent(data, '#{component.parent.parent.clientId}') }" />
+									</h:commandButton>
+								</div>
 							</div>
-	
+
 						</ui:fragment>
-	
+
 					</div>
 				</h:panelGroup>
-				
+
 			</h:form>
 		</f:view>
-		
-		
-		
-	
+
+
+
+
 	</ui:define>
-</ui:composition>
+</ui:composition>
\ No newline at end of file
diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist_header.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist_header.xhtml
index cefbc709..0e9d5992 100644
--- a/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist_header.xhtml
+++ b/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist_header.xhtml
@@ -1,27 +1,23 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
-	xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
-	xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
+	xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs">
+
 
 
-		
 	<!-- Marty User Search Integration -->
 	<marty:userSearch />
-	
-	
+
+
 	<!-- show filter section only in core process selection -->
-		<c:if test="#{!empty searchController.process}">
-			<ui:include src="/pages/workitems/worklist_filter.xhtml" />
-		</c:if>
-	
+	<c:if test="#{!empty searchController.process}">
+		<ui:include src="/pages/workitems/worklist_filter.xhtml" />
+	</c:if>
+
 	<h:panelGroup id="worklist_filter_panel">
 		<div style="clear: both;" />
 
-	
+
 		<div class="imixs-form-section-3">
 			<!-- date range -->
 			<dl>
@@ -30,50 +26,47 @@
 						value="#{message['worklist.date_range']}: " />
 				</dt>
 				<dd>
-					<h:inputText
-						value="#{searchController.searchFilter.item['date.from']}"
+					<h:inputText value="#{searchController.searchFilter.item['date.from']}"
 						title="#{message['worklist.date_range_help']}" class="imixs-date">
-						<f:convertDateTime pattern="#{message.datePatternShort}"
-							timeZone="#{message.timeZone}" />
+						<f:convertDateTime pattern="#{message.datePatternShort}" timeZone="#{message.timeZone}" />
 					</h:inputText>
 					-
-					<h:inputText
-						value="#{searchController.searchFilter.item['date.to']}"
+					<h:inputText value="#{searchController.searchFilter.item['date.to']}"
 						title="#{message['worklist.date_range_help']}" class="imixs-date">
-						<f:convertDateTime pattern="#{message.datePatternShort}"
-							timeZone="#{message.timeZone}" />
+						<f:convertDateTime pattern="#{message.datePatternShort}" timeZone="#{message.timeZone}" />
 					</h:inputText>
 				</dd>
 			</dl>
 
 			<!-- by owner/creator -->
 			<dl>
-				<dt><h:selectOneRadio value="#{searchController.searchFilter.itemListArray['usermode']}">
-						<f:selectItem itemLabel="#{message['currenteditor']}" itemValue="owner" />
-						<f:selectItem itemLabel="#{message['participants']}" itemValue="participant" />
-						<f:selectItem itemLabel="#{message['creator']}" itemValue="creator" />
-						<f:ajax event="change" execute="@form" render="@form" listener="#{searchController.refreshSearch}"
-							onevent="updateSearchForm"  /> 
+				<dt>
+					<h:selectOneRadio value="#{searchController.searchFilter.itemListArray['usermode']}">
+						<f:selectItem itemLabel="#{message['worklist.tasklist_by']}" itemValue="owner" />
+						<f:selectItem itemLabel="#{message['worklist.edited_by']}" itemValue="participant" />
+						<f:selectItem itemLabel="#{message['worklist.created_by']}" itemValue="creator" />
+						<f:ajax event="change" execute="@form" render="@form"
+							listener="#{searchController.refreshSearch}" onevent="updateSearchForm" />
 					</h:selectOneRadio>
 				</dt>
 				<dd>
 					<marty:userInput value="#{searchController.searchFilter.item['user']}" editmode="true" />
 				</dd>
 			</dl>
-			
+
 
 
 			<!-- archive -->
 			<dl>
-				<dt>#{message['worklist.archive']}:</dt>
+				<dt>#{message['worklist.type']}:</dt>
 				<dd>
-
-					<h:selectManyCheckbox id="view_filter" 
+					<h:selectManyCheckbox id="view_filter"
 						value="#{searchController.searchFilter.itemListArray['type']}">
-						<f:selectItem itemLabel="#{message['worklist.archive_selection']}"
+						<f:selectItem itemLabel="#{message['worklist.type_workitem']}" itemValue="workitem" />
+						<f:selectItem itemLabel="#{message['worklist.type_workitemarchive']}"
 							itemValue="workitemarchive" />
-						<f:ajax event="change" execute="@form" render="@form" listener="#{searchController.refreshSearch}"
-							onevent="updateSearchForm"  /> 
+						<f:ajax event="change" execute="@form" render="@form"
+							listener="#{searchController.refreshSearch}" onevent="updateSearchForm" />
 					</h:selectManyCheckbox>
 				</dd>
 			</dl>
diff --git a/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java b/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java
index d13713ab..8771484b 100644
--- a/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java
+++ b/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java
@@ -393,9 +393,8 @@ public String getQuery() {
 
         List<String> typeList = searchFilter.getItemValue("Type");
         if (typeList.isEmpty() || "".equals(typeList.get(0))) {
-            // typeList = Arrays.asList(new String[] { "workitem", "workitemarchive" });
             // default restrict to workitem
-            typeList = Arrays.asList(new String[] { "workitem" });
+            typeList = Arrays.asList(new String[] { "workitem", "workitemarchive" });
         }
 
         // convert type list into comma separated list
@@ -505,7 +504,7 @@ public String getQuery() {
             SearchEvent event = new SearchEvent(searchFilter, SearchEvent.ON_QUERY);
             searchEvents.fire(event); // extend query
             String customQuery = event.getQuery();
-            if (customQuery!=null && !customQuery.isEmpty()) {
+            if (customQuery != null && !customQuery.isEmpty()) {
                 if (!customQuery.trim().endsWith("AND")) {
                     customQuery = customQuery + " AND";
                 }
diff --git a/pom.xml b/pom.xml
index 202d61b8..820bedaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.imixs.workflow</groupId>
 	<artifactId>imixs-office-workflow</artifactId>
@@ -83,7 +85,7 @@
 
 		<!-- Dependency Versions -->
 		<jakarta.version>10.0.0</jakarta.version>
-		<org.imixs.workflow.version>6.0.4</org.imixs.workflow.version>
+		<org.imixs.workflow.version>6.0.6-SNAPSHOT</org.imixs.workflow.version>
 		<org.imixs.archive.version>3.0.1</org.imixs.archive.version>
 		<org.imixs.office.version />
 		<org.imixs.marty.version>5.0.0</org.imixs.marty.version>