Skip to content

Commit

Permalink
some improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@rsoika
rsoika committed Mar 27, 2024
1 parent 0d06160 commit 8520f89
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 121 deletions.
8 changes: 6 additions & 2 deletions imixs-office-workflow-app/src/main/resources/bundle/messages_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ hourly=Stündlich
type=Typ
summary=Zusammenfassung



####################
# Month
####################
Expand Down Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions imixs-office-workflow-app/src/main/resources/bundle/messages_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ yearly=Yearly
daily=Daily
hourly=Hourly
type=Type


summary=Summary

####################
# Month
Expand Down Expand Up @@ -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
Expand Down
173 changes: 98 additions & 75 deletions imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist.xhtml
View file
Original file line number Diff line number Diff line change
@@ -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">


Expand All @@ -12,106 +10,133 @@
</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}">
<div class="imixs-header" style="">
<!-- *** 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}">
<ui:include src="worklist_viewentry.xhtml">
<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>
Expand All @@ -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>
Loading

0 comments on commit 8520f89

Please sign in to comment.