Skip to content

Commit 0f78f15

Browse files
authored
Merge pull request #283 from qbicsoftware/release/2.15.0
2.15.0 (2022-01-24) ---------------------------- **Added** * Add displayName to ``life.qbic.datamodel.samples.Status`` (#282) **Fixed** **Dependencies** **Deprecated**
2 parents da14ba3 + 82b47cf commit 0f78f15

File tree

4 files changed

+65
-17
lines changed

4 files changed

+65
-17
lines changed

CHANGELOG.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ Changelog
44

55
This project adheres to `Semantic Versioning <https://semver.org/>`_.
66

7+
2.15.0 (2022-01-24)
8+
----------------------------
9+
10+
**Added**
11+
12+
* Add displayName to ``life.qbic.datamodel.samples.Status`` (#282)
13+
14+
**Fixed**
15+
16+
**Dependencies**
17+
18+
**Deprecated**
19+
720
2.14.4 (2022-01-04)
821
-------------------
922

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
# the built documents.
5656
#
5757
# The short X.Y version.
58-
version = '2.14.0'
58+
version = '2.15.0'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '2.14.0'
60+
release = '2.15.0'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
<groupId>life.qbic</groupId>
99
<artifactId>data-model-lib</artifactId>
10-
<version>2.14.4</version> <!-- <<QUBE_FORCE_BUMP>> -->
10+
<version>2.15.0</version> <!-- <<QUBE_FORCE_BUMP>> -->
1111
<name>data-model-lib</name>
1212
<url>http://github.com/qbicsoftware/data-model-lib</url>
13-
<description>Data models. A collection of QBiC's central data models and DTOs.</description>
13+
<description>Data models. A collection of QBiC's central data models and DTOs. </description>
1414
<packaging>jar</packaging>
1515

1616
<properties>

src/main/groovy/life/qbic/datamodel/samples/Status.groovy

Lines changed: 48 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,56 @@ package life.qbic.datamodel.samples;
44
* The status of an sample in the context of <a href="https://github.com/qbicsoftware/sample-tracking-service">sample-tracking</a>
55
*/
66
public enum Status {
7-
SAMPLE_QC_FAIL,
8-
SAMPLE_QC_PASS,
9-
SAMPLE_RECEIVED,
10-
LIBRARY_PREP_FINISHED,
11-
SEQUENCING,
12-
SEQUENCING_COMPLETE,
13-
METADATA_REGISTERED,
14-
WAITING,
15-
PROCESSING,
16-
FAILED_QC,
17-
PROCESSED,
18-
DATA_AVAILABLE,
7+
SAMPLE_QC_FAIL ("Sample QC Fail"),
8+
SAMPLE_QC_PASS ("Sample QC Pass"),
9+
SAMPLE_RECEIVED ("Sample Received"),
10+
LIBRARY_PREP_FINISHED ("Library Prep Finished"),
11+
/**
12+
* @deprecated this is deprecated since 2.16.0 please use {@link #SEQUENCING_COMPLETE} instead
13+
*/
14+
@Deprecated
15+
SEQUENCING ("Sequencing"),
16+
SEQUENCING_COMPLETE ("Sequencing Complete"),
17+
METADATA_REGISTERED ("Metadata Registered"),
18+
/**
19+
* @deprecated this is deprecated since 2.16.0
20+
*/
21+
@Deprecated
22+
WAITING ("Waiting"),
23+
/**
24+
* @deprecated this is deprecated since 2.16.0
25+
*/
26+
@Deprecated
27+
PROCESSING ("Processing"),
28+
/**
29+
* @deprecated this is deprecated since 2.16.0 please use {@link #SAMPLE_QC_FAIL} instead
30+
*/
31+
@Deprecated
32+
FAILED_QC ("Failed QC"),
33+
/**
34+
* @deprecated this is deprecated since 2.16.0
35+
*/
36+
@Deprecated
37+
PROCESSED ("Processed"),
38+
DATA_AVAILABLE ("Data Available"),
1939
/**
2040
* @deprecated this is deprecated since 2.4.0 please use {@link #DATA_AVAILABLE} instead
2141
*/
2242
@Deprecated
23-
DATA_AT_QBIC
43+
DATA_AT_QBIC ("Data at QBiC")
44+
45+
private final displayName
46+
47+
private Status(String displayName){
48+
this.displayName = displayName
49+
}
50+
51+
/**
52+
* Returns to the enum item display name
53+
* @return
54+
*/
55+
String getDisplayName() {
56+
return this.displayName
57+
}
58+
2459
}

0 commit comments

Comments
 (0)