diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java index 35a048a..bc9bd84 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CustomSearchController.java @@ -88,11 +88,15 @@ public class CustomSearchController implements Serializable { Date dueDate = searchEvent.getSearchFilter().getItemValueDate("invoice.duedate"); Date closingDate = searchEvent.getSearchFilter().getItemValueDate("invoice.closingdate"); - String cdtrNumber = searchEvent.getSearchFilter().getItemValueString("cdtr.number"); + String cdtrNumber = searchEvent.getSearchFilter().getItemValueString("cdtr.number").trim(); String invoiceType = searchEvent.getSearchFilter().getItemValueString("invoice.type"); + String invoiceCurrency = searchEvent.getSearchFilter().getItemValueString("invoice.currency").trim(); String invoiceNumber = searchEvent.getSearchFilter().getItemValueString("invoice.number"); + String paymentType = searchEvent.getSearchFilter().getItemValueString("payment.type").trim(); + String sequenceNumber = searchEvent.getSearchFilter().getItemValueString("sequencenumber").trim(); + query += " (type:\"workitemarchive\") "; // process ref= Rechnugnscontorling Prozess ItemCollection process = teamController.getProcessByName("Rechnungscontrolling"); @@ -132,6 +136,17 @@ public class CustomSearchController implements Serializable { query += " AND (invoice.number:" + invoiceNumber + ")"; } + if (paymentType != null && !paymentType.isEmpty()) { + query += " AND (payment.type:" + paymentType + ")"; + } + if (sequenceNumber != null && !sequenceNumber.isEmpty()) { + query += " AND (sequencenumber:" + sequenceNumber + ")"; + } + + if (invoiceCurrency != null && !invoiceCurrency.isEmpty()) { + query += " AND (invoice.currency:" + invoiceCurrency + ")"; + } + // Rechnungsart if (invoiceType != null && !"0".equals(invoiceType)) { if ("1".equals(invoiceType)) { diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties index 0e47cc8..795cb81 100644 --- a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties +++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties @@ -32,6 +32,8 @@ invoicenumber=Rechnungsnummer invoicedate=Rechnungsdatum invoiceduedate=Fälligkeit invoiceamount=Rechnungsbetrag +payment_type=Zahlungsart +sequencenumber=Belegnummer amount=Betrag closingdate=Abschlussdatum (nur Monat) diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties index 46250e8..9af74c6 100644 --- a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties +++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties @@ -32,6 +32,8 @@ invoicenumber=Invoice No. invoicedate=Invoice Date invoiceduedate=Due Date invoiceamount=Invoice amount +payment_type=Payment Type +sequencenumber=Request No. amount=Amount closingdate=Closing date (Month only) diff --git a/office-alexander-logistics-app/src/main/resources/imixs.properties b/office-alexander-logistics-app/src/main/resources/imixs.properties index bf83402..d75dceb 100644 --- a/office-alexander-logistics-app/src/main/resources/imixs.properties +++ b/office-alexander-logistics-app/src/main/resources/imixs.properties @@ -4,7 +4,7 @@ lucence.indexDir=${imixs-office.IndexDir} index.fields=txtsearchstring,txtSubject,txtname,txtEmail,txtUserName,namCreator,txtworkflowgroup,txtworkflowstatus,txtWorkflowAbstract,txtWorkflowSummary,txtworkflowhistory,txtspacename,txtprocessname,_subject,_description,_name,_projectnumber,_projectname,_ordernumber,_contractnumber,datDueDate,txtcommentlog,htmldescription,htmldocumentation,dms,dms_names,invoice.number.stripped,_childitems,$file.names,_VENDOR_NAME,dbtr.number,cdtr.number index.fields.analyze=txtUsername -index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,$lasteventdate,payment.type +index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,sequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,invoice.currency,$lasteventdate,payment.type index.fields.store=process.name,txtProcessName,txtWorkflowImageURL,payment.date,invoice.number,invoice.date,invoice.duedate index.fields.category=space.name,space.ref,taxonomy.verteilung.stop.by,taxonomy.sachpruefung.stop.by,taxonomy.buchhaltung.stop.by office.search.noanalyze=invoice.number,invoice.number.stripped diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml index 2fb3918..9f49785 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive_filter.xhtml @@ -1,19 +1,64 @@ + 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"> -
+ +
-
#{custom.invoiceamount}:
-
- - - -
+
+
+ +
#{custom.invoiceamount}:
+
+ + + + +
+ +
+
+ + +
Währung:
+
+ + + + + + + + + + + + +
+
+
+ + +
#{custom.invoicedate}:
@@ -62,12 +107,39 @@
-
+
+
+
#{custom.payment_type}:
+
+ + + + + + + + + +
+
+ +
+
#{custom.sequencenumber}:
+
+ + + +
+
+ +
+ + +
Rechnungsart:
- @@ -75,13 +147,15 @@ - -
- - +
+
#{message['worklist.search_phrase']}:
+
+ +
+
-
+ \ No newline at end of file