impl

issue #613
imixs · Nov 5, 2024 · 9ea8c9f · 9ea8c9f
1 parent 2da85ca
commit 9ea8c9f
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 16 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
@@ -256,9 +256,10 @@ worklist.date_range=Zeitraum
 worklist.date_range_help=Erstellt im Zeitraum
 worklist.sortorder=Sortierung
 worklist.sortorder_help=Trefferliste sortieren nach
-worklist.sortorder_relevance=Relevanz
-worklist.sortorder_newest=Neueste
-worklist.sortorder_oldest=Älteste
+worklist.sortorder_relevance=nach Relevanz
+worklist.sortorder_lastupdate=nach Aktualiät
+worklist.sortorder_newest=Neueste zuerst
+worklist.sortorder_oldest=Älteste zuerst
 
 
 

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
@@ -256,9 +256,10 @@ worklist.date_range=Date
 worklist.date_range_help=Created between
 worklist.sortorder=Sort by
 worklist.sortorder_help=Sort Search Result
-worklist.sortorder_relevance=Relevance
-worklist.sortorder_newest=Newest first
-worklist.sortorder_oldest=Oldest first
+worklist.sortorder_relevance=relevance
+worklist.sortorder_lastupdate=last update
+worklist.sortorder_newest=newest first
+worklist.sortorder_oldest=oldest first
 
 
 

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
@@ -81,6 +81,8 @@
 										value="#{searchController.searchFilter.item['sortorder']}">
 										<f:selectItem itemValue=""
 											itemLabel="#{message['worklist.sortorder_relevance']}" />
+										<f:selectItem itemValue="3"
+											itemLabel="#{message['worklist.sortorder_lastupdate']}" />
 										<f:selectItem itemValue="1"
 											itemLabel="#{message['worklist.sortorder_newest']}" />
 										<f:selectItem itemValue="2"

diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist_viewentry.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist_viewentry.xhtml
@@ -42,13 +42,20 @@
 
 		<div class="owner-block">
 			<div class="owner-details">
-				<!-- modified -->
+				<!-- created / modified -->
 				<div class="owner-details-row">
-					<h:outputText value="#{userController.getUserName(workitem.item['$Editor'])} - " />
+					<strong>#{message.modified} </strong>
 					<h:outputText value="#{workitem.item['$lasteventdate']}" style="font-weight: normal;">
-						<f:convertDateTime timeZone="#{message.timeZone}" pattern="#{message.dateTimePatternLong}" />
+						<f:convertDateTime timeZone="#{message.timeZone}" pattern="#{message.dateTimePattern}" />
 					</h:outputText>
 				</div>
+				<div class="owner-details-row">
+					<strong>#{message.created} </strong>
+					<h:outputText value="#{workitem.item['$created']}" style="font-weight: normal;">
+						<f:convertDateTime timeZone="#{message.timeZone}" pattern="#{message.dateTimePattern}" />
+					</h:outputText>
+				</div>
+
 				<!-- display owner -->
 				<h:panelGroup layout="block" rendered="#{! empty workitem.item['$owner']}" class="owner-details-row">
 					<ui:repeat value="#{workitem.itemList['$owner']}" var="name">

diff --git a/...-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java b/...-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java
@@ -231,15 +231,20 @@ public void init() {
 
     }
 
-    // private String query = null;
-
+    /**
+     * 3 = by last update
+     * 1 = by created
+     * 2 = by created
+     */
     @Override
     public String getSortBy() {
 
         if ("1".equals(this.getSearchFilter().getItemValueString("sortorder"))
-                || "2".equals(this.getSearchFilter().getItemValueString("sortorder"))
-
-        ) {
+                || "2".equals(this.getSearchFilter().getItemValueString("sortorder"))) {
+            return "$created";
+        }
+        if ("3".equals(this.getSearchFilter().getItemValueString("sortorder"))
+                || "4".equals(this.getSearchFilter().getItemValueString("sortorder"))) {
             return "$lasteventdate";
         }
         return super.getSortBy();
@@ -257,10 +262,12 @@ public String getTitle() {
     @Override
     public boolean isSortReverse() {
 
-        if ("2".equals(this.getSearchFilter().getItemValueString("sortorder"))) {
+        if ("2".equals(this.getSearchFilter().getItemValueString("sortorder"))
+                || "4".equals(this.getSearchFilter().getItemValueString("sortorder"))) {
             return false;
         }
-        if ("1".equals(this.getSearchFilter().getItemValueString("sortorder"))) {
+        if ("1".equals(this.getSearchFilter().getItemValueString("sortorder"))
+                || "3".equals(this.getSearchFilter().getItemValueString("sortorder"))) {
             return true;
         }