diff --git a/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml index 450d976..7bf08d0 100644 --- a/office-alexander-logistics-app/pom.xml +++ b/office-alexander-logistics-app/pom.xml @@ -5,7 +5,7 @@ office-alexander-logistics com.alexander-logistics - 1.1.5 + 1.2.0 office-alexander-logistics-app war @@ -193,14 +193,8 @@ - org.imixs.marty - imixs-marty-ejb - jar - compile - - - org.imixs.marty - imixs-marty-util + org.imixs.workflow + imixs-marty jar compile diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java index e876a7a..66b3622 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftSplitAdapter.java @@ -10,7 +10,6 @@ import java.util.regex.Pattern; import javax.inject.Inject; -import org.imixs.marty.ejb.SequenceService; import org.imixs.workflow.ItemCollection; import org.imixs.workflow.SignalAdapter; import org.imixs.workflow.WorkflowKernel; @@ -19,6 +18,7 @@ import org.imixs.workflow.engine.plugins.SplitAndJoinPlugin; import org.imixs.workflow.exceptions.AdapterException; import org.imixs.workflow.exceptions.ModelException; import org.imixs.workflow.exceptions.PluginException; +import org.imixs.workflow.office.util.SequenceService; /** * Der CargosoftSplitAdapter erezeugt anhand der Positionstablelle eignee diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java new file mode 100644 index 0000000..4897240 --- /dev/null +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java @@ -0,0 +1,49 @@ +package com.alexanderlogistics; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +import javax.enterprise.context.ConversationScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.inject.Named; + +import org.imixs.workflow.engine.DocumentService; + +/** + * Der InvoiceDispatchController ist nur für die form 'section_inovice_dispatch' da um die angwählten checkboxen zu + * notieren + * + * @se: https://stackoverflow.com/questions/2524514/how-to-use-hselectbooleancheckbox-in-hdatatable-or-uirepeat-to-select-m + * @author rsoika + * + */ +@Named +@RequestScoped +public class InvoiceDispatchController implements Serializable { + + private static final long serialVersionUID = 1L; + private static Logger logger = Logger.getLogger(InvoiceDispatchController.class.getName()); + + private Map checked = new HashMap(); + private List invoices; + public Map getChecked() { + return checked; + } + public void setChecked(Map checked) { + this.checked = checked; + } + public List getInvoices() { + return invoices; + } + public void setInvoices(List invoices) { + this.invoices = invoices; + } + + + + +} diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml new file mode 100644 index 0000000..0365fff --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml @@ -0,0 +1,111 @@ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Bereich#{message['form.company']}#{message['form.invoicenumber']}#{message['form.date']}Fälligkeit#{message['form.amount']}
+ + #{invoice.item['space.name']} + #{invoice.item['cdtr.name']} + + + #{invoice.item['invoice.number']} + + + + + + #{invoice.item['invoice.currency']}
+
+ + + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml new file mode 100644 index 0000000..1e494cc --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml @@ -0,0 +1,82 @@ + + + + + + + + +
+
#{message['form.space']}
+
+ + + + + + + + +
+
+ +
+
+ Sachbearbeiter:* +
+
+ + + + + + + + + +
+
+ + + + + + +
+
+ Azubi:* +
+
+ + + + + + + +
+
+ + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml new file mode 100644 index 0000000..f8c1fda --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index bcf4fe7..ab3a0c6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.alexander-logistics office-alexander-logistics - 1.1.5 + 1.2.0 pom Imixs Office Workflow - Custom Build @@ -26,9 +26,9 @@ 5.2.13-SNAPSHOT - 4.1.14-SNAPSHOT - 4.4.8-SNAPSHOT - 2.2.9-SNAPSHOT + 4.2.0-SNAPSHOT + 4.5.0-SNAPSHOT + 2.3.0-SNAPSHOT 2.2.13-SNAPSHOT 1.0.20 @@ -145,16 +145,10 @@ - org.imixs.marty - imixs-marty-util + org.imixs.workflow + imixs-marty ${org.imixs.marty.version} - - org.imixs.marty - imixs-marty-ejb - ${org.imixs.marty.version} - provided - diff --git a/workflow/stapelverarbeitung-pruefung-de-1.0.0.bpmn b/workflow/stapelverarbeitung-pruefung-de-1.0.0.bpmn new file mode 100644 index 0000000..7a3edbb --- /dev/null +++ b/workflow/stapelverarbeitung-pruefung-de-1.0.0.bpmn @@ -0,0 +1,796 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Task_2 + StartEvent_1 + IntermediateCatchEvent_13 + IntermediateCatchEvent_19 + IntermediateThrowEvent_3 + EventBasedGateway_1 + IntermediateCatchEvent_24 + IntermediateCatchEvent_7 + EndEvent_3 + Task_8 + Task_5 + IntermediateCatchEvent_23 + EndEvent_2 + IntermediateCatchEvent_5000-20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + space.name ]]> + + + false + + + + + + + SequenceFlow_46 + SequenceFlow_4 + + + SequenceFlow_1 + + + + + + + + txtlastcomment]]> + + + + + + + + + space.name sb.team / sb.assist]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_20 + SequenceFlow_1 + SequenceFlow_22 + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + + SequenceFlow_20 + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_52 + SequenceFlow_4 + SequenceFlow_47 + + + SequenceFlow_47 + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_17 + SequenceFlow_60 + SequenceFlow_9 + + + SequenceFlow_9 + + + + SequenceFlow_17 + + + + + SequenceFlow_22 + SequenceFlow_46 + SequenceFlow_49 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich löschen?]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_49 + SequenceFlow_48 + + + SequenceFlow_48 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_52 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_60 + + + + + + + Liegt eine Logistik Leistung vor, wird ein Fachbereich ausgewählt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file