From b42b76b352e1c0558ab0346821b9775cee7a8f3c Mon Sep 17 00:00:00 2001 From: jenniferboedker Date: Mon, 7 Jun 2021 13:22:33 +0200 Subject: [PATCH 1/9] add product unit types! --- .../dtos/business/services/ProductUnit.groovy | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 4c38252f7b..761556c50c 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,16 @@ enum ProductUnit { PER_GIGABYTE("Gigabyte"), PER_SAMPLE("Sample"), PER_DATASET("Dataset"), - PER_HOUR("Hour") + PER_HOUR("Hour"), + PER_RUN("Run"), + PER_CYCLE("Cycle"), + PER_GEL("Gel/HpH"), + PER_MG("10 mg"), + PER_MEASUREMENT("Measurement"), + PER_CHANNEL("Channel"), + PER_PEPTIDE_CHANNEL("100 µg peptides channel"), + PER_ML("500 ml"), + PER_COMPARISON("COMPARISON") /** Holds the String value of the enum From 09d084d9b82527af3217187a35a069af4e9ca55f Mon Sep 17 00:00:00 2001 From: jenniferboedker Date: Mon, 7 Jun 2021 13:23:55 +0200 Subject: [PATCH 2/9] add CL --- CHANGELOG.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 30e2ce2da0..66051023bd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,9 @@ This project adheres to `Semantic Versioning `_. **Added** +* Add new product unit types PER_RUN, PER_CYCLE, PER_GEL, PER_MG, PER_MEASUREMENT, PER_CHANNEL, PER_PEPTIDE_CHANNEL, PER_ML, PER_COMPARISON +to 'life.qbic.datamodel.dtos.business.services.ProductUnit' (`#215 `_) + **Fixed** **Dependencies** From 973a6090095b6b0651ba5e0343e4b92222d201f2 Mon Sep 17 00:00:00 2001 From: jenniferboedker Date: Mon, 7 Jun 2021 13:26:41 +0200 Subject: [PATCH 3/9] add comparision type --- CHANGELOG.rst | 2 +- .../qbic/datamodel/dtos/business/services/ProductUnit.groovy | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 66051023bd..1bd761da2f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ This project adheres to `Semantic Versioning `_. **Added** -* Add new product unit types PER_RUN, PER_CYCLE, PER_GEL, PER_MG, PER_MEASUREMENT, PER_CHANNEL, PER_PEPTIDE_CHANNEL, PER_ML, PER_COMPARISON +* Add new product unit types PER_PROJECT, PER_RUN, PER_CYCLE, PER_GEL, PER_MG, PER_MEASUREMENT, PER_CHANNEL, PER_PEPTIDE_CHANNEL, PER_ML, PER_COMPARISON to 'life.qbic.datamodel.dtos.business.services.ProductUnit' (`#215 `_) **Fixed** 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 761556c50c..9b2545762d 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 @@ -11,6 +11,7 @@ enum ProductUnit { PER_SAMPLE("Sample"), PER_DATASET("Dataset"), PER_HOUR("Hour"), + PER_PROJECT("Project"), PER_RUN("Run"), PER_CYCLE("Cycle"), PER_GEL("Gel/HpH"), From 209860c4671476cd399805306dbea0659896ec00 Mon Sep 17 00:00:00 2001 From: jenniferboedker Date: Mon, 7 Jun 2021 14:00:47 +0200 Subject: [PATCH 4/9] write full types --- .../datamodel/dtos/business/services/ProductUnit.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 9b2545762d..48b123368b 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 @@ -15,11 +15,11 @@ enum ProductUnit { PER_RUN("Run"), PER_CYCLE("Cycle"), PER_GEL("Gel/HpH"), - PER_MG("10 mg"), + PER_MG("10 Milligram"), PER_MEASUREMENT("Measurement"), PER_CHANNEL("Channel"), - PER_PEPTIDE_CHANNEL("100 µg peptides channel"), - PER_ML("500 ml"), + PER_PEPTIDE_CHANNEL("100 Microgram peptides channel"), + PER_ML("500 Milliliter"), PER_COMPARISON("COMPARISON") /** From ea4a8b95f98fe54f82cc5fd505fd3f0840119353 Mon Sep 17 00:00:00 2001 From: jnnfr Date: Mon, 7 Jun 2021 14:08:40 +0200 Subject: [PATCH 5/9] Apply suggestions from code review Co-authored-by: Tobias Koch --- .../datamodel/dtos/business/services/ProductUnit.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 48b123368b..7e3af82d0a 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 @@ -15,11 +15,11 @@ enum ProductUnit { PER_RUN("Run"), PER_CYCLE("Cycle"), PER_GEL("Gel/HpH"), - PER_MG("10 Milligram"), + PER_10_MG("10 Milligram"), PER_MEASUREMENT("Measurement"), PER_CHANNEL("Channel"), - PER_PEPTIDE_CHANNEL("100 Microgram peptides channel"), - PER_ML("500 Milliliter"), + PER_100_MICROGRAM_PEPTIDE_CHANNEL("100 Microgram peptides channel"), + PER_500_ML("500 Milliliter"), PER_COMPARISON("COMPARISON") /** @@ -52,4 +52,4 @@ enum ProductUnit { return this.getValue() } -} \ No newline at end of file +} From 07d0512a84a1067a494eaf12f4f31159e8d0dc61 Mon Sep 17 00:00:00 2001 From: jnnfr Date: Mon, 7 Jun 2021 14:13:04 +0200 Subject: [PATCH 6/9] Apply suggestions from code review Co-authored-by: Tobias Koch --- .../datamodel/dtos/business/services/ProductUnit.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 7e3af82d0a..a5106fa52b 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 @@ -15,11 +15,11 @@ enum ProductUnit { PER_RUN("Run"), PER_CYCLE("Cycle"), PER_GEL("Gel/HpH"), - PER_10_MG("10 Milligram"), + 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_100_MICROGRAM_PEPTIDE_CHANNEL("100 microgram peptides channel"), + PER_500_ML("500 milliliter"), PER_COMPARISON("COMPARISON") /** From 1be82a699db96ef3aac958927310af6f9ad824c3 Mon Sep 17 00:00:00 2001 From: jnnfr Date: Mon, 7 Jun 2021 14:16:33 +0200 Subject: [PATCH 7/9] correct typo Co-authored-by: Tobias Koch --- .../qbic/datamodel/dtos/business/services/ProductUnit.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a5106fa52b..c4b626bac6 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 @@ -20,7 +20,7 @@ enum ProductUnit { PER_CHANNEL("Channel"), PER_100_MICROGRAM_PEPTIDE_CHANNEL("100 microgram peptides channel"), PER_500_ML("500 milliliter"), - PER_COMPARISON("COMPARISON") + PER_COMPARISON("Comparison") /** Holds the String value of the enum From 60466297610ffe46634b212c92ee1b72f369511a Mon Sep 17 00:00:00 2001 From: jnnfr Date: Mon, 7 Jun 2021 14:22:08 +0200 Subject: [PATCH 8/9] Reformat comment in CHANGELOG.rst Co-authored-by: Tobias Koch --- CHANGELOG.rst | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1bd761da2f..b504f8c320 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,19 @@ This project adheres to `Semantic Versioning `_. **Added** -* Add new product unit types PER_PROJECT, PER_RUN, PER_CYCLE, PER_GEL, PER_MG, PER_MEASUREMENT, PER_CHANNEL, PER_PEPTIDE_CHANNEL, PER_ML, PER_COMPARISON +* Add new product unit types to 'life.qbic.datamodel.dtos.business.services.ProductUnit' (`#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") to 'life.qbic.datamodel.dtos.business.services.ProductUnit' (`#215 `_) **Fixed** From b1651468ba03d3cd5292ed9b11b4a41c3fb0b409 Mon Sep 17 00:00:00 2001 From: Tobias Koch Date: Mon, 7 Jun 2021 14:24:59 +0200 Subject: [PATCH 9/9] Update Changelog --- CHANGELOG.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b504f8c320..ea7b1b04aa 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ This project adheres to `Semantic Versioning `_. **Added** -* Add new product unit types to 'life.qbic.datamodel.dtos.business.services.ProductUnit' (`#215 `_) +* Add new product unit types to ``life.qbic.datamodel.dtos.business.services.ProductUnit`` (`#215 `_) - PER_HOUR("Hour"), - PER_PROJECT("Project"), @@ -23,7 +23,6 @@ This project adheres to `Semantic Versioning `_. - PER_100_MICROGRAM_PEPTIDE_CHANNEL("100 microgram peptides channel"), - PER_500_ML("500 milliliter"), - PER_COMPARISON("Comparison") -to 'life.qbic.datamodel.dtos.business.services.ProductUnit' (`#215 `_) **Fixed**