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

layout fixes - zahlungsart, sachbearbeiter

Browse source
This commit is contained in:
Ralph Soika 2024-02-07 11:14:07 +01:00
parent b87f32028d
commit 2d77ee846c
9 changed files with 183 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml
View file

@ -1,9 +1,6 @@
<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">
@ -12,71 +9,64 @@
<!-- nur bei verteilung sachpruefung einblenden - $taskID 5100 -->
<ui:fragment rendered="#{workflowController.workitem.item['$taskid'] eq 5100}">
<dl>
<dt>#{message['form.space']}</dt>
<dd>
<h:selectOneMenu style="width:20em;" required="false"
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>
</c:forEach>
<f:ajax render="spacelist"/>
</h:selectOneMenu>
</dd>
</dl>
<dl>
<dt>#{message['form.space']}</dt>
<dd>
<h:selectOneMenu required="false" 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>
</c:forEach>
<f:ajax render="spacelist" />
</h:selectOneMenu>
</dd>
</dl>
<dl>
<dt>
Sachbearbeiter:<span class="imixs-required">*</span>
</dt>
<dd>
<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>
<dl>
<dt>
Sachbearbeiter:<span class="imixs-required">*</span>
</dt>
<dd>
<ui:param name="space" value="#{teamController.getSpaceById(workitem.item['space.ref'])}">
</ui:param>
<h:selectOneMenu required="false" 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)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
</ui:fragment>
<!--
<!--
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>
Azubi:<span class="imixs-required">*</span>
</dt>
<dd>
<h:selectOneMenu required="false" style="width:20em;"
value="#{workflowController.workitem.item['sb.assist']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<dl>
<dt>
Azubi:<span class="imixs-required">*</span>
</dt>
<dd>
<h:selectOneMenu required="false" 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)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
<c:forEach var="teammember" items="#{space.itemList['space.assist']}">
<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
</ui:fragment>
</h:panelGroup>
</ui:composition>
</ui:composition>

23
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml
View file

@ -1,28 +1,23 @@
<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:fn="http://xmlns.jcp.org/jsp/jstl/functions"
<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:fn="http://xmlns.jcp.org/jsp/jstl/functions"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
<div class="imixs-form-section-2">
<div class="imixs-form-section-2">
<dl>
<dt>#{message['payment.type']}:</dt>
<dt>#{message['payment.type']}:</dt>
<dd>
<h:selectOneMenu style="width:20em;" required="true"
value="#{workflowController.workitem.item['payment.type']}">
<c:if test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}" >
<h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
<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="#{message['payment.no_sepa']}" itemValue="no_sepa" />
<f:selectItem itemLabel="#{message['payment.direct_debit']}" itemValue="direct_debit" />
</c:if>
<f:selectItem itemLabel="#{message['payment.credit']}" itemValue="credit" />
</h:selectOneMenu>
</dd>
</dl>

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

@ -13,8 +13,7 @@
<dl>
<dt>Zahlungsart:</dt>
<dd>
<h:selectOneMenu style="width:20em;" required="true"
value="#{workflowController.workitem.item['payment.type']}">
<h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
<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']}" />
@ -33,8 +32,7 @@
<dl>
<dt>#{message['form.space']}</dt>
<dd>
<h:selectOneMenu style="width:20em;" required="false"
value="#{workflowController.workitem.item['space.ref']}">
<h:selectOneMenu required="false" 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']}">
@ -57,8 +55,7 @@
<dd>
<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']}">
<h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.team']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.team']}">
@ -80,8 +77,7 @@
Azubi:<span class="imixs-required">*</span>
</dt>
<dd>
<h:selectOneMenu required="false" style="width:20em;"
value="#{workflowController.workitem.item['sb.assist']}">
<h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.assist']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.assist']}">

118
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml
View file

@ -1,9 +1,6 @@
<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">
@ -15,71 +12,64 @@
<!-- nur bei verteilung sachpruefung einblenden - $taskID 5100 -->
<ui:fragment rendered="#{workflowController.workitem.item['$taskid'] eq 5100}">
<dl>
<dt>#{message['form.space']}</dt>
<dd>
<h:selectOneMenu style="width:20em;" required="false"
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>
</c:forEach>
<f:ajax render="spacelist"/>
</h:selectOneMenu>
</dd>
</dl>
<dl>
<dt>#{message['form.space']}</dt>
<dd>
<h:selectOneMenu required="false" 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>
</c:forEach>
<f:ajax render="spacelist" />
</h:selectOneMenu>
</dd>
</dl>
<dl>
<dt>
Sachbearbeiter:<span class="imixs-required">*</span>
</dt>
<dd>
<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>
<dl>
<dt>
Sachbearbeiter:<span class="imixs-required">*</span>
</dt>
<dd>
<ui:param name="space" value="#{teamController.getSpaceById(workitem.item['space.ref'])}">
</ui:param>
<h:selectOneMenu required="false" 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)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
</ui:fragment>
<!--
<!--
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>
Azubi:<span class="imixs-required">*</span>
</dt>
<dd>
<h:selectOneMenu required="false" style="width:20em;"
value="#{workflowController.workitem.item['sb.assist']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<dl>
<dt>
Azubi:<span class="imixs-required">*</span>
</dt>
<dd>
<h:selectOneMenu required="false" 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)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
<c:forEach var="teammember" items="#{space.itemList['space.assist']}">
<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
</ui:fragment>
</h:panelGroup>
</ui:composition>
</ui:composition>

58
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml
View file

@ -1,19 +1,15 @@
<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">
<h:panelGroup id="paymentdetails_id">
<div class="imixs-form-section-2">
<dl>
<dt>Zahlungsart:</dt>
<dd>
<h:selectOneMenu style="width:20em;" required="true"
value="#{workflowController.workitem.item['payment.type']}">
<h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
<f:selectItem itemLabel="#{dbtr.item['name']}" itemValue="#{dbtr.item['name']}" />
</c:forEach>
@ -21,7 +17,7 @@
</h:selectOneMenu>
</dd>
</dl>
</div>
</div>
<div class="imixs-form-section-2">
<dl>
<dt>IBAN</dt>
@ -37,7 +33,7 @@
</dd>
</dl>
</div>
</div>
</h:panelGroup>
<div class="imixs-form-section">
@ -57,26 +53,28 @@
<!-- load inovice data by documentController: #{documentController.load(id)} -->
<ui:param name="invoice" value="#{documentController.getDocument()}"></ui:param>
<tr>
<td><h:link outcome="/pages/workitems/workitem">
#{invoice.item['cdtr.name']}
<f:param name="id" value="#{invoice.item['$uniqueid']}" />
</h:link>
<td>
<h:link outcome="/pages/workitems/workitem">
#{invoice.item['cdtr.name']}
<f:param name="id" value="#{invoice.item['$uniqueid']}" />
</h:link>
</td>
<td>#{invoice.item['invoice.number']}</td>
<td><h:outputText value="#{invoice.item['invoice.date']}">
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
<td>
<h:outputText value="#{invoice.item['invoice.date']}">
<f:convertDateTime pattern="#{message.datePatternShort}" timeZone="#{message.timeZone}" />
</h:outputText>
</td>
<td><h:outputText value="#{invoice.item['invoice.duedate']}">
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
<td>
<h:outputText value="#{invoice.item['invoice.duedate']}">
<f:convertDateTime pattern="#{message.datePatternShort}" timeZone="#{message.timeZone}" />
</h:outputText>
</td>
<td style="text-align: right;"><h:outputText
value="#{invoice.item['invoice.total']}">
<td style="text-align: right;">
<h:outputText value="#{invoice.item['invoice.total']}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></td>
</h:outputText>
</td>
<td>#{invoice.item['invoice.currency']}</td>
<td>#{invoice.item ['cdtr.iban']}</td>
@ -86,12 +84,15 @@
<tr style="border-top: 1px solid #ccc;">
<td />
<td /><td />
<td />
<td />
<td><strong>Summary</strong></td>
<td style="text-align: right;"><strong><h:outputText
<td style="text-align: right;"><strong>
<h:outputText
value="#{sepaController.calculateSum(workitem.itemList['$workitemref'], 'invoice.total')}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></strong></td>
</h:outputText>
</strong></td>
<td><strong>#{invoice.item['invoice.currency']}</strong></td>
<td />
<td />
@ -100,5 +101,4 @@
</div>
</ui:composition>
</ui:composition>

28
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml
View file

@ -1,32 +1,25 @@
<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:marty="http://xmlns.jcp.org/jsf/composite/marty">
<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:marty="http://xmlns.jcp.org/jsf/composite/marty">
<!-- 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'])}">
<ui:fragment rendered="#{!readonly}">
<h:selectOneMenu required="false" style="width:20em;"
value="#{workflowController.workitem.item['sb.assist']}">
<h:selectOneMenu required="false" 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)}"
itemValue="#{teammember}"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.assist']}">
<f:selectItem itemLabel="#{userController.getUserName(teammember)}" itemValue="#{teammember}">
</f:selectItem>
</c:forEach>
</h:selectOneMenu>
</ui:fragment>
<ui:fragment rendered="#{readonly}">
<h:outputText
value="#{userController.getUserName(workitem.item['sb.assist'])}">
<h:outputText value="#{userController.getUserName(workitem.item['sb.assist'])}">
</h:outputText>
</ui:fragment>
@ -35,5 +28,4 @@
</ui:composition>
</ui:composition>

25
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml
View file

@ -1,29 +1,22 @@
<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:marty="http://xmlns.jcp.org/jsf/composite/marty">
<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:marty="http://xmlns.jcp.org/jsf/composite/marty">
<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="#{!readonly}">
<h:selectOneMenu required="false" style="width:20em;"
value="#{workitem.item['sb.team']}">
<h:selectOneMenu required="false" value="#{workitem.item['sb.team']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.team']}">
<f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
<f:selectItem itemLabel="#{userController.getUserName(teammember)}" itemValue="#{teammember}">
</f:selectItem>
</c:forEach>
</h:selectOneMenu>
</ui:fragment>
<ui:fragment rendered="#{readonly}">
<h:outputText
value="#{userController.getUserName(workitem.item['sb.team'])}">
<h:outputText value="#{userController.getUserName(workitem.item['sb.team'])}">
</h:outputText>
</ui:fragment>
</ui:composition>
</ui:composition>

18
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml
View file

@ -1,23 +1,20 @@
<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:selectOneMenu style="width:20em;"
required="#{empty required?false:required}"
<h:selectOneMenu required="#{empty required?false:required}"
value="#{workflowController.workitem.item['space.ref']}">
<f:selectItem itemLabel=""></f:selectItem>
<c:forEach
items="#{byprocess?teamController.getSpacesByProcessId(workflowController.workitem.item['process.ref']):teamController.spaces}"
var="space">
<f:selectItem itemLabel="#{space.item['space.name']}"
itemValue="#{space.item['$UniqueID']}">
<f:selectItem itemLabel="#{space.item['space.name']}" itemValue="#{space.item['$UniqueID']}">
</f:selectItem>
</c:forEach>
<f:ajax render="#{formComponents.clientId}" execute="#{formComponents.clientId}" onevent="initFaelligkeit" />
<f:ajax render="#{formComponents.clientId}" execute="#{formComponents.clientId}"
onevent="initFaelligkeit" />
</h:selectOneMenu>
</ui:fragment>
<ui:fragment rendered="#{readonly}">
@ -25,5 +22,4 @@
</h:outputText>
</ui:fragment>
</ui:composition>
</ui:composition>

21
office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml
View file

@ -1,21 +1,15 @@
<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:selectOneMenu style="width:20em;" required="true"
value="#{workflowController.workitem.item['payment.type']}">
<c:if
test="#{fn:startsWith(workflowController.workitem.item['$modelversion'],'rechnungseingang')}">
<h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
<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="#{custom['payment.no_sepa']}"
itemValue="no_sepa" />
<f:selectItem itemLabel="#{custom['payment.no_sepa']}" itemValue="no_sepa" />
<f:selectItem itemLabel="#{custom['payment.direct_debit']}" itemValue="direct_debit" />
</c:if>
<f:selectItem itemLabel="#{custom['payment.credit']}" itemValue="credit" />
@ -41,5 +35,4 @@
</ui:fragment>
</ui:composition>
</ui:composition>