diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5614e64d..7a930ff9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,7 @@
+
@@ -25,17 +26,12 @@
-
{
- "associatedIndex": 8
+ "associatedIndex": 6
}
-
+
@@ -45,6 +41,9 @@
"Maven.OMDSServiceDefinition clean package.executor": "Run",
"ModuleVcsDetector.initialDetectionPerformed": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "develop2",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "C:/Users/Lukas/IdeaProjects/omdsservicedefinitions",
"RunOnceActivity.git.unshallow": "true",
"git-widget-placeholder": "feature/aenderungen",
"node.js.detected.package.eslint": "true",
@@ -58,23 +57,25 @@
"vue.rearranger.settings.migration": "true"
}
}]]>
+
-
-
+
+
+
1745998089296
- 1745998089296
-
-
+ 1715764550395
+
+
diff --git a/OMDSServiceDefinition/.gitignore b/OMDSServiceDefinition/.gitignore
index a7d8d504..8dee1a89 100644
--- a/OMDSServiceDefinition/.gitignore
+++ b/OMDSServiceDefinition/.gitignore
@@ -2,4 +2,5 @@
/docGen/
/out
/auxil
+/.idea/workspace.xml
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java
index 757244ea..3d028d35 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java
@@ -34,7 +34,6 @@ public class UnfallCalcService {
response.getBerechnungsantwort().getVerkaufsprodukt().getPraemie().stream().findFirst()
.ifPresent(praemieType -> verkaufsproduktUnfall.setPraemie(praemieType.getPraemieBto()));
-
return verkaufsproduktUnfall;
}
-}
+}
\ No newline at end of file
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java
new file mode 100644
index 00000000..ee759167
--- /dev/null
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java
@@ -0,0 +1,5 @@
+package at.vvo.omds.client.api;
+
+public interface UnterbausteinInterface extends ProduktbausteinInterface {
+
+}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java
index 426a14e9..25684bd2 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java
@@ -45,6 +45,9 @@ public class SOAPConnector {
System.out.println("-----------------------------------------------------------------------------");
printMessage(response);
+ System.out.println("-----------------------------------------------------------------------------");
+ printMessage(req);
+
CalculateResponse erg =
(CalculateResponse) unmarshaller.unmarshal(response.getSOAPBody().extractContentAsDocument());
soapConnection.close();
diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb b/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
index 397934ee..85be8dae 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
+++ b/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
@@ -107,6 +107,24 @@
+
+
+
+ Die Liste der Attribute für diesen Deckungsbaustein.]]>
+
+
+
+
+ Die Liste der Meldungen für diesen Deckungsbaustein.]]>
+
+
+
+
+
+ Die Liste der Unterbausteine für diesen Deckungsbaustein.]]>
+
+
+
Die Liste der Klauseln für diesen Deckungsbaustein.]]>
@@ -407,26 +425,26 @@
-
-
- Die Klauseln des Deckungsbausteins.]]>
-
-
-
-
- Die Unterbausteine des Deckungsbausteins.]]>
-
-
-
-
- Die Attribute des Deckungsbausteins.]]>
-
-
-
-
- Die Meldungen des Deckungsbausteins.]]>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd
index 7aee83a7..7f07ed66 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd
@@ -1720,6 +1720,7 @@
+
@@ -1760,6 +1761,12 @@
+
+
+
+
+
+
Typ für eine Liste zulässiger Kombinationen von Produktbaustein-Ids als Restriktion.
diff --git a/OMDSServiceDefinition/src/main/resources/log4j.properties b/OMDSServiceDefinition/src/main/resources/log4j.properties
index e64bb6c6..0382179c 100644
--- a/OMDSServiceDefinition/src/main/resources/log4j.properties
+++ b/OMDSServiceDefinition/src/main/resources/log4j.properties
@@ -9,7 +9,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %-12c{1}:%-3L - %m%n
# Log-Level fuer Projekt
-log4j.logger.at.vvo=INFO
+log4j.logger.at.vvo=DEBUG
# Wenn gewünscht, z.B. ändern auf Debug
#log4j.logger.at.vvo=DEBUG
\ No newline at end of file