kreditor search

RELEASENOTES.md

@@ -1,6 +1,10 @@
 # Versionen
 
-### 1.2.16 (Development)
+### 1.2.17 (Development)
+
+ - neue Archive suche
+
+### 1.2.16 
 
  - Upgrade Imixs-Archive auf 2.4.2 - verbesserter IMAP Import
  - Upgarde Imixs-Adapters 2.3.3-SNAPSHOT
@@ -16,8 +20,7 @@
 
 **Achtung**: Kubernetes Deploymets müssen angepasst werden (siehe AGL Polen)
 
-### 1.2.15 (Development)
-
+### 1.2.15 
  - kleinere Layout Anpassungen in den Formualren und input Feldern (Positionstabelle, Sachbearbeiter Auswahl...)
  - invoice.exchangerate Input ersetzt nun , durch . damit der Wert richtig gespeichert wird.
  - Fix Cargosoft DATEV Import - Korektur des Rechnungsdatums / Jahr 

office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml

@@ -1,11 +1,7 @@
-<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">
 
 	<!-- Cargosoft Search integration
 	
@@ -29,18 +25,21 @@
 		/*<![CDATA[*/
 
 		// init ml input fields...
-			$(document).ready(function() {
+		$(document).ready(function () {
 
 			// add autocomplete feature to cdtr.number...
-				var creditorField= $("input[data-item='cdtr.number']");
-				$(creditorField).each(function() {
+			var creditorField = $("input[data-item='cdtr.number']");
+			$(creditorField).each(function () {
 				$(this).addClass("imixs-ml");
-					autocompleteInitInput(this,cargosoftCdtrSearch,'autocomplete-resultlist-cargosoft',selectCdtrCallback);
+				autocompleteInitInput(this, cargosoftCdtrSearch, 'autocomplete-resultlist-cargosoft', selectCdtrCallback);
 			});
+
 			// add cargsoft label if available
-				var cdtrName="#{workflowController.workitem.item['cdtr.name.cargosoft']}";
-				var inputElement=$("input[data-item='cdtr.number']");
-				//inputElement.after( "<span id='cdtr-name-id' class='small'>" + cdtrName + "</p>" );				
+			// see cdtreingabe.xhtml !! 
+			// var cdtrName = "#{workflowController.workitem.item['cdtr.name.cargosoft']}";
+			// var inputElement = $("input[data-item='cdtr.number']");
+			// inputElement.after("<span id='cdtr-name-id' class='small'>" + cdtrName + "</p>");
+
 		});
 
 		// Hier bekommen wir die JSON Struktur mit allen daten.
@@ -50,24 +49,24 @@
 			const cdtrData = JSON.parse(selection);
 
 			// fill data into the fields....
-				var inputElement=$("input[data-item='cdtr.number']");
+			var inputElement = $("input[data-item='cdtr.number']");
 			inputElement.val(cdtrData.no);
 			// remove old cdtr.name
 			$('#cdtr-name-id').remove();
 			// append span with cdtr.name....
-				inputElement.after( "<span id='cdtr-name-id' class='small'>" + cdtrData.name + "</p>" );
+			inputElement.after("<span id='cdtr-name-id' class='small'>" + cdtrData.name + "</p>");
 
-				var inputElementZahlungsziel=$("input[data-item='cdtr.creditperiod']");
-				var inputElementZahlungszielCdtr=$("input[id$='cdtr_creditperiod']");
-				var inputElementInvoiceDate=$("input[id$='date_invoice']");
-				var inputElementMail=$("input[data-item='cdtr.mail'],textarea[data-item='cdtr.mail']");
-				var inputElementIban=$("input[data-item='cdtr.iban']");
-				var inputElementBic=$("input[data-item='cdtr.bic']");
+			var inputElementZahlungsziel = $("input[data-item='cdtr.creditperiod']");
+			var inputElementZahlungszielCdtr = $("input[id$='cdtr_creditperiod']");
+			var inputElementInvoiceDate = $("input[id$='date_invoice']");
+			var inputElementMail = $("input[data-item='cdtr.mail'],textarea[data-item='cdtr.mail']");
+			var inputElementIban = $("input[data-item='cdtr.iban']");
+			var inputElementBic = $("input[data-item='cdtr.bic']");
 			if (inputElementZahlungszielCdtr) {
 				inputElementZahlungszielCdtr.val(cdtrData.creditperiod);
 			}
 			// nur wenn ein Rechnugnsdatum eingegeben wurde
-				if (inputElementInvoiceDate && inputElementInvoiceDate.val()!='' && inputElementZahlungsziel && cdtrData.creditperiod!='') {
+			if (inputElementInvoiceDate && inputElementInvoiceDate.val() != '' && inputElementZahlungsziel && cdtrData.creditperiod != '') {
 				inputElementZahlungsziel.val(cdtrData.creditperiod);
 				inputElementZahlungsziel.change();
 				//$('.alexander-logistic-date').focus().select();
@@ -110,12 +109,10 @@
 		<ui:repeat var="suggest" value="#{cargosoftController.searchResult}">
 			<div class="autocomplete-resultlist-element" onclick="autocompleteSelectElement('#{suggest.data}')">
 				<a href="#">
-					<h:outputText value="#{suggest.display}" escape="false"/>
+					<h:outputText value="#{suggest.display}" escape="false" />
 				</a>
 			</div>
 		</ui:repeat>
 	</h:panelGroup>
 
 </ui:composition>
-
-

office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/cdtreingabe.xhtml

@@ -0,0 +1,19 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
+	xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty">
+
+
+	<!-- Dieses Part zeigt unter dem Eingabefeld einfach nur den cdtr.name.cargosoft an -->
+
+	<h:inputText value="#{workitem.item[item.name]}" pt:data-item="#{item.name}"
+		required="#{item.required?validationController.required:false}" rendered="#{!item.readonly}"
+		disabled="#{item.disabled}" />
+	<h:outputText value="#{workitem.item[item.name]}" rendered="#{item.readonly}" />
+
+	<!-- anzeige cargosoft name -->
+	<h:outputText styleClass="small" value="#{workflowController.workitem.item['cdtr.name.cargosoft']}"
+		style="#{item.readonly?'margin-left:0.9em':''}">
+	</h:outputText>
+
+</ui:composition>