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" <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"> xmlns:marty="http://java.sun.com/jsf/composite/marty">
@ -12,71 +9,64 @@
<!-- nur bei verteilung sachpruefung einblenden - $taskID 5100 --> <!-- nur bei verteilung sachpruefung einblenden - $taskID 5100 -->
<ui:fragment rendered="#{workflowController.workitem.item['$taskid'] eq 5100}"> <ui:fragment rendered="#{workflowController.workitem.item['$taskid'] eq 5100}">
<dl> <dl>
<dt>#{message['form.space']}</dt> <dt>#{message['form.space']}</dt>
<dd> <dd>
<h:selectOneMenu style="width:20em;" required="false" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['space.ref']}">
value="#{workflowController.workitem.item['space.ref']}"> <f:selectItem itemLabel=""></f:selectItem>
<f:selectItem itemLabel=""></f:selectItem> <c:forEach items="#{teamController.spaces}" var="space">
<c:forEach items="#{teamController.spaces}" var="space"> <f:selectItem itemLabel="#{space.item['name']}" itemValue="#{space.item['$UniqueID']}">
<f:selectItem itemLabel="#{space.item['name']}" </f:selectItem>
itemValue="#{space.item['$UniqueID']}"> </c:forEach>
</f:selectItem> <f:ajax render="spacelist" />
</c:forEach> </h:selectOneMenu>
<f:ajax render="spacelist"/> </dd>
</h:selectOneMenu> </dl>
</dd>
</dl>
<dl> <dl>
<dt> <dt>
Sachbearbeiter:<span class="imixs-required">*</span> Sachbearbeiter:<span class="imixs-required">*</span>
</dt> </dt>
<dd> <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;" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.team']}">
value="#{workflowController.workitem.item['sb.team']}"> <f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<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 <f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemLabel="#{userController.getUserName(teammember)}" itemValue="#{teammember}"></f:selectItem>
itemValue="#{teammember}"></f:selectItem> </c:forEach>
</c:forEach> </h:selectOneMenu>
</h:selectOneMenu> </dd>
</dd> </dl>
</dl>
</ui:fragment> </ui:fragment>
<!-- <!--
Die Auswahlbox für Azubis wird nur dann angezeigt wenn der Vorgang bei der Sachprüfung ist und es Assitenten gibt --> 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="#{(!empty space.item['space.assist'])}">
<dl> <dl>
<dt> <dt>
Azubi:<span class="imixs-required">*</span> Azubi:<span class="imixs-required">*</span>
</dt> </dt>
<dd> <dd>
<h:selectOneMenu required="false" style="width:20em;" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.assist']}">
value="#{workflowController.workitem.item['sb.assist']}"> <f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.assist']}"> <c:forEach var="teammember" items="#{space.itemList['space.assist']}">
<f:selectItem <f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemLabel="#{userController.getUserName(teammember)}" itemValue="#{teammember}"></f:selectItem>
itemValue="#{teammember}"></f:selectItem> </c:forEach>
</c:forEach> </h:selectOneMenu>
</h:selectOneMenu> </dd>
</dd> </dl>
</dl>
</ui:fragment> </ui:fragment>
</h:panelGroup> </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" <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:fn="http://xmlns.jcp.org/jsp/jstl/functions"
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"> xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
<div class="imixs-form-section-2"> <div class="imixs-form-section-2">
<dl> <dl>
<dt>#{message['payment.type']}:</dt> <dt>#{message['payment.type']}:</dt>
<dd> <dd>
<h:selectOneMenu style="width:20em;" required="true" <h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
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"> <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> </c:forEach>
<f:selectItem itemLabel="#{message['payment.no_sepa']}" itemValue="no_sepa" /> <f:selectItem itemLabel="#{message['payment.no_sepa']}" itemValue="no_sepa" />
<f:selectItem itemLabel="#{message['payment.direct_debit']}" itemValue="direct_debit" /> <f:selectItem itemLabel="#{message['payment.direct_debit']}" itemValue="direct_debit" />
</c:if> </c:if>
<f:selectItem itemLabel="#{message['payment.credit']}" itemValue="credit" /> <f:selectItem itemLabel="#{message['payment.credit']}" itemValue="credit" />
</h:selectOneMenu> </h:selectOneMenu>
</dd> </dd>
</dl> </dl>

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

@ -13,8 +13,7 @@
<dl> <dl>
<dt>Zahlungsart:</dt> <dt>Zahlungsart:</dt>
<dd> <dd>
<h:selectOneMenu style="width:20em;" required="true" <h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
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"> <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']}" />
@ -33,8 +32,7 @@
<dl> <dl>
<dt>#{message['form.space']}</dt> <dt>#{message['form.space']}</dt>
<dd> <dd>
<h:selectOneMenu style="width:20em;" required="false" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['space.ref']}">
value="#{workflowController.workitem.item['space.ref']}">
<f:selectItem itemLabel=""></f:selectItem> <f:selectItem itemLabel=""></f:selectItem>
<c:forEach items="#{teamController.spaces}" var="space"> <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']}">
@ -57,8 +55,7 @@
<dd> <dd>
<ui:param name="space" value="#{teamController.getSpaceById(workitem.item['space.ref'])}"> <ui:param name="space" value="#{teamController.getSpaceById(workitem.item['space.ref'])}">
</ui:param> </ui:param>
<h:selectOneMenu required="false" style="width:20em;" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.team']}">
value="#{workflowController.workitem.item['sb.team']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem> <f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.team']}"> <c:forEach var="teammember" items="#{space.itemList['space.team']}">
@ -80,8 +77,7 @@
Azubi:<span class="imixs-required">*</span> Azubi:<span class="imixs-required">*</span>
</dt> </dt>
<dd> <dd>
<h:selectOneMenu required="false" style="width:20em;" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.assist']}">
value="#{workflowController.workitem.item['sb.assist']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem> <f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.assist']}"> <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" <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"> xmlns:marty="http://java.sun.com/jsf/composite/marty">
@ -15,71 +12,64 @@
<!-- nur bei verteilung sachpruefung einblenden - $taskID 5100 --> <!-- nur bei verteilung sachpruefung einblenden - $taskID 5100 -->
<ui:fragment rendered="#{workflowController.workitem.item['$taskid'] eq 5100}"> <ui:fragment rendered="#{workflowController.workitem.item['$taskid'] eq 5100}">
<dl> <dl>
<dt>#{message['form.space']}</dt> <dt>#{message['form.space']}</dt>
<dd> <dd>
<h:selectOneMenu style="width:20em;" required="false" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['space.ref']}">
value="#{workflowController.workitem.item['space.ref']}"> <f:selectItem itemLabel=""></f:selectItem>
<f:selectItem itemLabel=""></f:selectItem> <c:forEach items="#{teamController.spaces}" var="space">
<c:forEach items="#{teamController.spaces}" var="space"> <f:selectItem itemLabel="#{space.item['name']}" itemValue="#{space.item['$UniqueID']}">
<f:selectItem itemLabel="#{space.item['name']}" </f:selectItem>
itemValue="#{space.item['$UniqueID']}"> </c:forEach>
</f:selectItem> <f:ajax render="spacelist" />
</c:forEach> </h:selectOneMenu>
<f:ajax render="spacelist"/> </dd>
</h:selectOneMenu> </dl>
</dd>
</dl>
<dl> <dl>
<dt> <dt>
Sachbearbeiter:<span class="imixs-required">*</span> Sachbearbeiter:<span class="imixs-required">*</span>
</dt> </dt>
<dd> <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;" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.team']}">
value="#{workflowController.workitem.item['sb.team']}"> <f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<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 <f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemLabel="#{userController.getUserName(teammember)}" itemValue="#{teammember}"></f:selectItem>
itemValue="#{teammember}"></f:selectItem> </c:forEach>
</c:forEach> </h:selectOneMenu>
</h:selectOneMenu> </dd>
</dd> </dl>
</dl>
</ui:fragment> </ui:fragment>
<!-- <!--
Die Auswahlbox für Azubis wird nur dann angezeigt wenn der Vorgang bei der Sachprüfung ist und es Assitenten gibt --> 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="#{(!empty space.item['space.assist'])}">
<dl> <dl>
<dt> <dt>
Azubi:<span class="imixs-required">*</span> Azubi:<span class="imixs-required">*</span>
</dt> </dt>
<dd> <dd>
<h:selectOneMenu required="false" style="width:20em;" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.assist']}">
value="#{workflowController.workitem.item['sb.assist']}"> <f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<c:forEach var="teammember" items="#{space.itemList['space.assist']}"> <c:forEach var="teammember" items="#{space.itemList['space.assist']}">
<f:selectItem <f:selectItem itemLabel="#{userController.getUserName(teammember)}"
itemLabel="#{userController.getUserName(teammember)}" itemValue="#{teammember}"></f:selectItem>
itemValue="#{teammember}"></f:selectItem> </c:forEach>
</c:forEach> </h:selectOneMenu>
</h:selectOneMenu> </dd>
</dd> </dl>
</dl>
</ui:fragment> </ui:fragment>
</h:panelGroup> </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" <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"> xmlns:marty="http://java.sun.com/jsf/composite/marty">
<h:panelGroup id="paymentdetails_id"> <h:panelGroup id="paymentdetails_id">
<div class="imixs-form-section-2"> <div class="imixs-form-section-2">
<dl> <dl>
<dt>Zahlungsart:</dt> <dt>Zahlungsart:</dt>
<dd> <dd>
<h:selectOneMenu style="width:20em;" required="true" <h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
value="#{workflowController.workitem.item['payment.type']}">
<c:forEach items="#{sepaController.dbtrList}" var="dbtr"> <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> </c:forEach>
@ -21,7 +17,7 @@
</h:selectOneMenu> </h:selectOneMenu>
</dd> </dd>
</dl> </dl>
</div> </div>
<div class="imixs-form-section-2"> <div class="imixs-form-section-2">
<dl> <dl>
<dt>IBAN</dt> <dt>IBAN</dt>
@ -37,7 +33,7 @@
</dd> </dd>
</dl> </dl>
</div> </div>
</h:panelGroup> </h:panelGroup>
<div class="imixs-form-section"> <div class="imixs-form-section">
@ -57,26 +53,28 @@
<!-- load inovice data by documentController: #{documentController.load(id)} --> <!-- load inovice data by documentController: #{documentController.load(id)} -->
<ui:param name="invoice" value="#{documentController.getDocument()}"></ui:param> <ui:param name="invoice" value="#{documentController.getDocument()}"></ui:param>
<tr> <tr>
<td><h:link outcome="/pages/workitems/workitem"> <td>
#{invoice.item['cdtr.name']} <h:link outcome="/pages/workitems/workitem">
<f:param name="id" value="#{invoice.item['$uniqueid']}" /> #{invoice.item['cdtr.name']}
</h:link> <f:param name="id" value="#{invoice.item['$uniqueid']}" />
</h:link>
</td> </td>
<td>#{invoice.item['invoice.number']}</td> <td>#{invoice.item['invoice.number']}</td>
<td><h:outputText value="#{invoice.item['invoice.date']}"> <td>
<f:convertDateTime pattern="#{message.datePatternShort}" <h:outputText value="#{invoice.item['invoice.date']}">
timeZone="#{message.timeZone}" /> <f:convertDateTime pattern="#{message.datePatternShort}" timeZone="#{message.timeZone}" />
</h:outputText> </h:outputText>
</td> </td>
<td><h:outputText value="#{invoice.item['invoice.duedate']}"> <td>
<f:convertDateTime pattern="#{message.datePatternShort}" <h:outputText value="#{invoice.item['invoice.duedate']}">
timeZone="#{message.timeZone}" /> <f:convertDateTime pattern="#{message.datePatternShort}" timeZone="#{message.timeZone}" />
</h:outputText> </h:outputText>
</td> </td>
<td style="text-align: right;"><h:outputText <td style="text-align: right;">
value="#{invoice.item['invoice.total']}"> <h:outputText value="#{invoice.item['invoice.total']}">
<f:convertNumber minFractionDigits="2" locale="de" /> <f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></td> </h:outputText>
</td>
<td>#{invoice.item['invoice.currency']}</td> <td>#{invoice.item['invoice.currency']}</td>
<td>#{invoice.item ['cdtr.iban']}</td> <td>#{invoice.item ['cdtr.iban']}</td>
@ -86,12 +84,15 @@
<tr style="border-top: 1px solid #ccc;"> <tr style="border-top: 1px solid #ccc;">
<td /> <td />
<td /><td /> <td />
<td />
<td><strong>Summary</strong></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')}"> value="#{sepaController.calculateSum(workitem.itemList['$workitemref'], 'invoice.total')}">
<f:convertNumber minFractionDigits="2" locale="de" /> <f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></strong></td> </h:outputText>
</strong></td>
<td><strong>#{invoice.item['invoice.currency']}</strong></td> <td><strong>#{invoice.item['invoice.currency']}</strong></td>
<td /> <td />
<td /> <td />
@ -100,5 +101,4 @@
</div> </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" <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:marty="http://xmlns.jcp.org/jsf/composite/marty">
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 --> <!-- 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'])}"> <ui:fragment rendered="#{(!empty space.item['space.assist'])}">
<ui:fragment rendered="#{!readonly}"> <ui:fragment rendered="#{!readonly}">
<h:selectOneMenu required="false" style="width:20em;" <h:selectOneMenu required="false" value="#{workflowController.workitem.item['sb.assist']}">
value="#{workflowController.workitem.item['sb.assist']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem> <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)}" itemValue="#{teammember}">
<f:selectItem itemLabel="#{userController.getUserName(teammember)}" </f:selectItem>
itemValue="#{teammember}"></f:selectItem>
</c:forEach> </c:forEach>
</h:selectOneMenu> </h:selectOneMenu>
</ui:fragment> </ui:fragment>
<ui:fragment rendered="#{readonly}"> <ui:fragment rendered="#{readonly}">
<h:outputText <h:outputText value="#{userController.getUserName(workitem.item['sb.assist'])}">
value="#{userController.getUserName(workitem.item['sb.assist'])}">
</h:outputText> </h:outputText>
</ui:fragment> </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" <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:marty="http://xmlns.jcp.org/jsf/composite/marty">
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" <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="#{!readonly}"> <ui:fragment rendered="#{!readonly}">
<h:selectOneMenu required="false" style="width:20em;" <h:selectOneMenu required="false" value="#{workitem.item['sb.team']}">
value="#{workitem.item['sb.team']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem> <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}">
itemValue="#{teammember}"></f:selectItem> </f:selectItem>
</c:forEach> </c:forEach>
</h:selectOneMenu> </h:selectOneMenu>
</ui:fragment> </ui:fragment>
<ui:fragment rendered="#{readonly}"> <ui:fragment rendered="#{readonly}">
<h:outputText <h:outputText value="#{userController.getUserName(workitem.item['sb.team'])}">
value="#{userController.getUserName(workitem.item['sb.team'])}">
</h:outputText> </h:outputText>
</ui:fragment> </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" <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"> xmlns:h="http://xmlns.jcp.org/jsf/html">
<ui:fragment rendered="#{!readonly}"> <ui:fragment rendered="#{!readonly}">
<h:selectOneMenu style="width:20em;" <h:selectOneMenu required="#{empty required?false:required}"
required="#{empty required?false:required}"
value="#{workflowController.workitem.item['space.ref']}"> value="#{workflowController.workitem.item['space.ref']}">
<f:selectItem itemLabel=""></f:selectItem> <f:selectItem itemLabel=""></f:selectItem>
<c:forEach <c:forEach
items="#{byprocess?teamController.getSpacesByProcessId(workflowController.workitem.item['process.ref']):teamController.spaces}" items="#{byprocess?teamController.getSpacesByProcessId(workflowController.workitem.item['process.ref']):teamController.spaces}"
var="space"> var="space">
<f:selectItem itemLabel="#{space.item['space.name']}" <f:selectItem itemLabel="#{space.item['space.name']}" itemValue="#{space.item['$UniqueID']}">
itemValue="#{space.item['$UniqueID']}">
</f:selectItem> </f:selectItem>
</c:forEach> </c:forEach>
<f:ajax render="#{formComponents.clientId}" execute="#{formComponents.clientId}" onevent="initFaelligkeit" /> <f:ajax render="#{formComponents.clientId}" execute="#{formComponents.clientId}"
onevent="initFaelligkeit" />
</h:selectOneMenu> </h:selectOneMenu>
</ui:fragment> </ui:fragment>
<ui:fragment rendered="#{readonly}"> <ui:fragment rendered="#{readonly}">
@ -25,5 +22,4 @@
</h:outputText> </h:outputText>
</ui:fragment> </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" <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"> xmlns:h="http://xmlns.jcp.org/jsf/html">
<ui:fragment rendered="#{!readonly}"> <ui:fragment rendered="#{!readonly}">
<h:selectOneMenu style="width:20em;" required="true" <h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}">
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"> <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> </c:forEach>
<f:selectItem itemLabel="#{custom['payment.no_sepa']}" <f:selectItem itemLabel="#{custom['payment.no_sepa']}" itemValue="no_sepa" />
itemValue="no_sepa" />
<f:selectItem itemLabel="#{custom['payment.direct_debit']}" itemValue="direct_debit" /> <f:selectItem itemLabel="#{custom['payment.direct_debit']}" itemValue="direct_debit" />
</c:if> </c:if>
<f:selectItem itemLabel="#{custom['payment.credit']}" itemValue="credit" /> <f:selectItem itemLabel="#{custom['payment.credit']}" itemValue="credit" />
@ -41,5 +35,4 @@
</ui:fragment> </ui:fragment>
</ui:composition> </ui:composition>