gCubeSystem
/
grsf-common-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added support for sdg-flag, added Reject Merge status 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-common-library@164581 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2018-02-26 16:19:01 +00:00
parent 881e88b722
commit 85333c5c6e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/gcube/datacatalogue/common/Constants.java
View File

@ -31,6 +31,8 @@ public class Constants {
public static final String SHORT_NAME_JSON_KEY = "short_name";
public static final String TRACEABILITY_FLAG_CUSTOM_KEY = "Traceability Flag";
public static final String TRACEABILITY_FLAG_JSON_KEY = "traceability_flag";
public static final String SDG_FLAG_CUSTOM_KEY = "SDG Flag";
public static final String SDG_FLAG_JSON_KEY = "sdg_flag";
public static final String CATCHES_CUSTOM_KEY = "Catches";
public static final String CATCHES_JSON_KEY = "catches";
public static final String LANDINGS_CUSTOM_KEY = "Landings";
@ -53,9 +55,6 @@ public class Constants {
// for connected records
public static final String CONNECTED_CUSTOM_KEY = "Connected Record";
public static final String CONNECTED_JSON_KEY = "connected";
// public static final String CONNECTED_RECORD_SEMANTIC_IDENTIFIER_JSON_KEY = "semantic_identifier";
// public static final String CONNECTED_RECORD_SHORT_NAME_JSON_KEY = "short_name";
// public static final String CONNECTED_RECORD_KNOWLEDGE_BASE_ID_JSON_KEY = "knowledge_base_id";
// stock record
public static final String STOCK_NAME_CUSTOM_KEY = "Stock Name";
@ -197,5 +196,9 @@ public class Constants {
// No connections/similar grsf records yet
public static final String NO_SIMILAR_GRSF_RECORDS = "No Similar Records";
public static final String NO_CONNECTED_RECORDS = "No Connected Records";
// groups for traceability and sdg flags
public static final String TRACEABILITY_FLAG_GROUP_NAME = "traceability-flag";
public static final String SDG_FLAG_GROUP_NAME = "sdg-flag";
}

5
src/main/java/org/gcube/datacatalogue/common/enums/Status.java
View File

@ -11,7 +11,9 @@ public enum Status {
Pending("Pending"),
Approved("Approved"),
Rejected("Rejected"),
Rejected("Rejected"), // for rejecting a given record
Reject_Merge("Reject Merge"), // for rejecting a merge (i.e. current status of the record is
// To Be Merged
Archived("Archived"),
Hidden("Hidden"),
To_be_Merged("To Be Merged");
@ -64,7 +66,6 @@ public enum Status {
return getOrigName();
}
public static Status fromString(String string){
if(string == null || string.isEmpty())
return null;