update form parts

This commit is contained in:
Ralph Soika 2021-11-09 16:56:57 +01:00
parent 1e4382e94f
commit 509c7858cc
9 changed files with 398 additions and 33 deletions

View file

@ -0,0 +1,132 @@
<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">
<dl>
<dt>Zahlungsart:</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')}">
<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
<f:selectItem itemLabel="#{dbtr.item['name']}"
itemValue="#{dbtr.item['name']}" />
</c:forEach>
<f:selectItem itemLabel="Manuelle Auslandszahlung"
itemValue="no_sepa" />
<f:selectItem itemLabel="Lastschrift" itemValue="direct_debit" />
</c:if>
<f:selectItem itemLabel="Gutschrift" itemValue="credit" />
</h:selectOneMenu>
</dd>
</dl>
<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>
<!-- Verteilung zur Sachpruefung -->
<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>
<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']}">
<f:selectItem
itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
</dd>
</dl>
<!-- 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: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>
<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>
</ui:fragment>
</h:panelGroup>
<div class="imixs-form-section-2">
<dl>
<dt>
Exchange Rate:<span class="imixs-required">*</span>
</dt>
<dd>
<h:inputText required="#{validationController.required}"
value="#{workitem.item['invoice.exchangerate']}">
<f:convertNumber pattern="#0.00000" />
</h:inputText>
</dd>
</dl>
</div>
</ui:composition>

View file

@ -0,0 +1,39 @@
<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:fragment rendered="#{(!empty space.item['space.assist'])}">
<ui:fragment rendered="#{!readonly}">
<h:selectOneMenu required="false" style="width:20em;"
value="#{workflowController.workitem.item[name]}">
<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>
</ui:fragment>
<ui:fragment rendered="#{!readonly}">
<h:outputText
value="#{userController.getUserName(workitem.item[name])}">
</h:outputText>
</ui:fragment>
</ui:fragment>
</ui:composition>

View file

@ -5,15 +5,20 @@
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty">
<h:inputText value="#{workitem.item[name]}"
onchange="validateBuchungsDatum(this,true);" id="date_invoice"
required="false" styleClass="alexander-logistic-date">
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
</h:inputText>
<ui:fragment rendered="#{!readonly}" >
<h:inputText value="#{workitem.item[name]}"
onchange="validateBuchungsDatum(this,true);" id="date_invoice"
required="false" styleClass="alexander-logistic-date">
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
</h:inputText>
</ui:fragment>
<ui:fragment rendered="#{readonly}" >
<h:outputText value="#{workitem.item[item.name]}">
<f:convertDateTime timeZone="#{message.timeZone}"
pattern="#{message.datePatternShort}" />
</h:outputText>
</ui:fragment>
</ui:composition>

View file

@ -6,17 +6,23 @@
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty">
<ui:fragment rendered="#{!readonly}" >
<ui:param name="namesub" value="#{name}_days"></ui:param>
<h:inputText value="#{workitem.item[namesub]}" style="width:2em;" class="alexander-logistic-date-days" />
<h:inputText value="#{workitem.item[name]}"
onchange="validateBuchungsDatum(this,true);" id="date_invoice"
required="false" styleClass="alexander-logistic-date">
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
<h:inputText value="#{workitem.item[namesub]}" style="width:2em;" class="alexander-logistic-date-days" />
<h:inputText value="#{workitem.item[name]}"
onchange="validateBuchungsDatum(this,true);" id="date_invoice"
required="false" styleClass="alexander-logistic-date">
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
</h:inputText>
<ui:param name="namesub" value="#{name}_days"></ui:param>
</h:inputText>
</ui:fragment>
<ui:fragment rendered="#{readonly}" >
<h:outputText value="#{workitem.item[item.name]}">
<f:convertDateTime timeZone="#{message.timeZone}"
pattern="#{message.datePatternShort}" />
</h:outputText>
</ui:fragment>
</ui:composition>

View file

@ -0,0 +1,21 @@
<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']}">
<f:convertNumber pattern="#0.00000" />
</h:inputText>
</ui:fragment>
<ui:fragment rendered="#{readonly}">
<h:outputText required="true"
value="#{workitem.item['invoice.exchangerate']}">
</h:outputText>
</ui:fragment>
</ui:composition>

View file

@ -7,18 +7,25 @@
<ui:param name="space"
value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
<h:selectOneMenu required="false" style="width:20em;"
value="#{workitem.item[name]}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
value="#{teamController.getSpaceById(workitem.item['space.ref'])}"></ui:param>
<c:forEach var="teammember" items="#{space.itemList['space.team']}">
<ui:fragment rendered="#{!readonly}">
<h:selectOneMenu required="false" style="width:20em;"
value="#{workitem.item['sb.team']}">
<f:selectItem itemLabel="" itemValue="-"></f:selectItem>
<f:selectItem
itemLabel="#{userController.getUserName(teammember)}"
itemValue="#{teammember}"></f:selectItem>
</c:forEach>
</h:selectOneMenu>
<c:forEach var="teammember" items="#{space.itemList['space.team']}">
<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>
</ui:fragment>
</ui:composition>

View file

@ -0,0 +1,30 @@
<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}"
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>
</c:forEach>
<f:ajax render="imixs_workitem_form_id" />
</h:selectOneMenu>
</ui:fragment>
<ui:fragment rendered="#{readonly}">
<h:outputText value="#{workitem.item['space.name']}">
</h:outputText>
</ui:fragment>
</ui:composition>

View file

@ -0,0 +1,32 @@
<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')}">
<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
<f:selectItem itemLabel="#{dbtr.item['name']}"
itemValue="#{dbtr.item['name']}" />
</c:forEach>
<f:selectItem itemLabel="Manuelle Auslandszahlung"
itemValue="no_sepa" />
<f:selectItem itemLabel="Lastschrift" itemValue="direct_debit" />
</c:if>
<f:selectItem itemLabel="Gutschrift" itemValue="credit" />
</h:selectOneMenu>
</ui:fragment>
<ui:fragment rendered="#{readonly}">
<h:outputText required="true" value="#{workitem.item['payment.type']}">
</h:outputText>
</ui:fragment>
</ui:composition>

View file

@ -1345,7 +1345,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
<bpmn2:task id="Task_1" imixs:processid="5100" name="Verteilung zur Prüfung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic_read#alexander/sub_payment_type_read|alexander/sub_responsible|alexander/sub_responsible_delegation]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -3232,7 +3232,7 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
<bpmn2:task id="Task_14" imixs:processid="5001" name="Bearbeitung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_payment_type|sub_dispatch]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -5195,6 +5195,73 @@ result.isValid=true;
<bpmn2:outputSet id="OutputSet_6" name="Output Set 1"/>
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_95" sourceRef="IntermediateCatchEvent_49" targetRef="Task_2"/>
<bpmn2:dataObject id="DataObject_5" name="Form">
<bpmn2:documentation id="Documentation_67"><![CDATA[<?xml version="1.0"?>
<imixs-form>
<imixs-form-section columns="1" label="Rechnungsdaten">
<item name="cdtr.name" type="text" label="Kreditor:"/>
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.number" type="text" label="Rechnungsnummer:" />
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Rechnungsdatum:" />
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Fälligkeitsdatum:" />
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.total" type="currency" required="true" label="Rechnungsbetrag:" />
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.iban" type="text" label="IBAN:" />
<item name="cdtr.bic" type="text" label="BIC:" />
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.number" type="text" required="true" label="Kreditorennummer:" />
<item name="invoice.period" type="text" required="false" label="Buchungsperiode (yyyymm):" />
<item name="" type="custom" path="alexander/zahlungsart" label="Zahlungsart:"/>
<item name="" type="custom" path="alexander/spaceref" label="Bereich:" />
</imixs-form-section>
</imixs-form>]]></bpmn2:documentation>
</bpmn2:dataObject>
<bpmn2:dataObject id="DataObject_7" name="Form">
<bpmn2:documentation id="Documentation_74"><![CDATA[<?xml version="1.0"?>
<imixs-form>
<imixs-form-section columns="1" label="Rechnungsdaten">
<item name="cdtr.name" type="text" label="Kreditor:"/>
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.number" type="text" label="Rechnungsnummer:" readonly="true" />
<item name="invoice.date" type="custom" path="alexander/datumseingabe" label="Rechnungsdatum:" readonly="true" />
<item name="invoice.duedate" type="custom" path="alexander/datumseingabe_tage" required="true" label="Fälligkeitsdatum:" readonly="true"/>
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.total" type="currency" required="true" label="Rechnungsbetrag:" readonly="true"/>
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" readonly="true"/>
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.iban" type="text" label="IBAN:" readonly="true"/>
<item name="cdtr.bic" type="text" label="BIC:" readonly="true"/>
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.number" type="text" required="true" label="Kreditorennummer:" readonly="true" />
<item name="invoice.period" type="text" required="false" label="Buchungsperiode (yyyymm):" readonly="true"/>
<item name="" type="custom" path="alexander/zahlungsart" label="Zahlungsart:" readonly="true"/>
<item name="" type="custom" path="alexander/spaceref" label="Bereich:" />
<item name="" type="custom" path="alexander/sachbearbeiter" label="Sachbearbeiter:" />
<item name="" type="custom" path="alexander/azubi" label="Azubi:" />
</imixs-form-section>
</imixs-form>]]></bpmn2:documentation>
</bpmn2:dataObject>
<bpmn2:association id="Association_2" sourceRef="DataObject_2" targetRef="Task_2"/>
<bpmn2:textAnnotation id="TextAnnotation_2">
<bpmn2:text>Es handelt sich um einen SEPA Lauf. Die Rechnung muss explizit freigegeben werden.
@ -5218,6 +5285,8 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
</bpmn2:textAnnotation>
<bpmn2:association id="Association_4" sourceRef="TextAnnotation_3" targetRef="IntermediateCatchEvent_36"/>
<bpmn2:association id="Association_6" sourceRef="TextAnnotation_3" targetRef="IntermediateCatchEvent_44"/>
<bpmn2:association id="Association_8" sourceRef="DataObject_5" targetRef="Task_14"/>
<bpmn2:association id="Association_9" sourceRef="DataObject_7" targetRef="Task_1"/>
</bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="Collaboration_1">
@ -5915,6 +5984,18 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<dc:Bounds height="14.0" width="52.0" x="337.0" y="310.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_DataObject_4" bpmnElement="DataObject_5">
<dc:Bounds height="50.0" width="36.0" x="770.0" y="360.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_242">
<dc:Bounds height="14.0" width="28.0" x="774.0" y="410.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_DataObject_5" bpmnElement="DataObject_7">
<dc:Bounds height="50.0" width="36.0" x="500.0" y="600.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_244">
<dc:Bounds height="14.0" width="28.0" x="504.0" y="650.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_0" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_ExclusiveGateway_1">
<di:waypoint xsi:type="dc:Point" x="155.0" y="205.0"/>
<di:waypoint xsi:type="dc:Point" x="187.0" y="205.0"/>
@ -6673,6 +6754,18 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
<di:waypoint xsi:type="dc:Point" x="363.0" y="230.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_229"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_8" bpmnElement="Association_8" sourceElement="BPMNShape_DataObject_4" targetElement="BPMNShape_Task_16">
<di:waypoint xsi:type="dc:Point" x="788.0" y="360.0"/>
<di:waypoint xsi:type="dc:Point" x="788.0" y="286.0"/>
<di:waypoint xsi:type="dc:Point" x="759.0" y="286.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_243"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_9" bpmnElement="Association_9" sourceElement="BPMNShape_DataObject_5" targetElement="BPMNShape_Task_3">
<di:waypoint xsi:type="dc:Point" x="518.0" y="600.0"/>
<di:waypoint xsi:type="dc:Point" x="518.0" y="543.0"/>
<di:waypoint xsi:type="dc:Point" x="455.0" y="543.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_245"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
<dc:Font name="arial" size="9.0"/>