fixed input of invoice.exchangerate field - replace , with .
This commit is contained in:
parent
cce2aa3f2c
commit
b87f32028d
3 changed files with 34 additions and 54 deletions
|
|
@ -1,9 +1,6 @@
|
|||
<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:a="http://xmlns.jcp.org/jsf/passthrough">
|
||||
<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: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']}">
|
||||
<f:convertNumber pattern="#0.00000"/>
|
||||
value="#{workitem.item['invoice.exchangerate']}"
|
||||
onchange="this.value=this.value.replace(',', '.');">
|
||||
<f:convertNumber pattern="#0.00000" />
|
||||
</h:inputText>
|
||||
</dd>
|
||||
</dl>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,13 @@
|
|||
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
|
||||
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:h="http://java.sun.com/jsf/html"
|
||||
xmlns:i="http://java.sun.com/jsf/composite/imixs"
|
||||
<ui:composition xmlns="http://www.w3.org/1999/xhtml" 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: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"
|
||||
styleClass="imixs-form-section-2">
|
||||
<h:panelGroup id="spacelist" layout="block" 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
|
||||
test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}">
|
||||
<c:if test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}">
|
||||
<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']}" />
|
||||
</c:forEach>
|
||||
<f:selectItem itemLabel="Manuelle Auslandszahlung"
|
||||
itemValue="no_sepa" />
|
||||
<f:selectItem itemLabel="Manuelle Auslandszahlung" 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']}"
|
||||
itemValue="#{space.item['$UniqueID']}">
|
||||
<f:selectItem itemLabel="#{space.item['name']}" itemValue="#{space.item['$UniqueID']}">
|
||||
</f:selectItem>
|
||||
</c:forEach>
|
||||
<f:ajax render="spacelist" />
|
||||
|
|
@ -57,24 +49,21 @@
|
|||
|
||||
<!-- Verteilung zur Sachpruefung -->
|
||||
|
||||
<ui:fragment
|
||||
rendered="#{workflowController.workitem.item['$taskid'] ge 5100}">
|
||||
<ui:fragment rendered="#{workflowController.workitem.item['$taskid'] ge 5100}">
|
||||
<dl>
|
||||
<dt>
|
||||
Sachbearbeiter:<span class="imixs-required">*</span>
|
||||
</dt>
|
||||
<dd>
|
||||
<ui:param name="space"
|
||||
value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
|
||||
<ui:param name="space" value="#{teamController.getSpaceById(workitem.item['space.ref'])}">
|
||||
</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"
|
||||
items="#{space.itemList['space.team']}">
|
||||
<c:forEach var="teammember" items="#{space.itemList['space.team']}">
|
||||
|
||||
<f:selectItem
|
||||
itemLabel="#{userController.getUserName(teammember)}"
|
||||
<f:selectItem 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"
|
||||
value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
|
||||
<ui:param name="space" 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"
|
||||
items="#{space.itemList['space.assist']}">
|
||||
<f:selectItem
|
||||
itemLabel="#{userController.getUserName(teammember)}"
|
||||
<c:forEach var="teammember" items="#{space.itemList['space.assist']}">
|
||||
<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>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,17 @@
|
|||
<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"
|
||||
<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">
|
||||
|
||||
<ui:fragment rendered="#{!readonly}">
|
||||
<h:inputText required="#{validationController.required}"
|
||||
value="#{workitem.item['invoice.exchangerate']}">
|
||||
<h:inputText required="#{validationController.required}" 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"
|
||||
value="#{workitem.item['invoice.exchangerate']}">
|
||||
<h:outputText required="true" value="#{workitem.item['invoice.exchangerate']}">
|
||||
</h:outputText>
|
||||
</ui:fragment>
|
||||
|
||||
</ui:composition>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue