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

update

Browse source
This commit is contained in:
Ralph Soika 2026-02-24 11:52:14 +01:00
parent 1d7fb83710
commit 676310ae38
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java
View file

@ -76,6 +76,8 @@ public class AGLAnalyticControllerOPListe implements Serializable {
department = documentService.load(departmentID); department = documentService.load(departmentID);
if (department != null) { if (department != null) {
event.getWorkitem().setItemValue("space.name", department.getItemValueString("name")); event.getWorkitem().setItemValue("space.name", department.getItemValueString("name"));
} else {
} }
departmentIDLast = departmentID; departmentIDLast = departmentID;
resetStats(event); resetStats(event);
@ -158,7 +160,7 @@ public class AGLAnalyticControllerOPListe implements Serializable {
try { try {
if (departmentID == null || !departmentID.isEmpty()) { if (departmentID == null || (!departmentID.isEmpty() && !"-".equals(departmentID))) {
countAll = documentService.count( countAll = documentService.count(
"(type:workitem) AND $uniqueidref:" + departmentID + " AND $modelversion:rechnungsausgang-*"); "(type:workitem) AND $uniqueidref:" + departmentID + " AND $modelversion:rechnungsausgang-*");

12
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
View file

@ -400,10 +400,14 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
Map<String, List<ItemCollection>> result = new HashMap<>(); Map<String, List<ItemCollection>> result = new HashMap<>();
try { try {
List<ItemCollection> invoices = documentService.find( String query = "";
"$modelversion:rechnungsausgang-* AND type:workitem AND $uniqueidref:" + spaceID, 9999, 0, if (spaceID == null || spaceID.isEmpty() || "-".equals(spaceID)) {
"invoice.number", false); // no space selection
query = "$modelversion:rechnungsausgang-* AND type:workitem";
} else {
query = "$modelversion:rechnungsausgang-* AND type:workitem AND $uniqueidref:" + spaceID;
}
List<ItemCollection> invoices = documentService.find(query, 9999, 0, "invoice.number", false);
for (ItemCollection invoice : invoices) { for (ItemCollection invoice : invoices) {
String dbtrNumber = invoice.getItemValueString("dbtr.number"); String dbtrNumber = invoice.getItemValueString("dbtr.number");

15
workflow/pl/rechnungsausgang-pl-1.1.0.bpmn
View file

@ -1057,16 +1057,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<imixs:item name="keyupdateacl" type="xs:boolean"> <imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value> <imixs:value>false</imixs:value>
</imixs:item> </imixs:item>
<imixs:item name="txtbusinessrule" type="CDATA">
<imixs:value><![CDATA[var result={};
var refField="txtcomment";
result.isValid=true;
if ( ( workitem.get(refField) == null || ''==workitem.get(refField)[0]) ) {
result.isValid=false;
result.errorMessage='Bitte geben Sie einen Kommentar ein.';
}]]></imixs:value>
</imixs:item>
</bpmn2:extensionElements> </bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_22"><![CDATA[Close invoice, no posting]]></bpmn2:documentation> <bpmn2:documentation id="Documentation_22"><![CDATA[Close invoice, no posting]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_9</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
@ -3438,9 +3428,8 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht</bpmn2:text>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_seshBg" id="BPMNEdge_yhILiw" sourceElement="BPMNShape_B0zMZw" targetElement="BPMNShape_Task_3"> <bpmndi:BPMNEdge bpmnElement="sequenceFlow_seshBg" id="BPMNEdge_yhILiw" sourceElement="BPMNShape_B0zMZw" targetElement="BPMNShape_Task_3">
<di:waypoint x="1421.0" y="1551.0"/> <di:waypoint x="1421.0" y="1551.0"/>
<di:waypoint x="1331.0" y="1551.0"/> <di:waypoint x="1175.0" y="1551.0"/>
<di:waypoint x="1331.0" y="1375.0"/> <di:waypoint x="1175.0" y="1400.0"/>
<di:waypoint x="1240.0" y="1375.0"/>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_mWGV4Q" id="BPMNEdge_v6BkSQ" sourceElement="BPMNShape_r4XKgQ" targetElement="BPMNShape_rAwIzQ"> <bpmndi:BPMNEdge bpmnElement="sequenceFlow_mWGV4Q" id="BPMNEdge_v6BkSQ" sourceElement="BPMNShape_r4XKgQ" targetElement="BPMNShape_rAwIzQ">
<di:waypoint x="1846.0" y="270.0"/> <di:waypoint x="1846.0" y="270.0"/>