From ca75f293edc4c62f7693bda82b688a9837c02204 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Wed, 8 Nov 2023 13:46:04 +0100
Subject: Issue #61: Erlaube Formularvariante UKER.Molekulargenetik
(cherry picked from commit d6d3a524eb2fe4c54b68b40f3afeeade9be08631)
---
.../molekulargenetik/OsMolekulargenetikFormService.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java b/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java
index e3d057f..3bc6000 100644
--- a/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java
+++ b/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java
@@ -10,18 +10,18 @@ import java.util.stream.Collectors;
public class OsMolekulargenetikFormService implements MolekulargenetikFormService {
/**
- * Ermittelt alle (unterstützten) Varianten zur Prozedur eines Formulars "OS.Molekulargenetik"
+ * Ermittelt alle (unterstützten) Varianten zur Prozedur eines Formulars "OS.Molekulargenetik" (oder Variante)
* Unterstützte Varianten sind:
*
* - Einfache Variante
*
- CNV
*
- Fusion
- * @param procedure Die Prozedur zum Formular "OS.Molekulargenetik"
+ * @param procedure Die Prozedur zum Formular "OS.Molekulargenetik" (oder Variante)
* @return Die unterstützten Varianten oder eine leere Liste, wenn keine Varianten gefunden wurden.
*/
@Override
public List getVariants(Procedure procedure) {
- if (! "OS.Molekulargenetik".equals(procedure.getFormName())) {
+ if (! procedureWithUsableFormVariant(procedure)) {
return List.of();
}
@@ -37,4 +37,9 @@ public class OsMolekulargenetikFormService implements MolekulargenetikFormServic
.collect(Collectors.toList());
}
+
+ private boolean procedureWithUsableFormVariant(Procedure procedure) {
+ return "OS.Molekulargenetik".equals(procedure.getFormName())
+ || "UKER.Molekulargenetik".equals(procedure.getFormName());
+ }
}
--
cgit v1.2.3
From a8af543011b05c79bdb99ca4368ae7f614c7f10f Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Wed, 8 Nov 2023 13:49:09 +0100
Subject: New release - bump version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d5d677c..9ce7fbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
DNPMHelper
DNPMHelper
- 0.5.0
+ 0.5.1
DNPMHelper
--
cgit v1.2.3