From d2871aa692e3695aca484ae1cfea0bc88849e07b Mon Sep 17 00:00:00 2001
From: jenniferboedker <jennifer.boedker@qbic.uni-tuebingen.de>
Date: Fri, 21 May 2021 16:28:48 +0200
Subject: [PATCH 1/2] Bump version from 2.7.0 to 2.8.0-SNAPSHOT

---
 .qube.yml     |  2 +-
 CHANGELOG.rst | 12 ++++++++++++
 docs/conf.py  |  4 ++--
 pom.xml       |  2 +-
 qube.cfg      |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.qube.yml b/.qube.yml
index 61f1ef9e6..944bcf9c0 100644
--- a/.qube.yml
+++ b/.qube.yml
@@ -4,7 +4,7 @@ email: sven.fillinger@qbic.uni-tuebingen.de
 project_name: data-model-lib
 project_short_description: "Data models. A collection of QBiC's central data models\
   \ and DTOs. "
-version: 2.7.0
+version: 2.8.0-SNAPSHOT
 domain: lib
 language: groovy
 project_slug: data-model-lib
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c499eb71d..30e2ce2da 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,18 @@ Changelog
 This project adheres to `Semantic Versioning <https://semver.org/>`_.
 
 
+2.8.0-SNAPSHOT (2021-05-21)
+---------------------------
+
+**Added**
+
+**Fixed**
+
+**Dependencies**
+
+**Deprecated**
+
+
 2.7.0 (2021-05-21)
 ------------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 020d165f7..30fdc522c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -55,9 +55,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = '2.7.0'
+version = '2.8.0-SNAPSHOT'
 # The full version, including alpha/beta/rc tags.
-release = '2.7.0'
+release = '2.8.0-SNAPSHOT'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/pom.xml b/pom.xml
index f81f51abd..f9d5b3fe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>life.qbic</groupId>
 	<artifactId>data-model-lib</artifactId>
-	<version>2.7.0</version> <!-- <<QUBE_FORCE_BUMP>> -->
+	<version>2.8.0-SNAPSHOT</version> <!-- <<QUBE_FORCE_BUMP>> -->
 	<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/qube.cfg b/qube.cfg
index 0f8ac4a43..a731dce23 100644
--- a/qube.cfg
+++ b/qube.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.7.0
+current_version = 2.8.0-SNAPSHOT
 
 [bumpversion_files_whitelisted]
 dot_qube = .qube.yml

From f143b4f9a7e221603b4b3aa5bcb41d508f3e3da8 Mon Sep 17 00:00:00 2001
From: jnnfr <jennifer.boedker@qbic.uni-tuebingen.de>
Date: Mon, 7 Jun 2021 15:15:21 +0200
Subject: [PATCH 2/2] Add pxp product units (#215)

Add PxP product unit types to ProductType
Co-authored-by: Tobias Koch <tobias.koch@qbic.uni-tuebingen.de>
---
 CHANGELOG.rst                                      | 14 ++++++++++++++
 .../dtos/business/services/ProductUnit.groovy      | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 30e2ce2da..ea7b1b04a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,6 +10,20 @@ This project adheres to `Semantic Versioning <https://semver.org/>`_.
 
 **Added**
 
+* Add new product unit types to ``life.qbic.datamodel.dtos.business.services.ProductUnit`` (`#215 <https://github.com/qbicsoftware/data-model-lib/pull/215>`_)
+
+  -   PER_HOUR("Hour"),
+  -   PER_PROJECT("Project"),
+  -   PER_RUN("Run"),
+  -   PER_CYCLE("Cycle"),
+  -   PER_GEL("Gel/HpH"),
+  -   PER_10_MG("10 milligram"),
+  -   PER_MEASUREMENT("Measurement"),
+  -   PER_CHANNEL("Channel"),
+  -   PER_100_MICROGRAM_PEPTIDE_CHANNEL("100 microgram peptides channel"),
+  -   PER_500_ML("500 milliliter"),
+  -   PER_COMPARISON("Comparison")
+
 **Fixed**
 
 **Dependencies**
diff --git a/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy b/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy
index 4c38252f7..c4b626bac 100644
--- a/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy
+++ b/src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy
@@ -10,7 +10,17 @@ enum ProductUnit {
   PER_GIGABYTE("Gigabyte"),
   PER_SAMPLE("Sample"),
   PER_DATASET("Dataset"),
-  PER_HOUR("Hour")
+  PER_HOUR("Hour"),
+  PER_PROJECT("Project"),
+  PER_RUN("Run"),
+  PER_CYCLE("Cycle"),
+  PER_GEL("Gel/HpH"),
+  PER_10_MG("10 milligram"),
+  PER_MEASUREMENT("Measurement"),
+  PER_CHANNEL("Channel"),
+  PER_100_MICROGRAM_PEPTIDE_CHANNEL("100 microgram peptides channel"),
+  PER_500_ML("500 milliliter"),
+  PER_COMPARISON("Comparison")
 
   /**
    Holds the String value of the enum
@@ -42,4 +52,4 @@ enum ProductUnit {
     return this.getValue()
   }
 
-}
\ No newline at end of file
+}