Merge release 2.25.1 into development (#360)

* Streamline Nanopore models in Readme * Add metabolomics facility for products (#358) * Set version to 2.25.1 (#359) --------- Co-authored-by: Steffengreiner <[email protected]> Co-authored-by: Steffengreiner <[email protected]> Co-authored-by: Sven F <[email protected]>
qbicsoftware · May 4, 2023 · 462831d · 462831d
1 parent cb4e5d9
commit 462831d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -103,13 +103,6 @@ A Nanopore NGS measurement output is delivered to us as a nested folder structur
 
 ![Nanopore Data Structure Model](./doc/figures/Nanopore_Data_Structure_Model.svg)
 
-A more recent model, which places two of the configuration files into a subfolder and adds the barcode alignment file, is also supported:
-
-![Nanopore Data Structure Model v2](./doc/figures/Nanopore_Data_Structure_Model_v2.svg)
-
-V4 outlines a model in which a second higher-accuracy basecalling was performed after the initial basecalling
-
-![Nanopore Data Structure Model v4](./doc/figures/Nanopore_Data_Structure_Model_v4.svg)
 
 #### Nanopore usage example
 

diff --git a/doc/figures/Nanopore_Data_Structure_Model.svg b/doc/figures/Nanopore_Data_Structure_Model.svg
diff --git a/doc/figures/Nanopore_Data_Structure_Model_v2.svg b/doc/figures/Nanopore_Data_Structure_Model_v2.svg
diff --git a/doc/figures/Nanopore_Data_Structure_Model_v4.svg b/doc/figures/Nanopore_Data_Structure_Model_v4.svg
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>life.qbic</groupId>
   <artifactId>data-model-lib</artifactId>
-  <version>2.25.0</version>
+  <version>2.25.1</version>
   <name>data-model-lib</name>
   <url>http://github.com/qbicsoftware/data-model-lib</url>
   <description>Data models. A collection of QBiC's central data models and DTOs. </description>

diff --git a/src/main/groovy/life/qbic/datamodel/dtos/business/facilities/Facility.groovy b/src/main/groovy/life/qbic/datamodel/dtos/business/facilities/Facility.groovy
@@ -25,7 +25,8 @@ enum Facility {
     QBIC("Quantitative Biology Center", "QBIC"),
     CFMB_PCT("Proteomics Facility Tübingen", "Proteomics Facility"),
     PCT("Proteome Center Tübingen", "PCT"),
-    CEGAT("CeGaT GmbH", "CeGaT GmbH")
+    CEGAT("CeGaT GmbH", "CeGaT GmbH"),
+    METABOLOMICS("Metabolomics Facility Tübingen", "Metabolomics Facility")
 
     private final String fullName
     private final String label