Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update archvie

Browse source
This commit is contained in:
Ralph Soika 2024-04-03 15:23:20 +02:00
parent 6cafc831ec
commit 60af5af539
7 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java
View file

@ -32,7 +32,7 @@ import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.SessionScoped;
import javax.enterprise.event.Observes; import javax.enterprise.event.Observes;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
@ -51,7 +51,7 @@ import org.imixs.workflow.office.views.SearchEvent;
*/ */
@Named @Named
@ConversationScoped @SessionScoped
public class CustomSearchController implements Serializable { public class CustomSearchController implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -182,7 +182,7 @@ public class CustomSearchController implements Serializable {
} }
} }
logger.info(query); logger.fine("Custom Query=" + query);
// Udpate query // Udpate query
searchEvent.setQuery(query); searchEvent.setQuery(query);

1
office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties
View file

@ -32,6 +32,7 @@ invoicenumber=Rechnungsnummer
invoicedate=Rechnungsdatum invoicedate=Rechnungsdatum
invoiceduedate=Fälligkeit invoiceduedate=Fälligkeit
invoiceamount=Rechnungsbetrag invoiceamount=Rechnungsbetrag
invoicecurrency=Währung
payment_type=Zahlungsart payment_type=Zahlungsart
sequencenumber=Belegnummer sequencenumber=Belegnummer
amount=Betrag amount=Betrag

1
office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties
View file

@ -32,6 +32,7 @@ invoicenumber=Invoice No.
invoicedate=Invoice Date invoicedate=Invoice Date
invoiceduedate=Due Date invoiceduedate=Due Date
invoiceamount=Invoice amount invoiceamount=Invoice amount
invoicecurrency=Currency
payment_type=Payment Type payment_type=Payment Type
sequencenumber=Request No. sequencenumber=Request No.
amount=Amount amount=Amount

16
office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml
View file

@ -2,7 +2,6 @@
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
template="/layout/template.xhtml"> template="/layout/template.xhtml">
<h:head> <h:head>
<!-- init search controller --> <!-- init search controller -->
<f:metadata> <f:metadata>
@ -11,7 +10,6 @@
</f:metadata> </f:metadata>
</h:head> </h:head>
<ui:define name="scripts"> <ui:define name="scripts">
<script type="text/javascript" <script type="text/javascript"
src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.worklist.js?build=#{app.application_build_timestamp}"></script> src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.worklist.js?build=#{app.application_build_timestamp}"></script>
@ -19,9 +17,8 @@
src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.worklist.custom.js?build=#{app.application_build_timestamp}"></script> src="#{facesContext.externalContext.requestContextPath}/js/imixs-office.worklist.custom.js?build=#{app.application_build_timestamp}"></script>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<ui:include src="/pages/error_message.xhtml" />
<f:view> <f:view>
<h:form> <h:form>
<ui:param name="searchresult" value="#{viewHandler.getData(searchController)}"></ui:param> <ui:param name="searchresult" value="#{viewHandler.getData(searchController)}"></ui:param>
@ -35,8 +32,6 @@
</h1> </h1>
</div> </div>
<div class="imixs-body"> <div class="imixs-body">
<!-- *** Header **** --> <!-- *** Header **** -->
<ui:fragment rendered="#{empty searchController.defaultQuery}"> <ui:fragment rendered="#{empty searchController.defaultQuery}">
@ -46,14 +41,10 @@
</div> </div>
</ui:fragment> </ui:fragment>
<div class="imixs-view-submit-panel"> <div class="imixs-view-submit-panel">
<!-- Search Button and Search Order --> <!-- Search Button and Search Order -->
<h:commandButton value="#{message.search}" <h:commandButton value="#{message.search}"
action="#{customSearchController.refreshAGLArchive()}"> action="#{customSearchController.refreshAGLArchive()}">
<f:ajax render="@form" execute="@form" onevent="updateSearchForm" />
</h:commandButton> </h:commandButton>
<h:commandButton value="#{message.reset}" action="#{customSearchController.resetSearch()}"> <h:commandButton value="#{message.reset}" action="#{customSearchController.resetSearch()}">
<f:ajax render="@form" execute="@form" onevent="updateSearchForm" /> <f:ajax render="@form" execute="@form" onevent="updateSearchForm" />
@ -70,11 +61,10 @@
<f:selectItem itemValue="1" itemLabel="#{message['worklist.sortorder_newest']}" /> <f:selectItem itemValue="1" itemLabel="#{message['worklist.sortorder_newest']}" />
<f:selectItem itemValue="2" itemLabel="#{message['worklist.sortorder_oldest']}" /> <f:selectItem itemValue="2" itemLabel="#{message['worklist.sortorder_oldest']}" />
<f:ajax event="change" render="@form" <f:ajax event="change" render="@form"
listener="#{customSearchController.refreshSearch}" listener="#{customSearchController.refreshAGLArchive}"
onevent="imixsOfficeMain.layoutAjaxEvent" /> onevent="imixsOfficeMain.layoutAjaxEvent" />
</h:selectOneMenu> </h:selectOneMenu>
</div> </div>
</div> </div>
@ -85,7 +75,6 @@
<ui:fragment rendered="#{!noresult}"> <ui:fragment rendered="#{!noresult}">
<h:panelGroup layout="block" id="worklist-body"> <h:panelGroup layout="block" id="worklist-body">
<div class="search-result-summary">#{message.total_result} #{searchresultCount} <div class="search-result-summary">#{message.total_result} #{searchresultCount}
#{message.serach_hits}</div> #{message.serach_hits}</div>
@ -96,7 +85,6 @@
</ui:include> </ui:include>
</ui:repeat> </ui:repeat>
<!-- display empty search result --> <!-- display empty search result -->
<h:panelGroup <h:panelGroup
rendered="#{(empty searchresult) and (empty facesContext.maximumSeverity)}"> rendered="#{(empty searchresult) and (empty facesContext.maximumSeverity)}">

11
office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml
View file

@ -36,11 +36,10 @@
</div> </div>
<div class="invioce-div2"> <div class="invioce-div2">
<dt>#{custom.invoicecurrency}:</dt>
<dt>Währung:</dt>
<dd> <dd>
<h:inputText value="#{searchController.searchFilter.item['invoice.currency']}" <h:inputText value="#{searchController.searchFilter.item['invoice.currency']}"
id="currencyinput_id" pt:autocomplete="off" pt:list="autocomplete-currency" required="false" id="currencyinput_id" pt:autocomplete="off" pt:list="autocomplete-currency"
style="width:70px;text-transform: uppercase;"> style="width:70px;text-transform: uppercase;">
</h:inputText> </h:inputText>
<datalist id="autocomplete-currency"> <datalist id="autocomplete-currency">
@ -57,8 +56,6 @@
</div> </div>
</div> </div>
</dl> </dl>
<dl> <dl>
<dt>#{custom.invoicedate}:</dt> <dt>#{custom.invoicedate}:</dt>
@ -77,7 +74,6 @@
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>#{custom.closingdate}:</dt> <dt>#{custom.closingdate}:</dt>
<dd> <dd>
@ -105,14 +101,13 @@
</h:inputText> </h:inputText>
</dd> </dd>
</dl> </dl>
</div> </div>
<div class="imixs-form-section-3"> <div class="imixs-form-section-3">
<dl> <dl>
<dt>#{custom.payment_type}:</dt> <dt>#{custom.payment_type}:</dt>
<dd> <dd>
<h:selectOneMenu required="true" value="#{searchController.searchFilter.item['payment.type']}"> <h:selectOneMenu value="#{searchController.searchFilter.item['payment.type']}">
<f:selectItem itemLabel=" " itemValue=" " /> <f:selectItem itemLabel=" " itemValue=" " />
<c:forEach items="#{sepaController.dbtrList}" var="dbtr"> <c:forEach items="#{sepaController.dbtrList}" var="dbtr">
<f:selectItem itemLabel="#{dbtr.item['name']}" itemValue="#{dbtr.item['name']}" /> <f:selectItem itemLabel="#{dbtr.item['name']}" itemValue="#{dbtr.item['name']}" />

4
reports/sepa/result_sepa01.xml
View file

@ -6,7 +6,7 @@
<CstmrCdtTrfInitn> <CstmrCdtTrfInitn>
<GrpHdr> <GrpHdr>
<MsgId>bf073e72asdf512c4d60af7740872036</MsgId> <MsgId>bf073e72asdf512c4d60af7740872036</MsgId>
<CreDtTm>2024-03-21T12:16:05</CreDtTm> <CreDtTm>2024-04-03T15:17:47</CreDtTm>
<NbOfTxs>3</NbOfTxs> <NbOfTxs>3</NbOfTxs>
<CtrlSum>655.90</CtrlSum> <CtrlSum>655.90</CtrlSum>
<InitgPty> <InitgPty>
@ -23,7 +23,7 @@
<Cd>SEPA</Cd> <Cd>SEPA</Cd>
</SvcLvl> </SvcLvl>
</PmtTpInf> </PmtTpInf>
<ReqdExctnDt>2024-03-21</ReqdExctnDt> <ReqdExctnDt>2024-04-03</ReqdExctnDt>
<Dbtr> <Dbtr>
<Nm>Targo Bank</Nm> <Nm>Targo Bank</Nm>
</Dbtr> </Dbtr>

4
reports/sepa/result_sepa02.xml
View file

@ -6,7 +6,7 @@
<CstmrCdtTrfInitn> <CstmrCdtTrfInitn>
<GrpHdr> <GrpHdr>
<MsgId>bf073e72asdf512c4d60af7740872036</MsgId> <MsgId>bf073e72asdf512c4d60af7740872036</MsgId>
<CreDtTm>2024-03-21T12:16:05</CreDtTm> <CreDtTm>2024-04-03T15:17:47</CreDtTm>
<NbOfTxs>3</NbOfTxs> <NbOfTxs>3</NbOfTxs>
<CtrlSum>655.90</CtrlSum> <CtrlSum>655.90</CtrlSum>
<InitgPty> <InitgPty>
@ -23,7 +23,7 @@
<Cd>SEPA</Cd> <Cd>SEPA</Cd>
</SvcLvl> </SvcLvl>
</PmtTpInf> </PmtTpInf>
<ReqdExctnDt>2024-03-21</ReqdExctnDt> <ReqdExctnDt>2024-04-03</ReqdExctnDt>
<Dbtr> <Dbtr>
<Nm>Targo Bank</Nm> <Nm>Targo Bank</Nm>
</Dbtr> </Dbtr>