fixed input of invoice.exchangerate field - replace , with .

office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml

@@ -1,9 +1,6 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	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:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
-	xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
 
 
 	<div class="imixs-form-section-2">
@@ -13,8 +10,9 @@
 			</dt>
 			<dd>
 				<h:inputText required="#{validationController.required}"
-					value="#{workitem.item['invoice.exchangerate']}">
+					value="#{workitem.item['invoice.exchangerate']}"
-					<f:convertNumber pattern="#0.00000"/>
+					onchange="this.value=this.value.replace(',', '.');">
+					<f:convertNumber pattern="#0.00000" />
 				</h:inputText>
 			</dd>
 		</dl>

office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml

@@ -1,17 +1,13 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
-	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:i="http://java.sun.com/jsf/composite/imixs"
-	xmlns:c="http://java.sun.com/jsp/jstl/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:i="http://java.sun.com/jsf/composite/imixs"
 	xmlns:marty="http://java.sun.com/jsf/composite/marty">
 
 
 	<ui:param name="spaces" value="#{teamController.spaces}" />
 	<h3>#{app.sub_dispatch}</h3>
 
-	<h:panelGroup id="spacelist" layout="block"
+	<h:panelGroup id="spacelist" layout="block" styleClass="imixs-form-section-2">
-		styleClass="imixs-form-section-2">
 
 
 		<dl>
@@ -19,14 +15,11 @@
 			<dd>
 				<h:selectOneMenu style="width:20em;" required="true"
 					value="#{workflowController.workitem.item['payment.type']}">
-					<c:if
+					<c:if test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}">
-						test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}">
 						<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
-							<f:selectItem itemLabel="#{dbtr.item['name']}"
+							<f:selectItem itemLabel="#{dbtr.item['name']}" itemValue="#{dbtr.item['name']}" />
-								itemValue="#{dbtr.item['name']}" />
 						</c:forEach>
-						<f:selectItem itemLabel="Manuelle Auslandszahlung"
+						<f:selectItem itemLabel="Manuelle Auslandszahlung" itemValue="no_sepa" />
-							itemValue="no_sepa" />
 						<f:selectItem itemLabel="Lastschrift" itemValue="direct_debit" />
 					</c:if>
 					<f:selectItem itemLabel="Gutschrift" itemValue="credit" />
@@ -44,8 +37,7 @@
 					value="#{workflowController.workitem.item['space.ref']}">
 					<f:selectItem itemLabel=""></f:selectItem>
 					<c:forEach items="#{teamController.spaces}" var="space">
-						<f:selectItem itemLabel="#{space.item['name']}"
+						<f:selectItem itemLabel="#{space.item['name']}" itemValue="#{space.item['$UniqueID']}">
-							itemValue="#{space.item['$UniqueID']}">
 						</f:selectItem>
 					</c:forEach>
 					<f:ajax render="spacelist" />
@@ -57,24 +49,21 @@
 
 		<!-- Verteilung zur Sachpruefung -->
 
-		<ui:fragment
+		<ui:fragment rendered="#{workflowController.workitem.item['$taskid'] ge 5100}">
-			rendered="#{workflowController.workitem.item['$taskid'] ge 5100}">
 			<dl>
 				<dt>
 					Sachbearbeiter:<span class="imixs-required">*</span>
 				</dt>
 				<dd>
-					<ui:param name="space"
+					<ui:param name="space" value="#{teamController.getSpaceById(workitem.item['space.ref'])}">
-						value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
+					</ui:param>
 					<h:selectOneMenu required="false" style="width:20em;"
 						value="#{workflowController.workitem.item['sb.team']}">
 						<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
 
-						<c:forEach var="teammember"
+						<c:forEach var="teammember" items="#{space.itemList['space.team']}">
-							items="#{space.itemList['space.team']}">
 
-							<f:selectItem
+							<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
-								itemLabel="#{userController.getUserName(teammember)}"
 								itemValue="#{teammember}"></f:selectItem>
 						</c:forEach>
 					</h:selectOneMenu>
@@ -84,8 +73,7 @@
 
 
 			<!--  Die Auswahlbox für Azubis wird nur dann angezeigt wenn der Vorgang bei der Sachprüfung ist und es Assitenten gibt -->
-			<ui:param name="space"
+			<ui:param name="space" value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
-				value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
 			<ui:fragment rendered="#{(!empty space.item['space.assist'])}">
 				<dl>
 					<dt>
@@ -96,10 +84,8 @@
 							value="#{workflowController.workitem.item['sb.assist']}">
 							<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
 
-							<c:forEach var="teammember"
+							<c:forEach var="teammember" items="#{space.itemList['space.assist']}">
-								items="#{space.itemList['space.assist']}">
+								<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
-								<f:selectItem
-									itemLabel="#{userController.getUserName(teammember)}"
 									itemValue="#{teammember}"></f:selectItem>
 							</c:forEach>
 						</h:selectOneMenu>
@@ -118,7 +104,8 @@
 			</dt>
 			<dd>
 				<h:inputText required="#{validationController.required}"
-					value="#{workitem.item['invoice.exchangerate']}">
+					value="#{workitem.item['invoice.exchangerate']}"
+					onchange="this.value=this.value.replace(',', '.');">
 					<f:convertNumber pattern="#0.00000" />
 				</h:inputText>
 			</dd>
@@ -129,4 +116,3 @@
 	</div>
 
 </ui:composition>
-

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

@@ -1,21 +1,17 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	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:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 	<ui:fragment rendered="#{!readonly}">
-		<h:inputText required="#{validationController.required}"
+		<h:inputText required="#{validationController.required}" value="#{workitem.item['invoice.exchangerate']}"
-			value="#{workitem.item['invoice.exchangerate']}">
+			onchange="this.value=this.value.replace(',', '.');">
 			<f:convertNumber pattern="#0.00000" />
 		</h:inputText>
 	</ui:fragment>
 
 	<ui:fragment rendered="#{readonly}">
-		<h:outputText required="true"
+		<h:outputText required="true" value="#{workitem.item['invoice.exchangerate']}">
-			value="#{workitem.item['invoice.exchangerate']}">
 		</h:outputText>
 	</ui:fragment>
 
 </ui:composition>
-