diff --git a/src/main/java/eu/eudat/commonmodels/models/description/DescriptionModel.java b/src/main/java/eu/eudat/commonmodels/models/description/DescriptionModel.java index 7b0a4c0..78a8be3 100644 --- a/src/main/java/eu/eudat/commonmodels/models/description/DescriptionModel.java +++ b/src/main/java/eu/eudat/commonmodels/models/description/DescriptionModel.java @@ -6,6 +6,7 @@ import eu.eudat.commonmodels.models.dmp.DmpModel; import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; import java.time.Instant; +import java.util.List; import java.util.UUID; public class DescriptionModel { @@ -19,6 +20,8 @@ public class DescriptionModel { private Instant createdAt; private PropertyDefinitionModel properties; + + private List visibilityStates; public UUID getId() { return id; @@ -91,4 +94,12 @@ public class DescriptionModel { public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; } + + public List getVisibilityStates() { + return visibilityStates; + } + + public void setVisibilityStates(List visibilityStates) { + this.visibilityStates = visibilityStates; + } } diff --git a/src/main/java/eu/eudat/commonmodels/models/description/VisibilityState.java b/src/main/java/eu/eudat/commonmodels/models/description/VisibilityState.java new file mode 100644 index 0000000..de755f2 --- /dev/null +++ b/src/main/java/eu/eudat/commonmodels/models/description/VisibilityState.java @@ -0,0 +1,31 @@ +package eu.eudat.commonmodels.models.description; + +public class VisibilityState{ + private String fieldId; + private Integer ordinal; + private boolean visible; + + public String getFieldId() { + return fieldId; + } + + public void setFieldId(String fieldId) { + this.fieldId = fieldId; + } + + public Integer getOrdinal() { + return ordinal; + } + + public void setOrdinal(Integer ordinal) { + this.ordinal = ordinal; + } + + public boolean getVisible() { + return visible; + } + + public void setVisible(boolean visible) { + this.visible = visible; + } +} diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldModel.java b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldModel.java index 5ec3916..c356b49 100644 --- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldModel.java +++ b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldModel.java @@ -17,8 +17,6 @@ public class FieldModel { private String defaultValue; - private List visibilityRules; - private List validations; private Boolean includeInExport; @@ -65,14 +63,6 @@ public class FieldModel { this.defaultValue = defaultValue; } - public List getVisibilityRules() { - return visibilityRules; - } - - public void setVisibilityRules(List visibilityRules) { - this.visibilityRules = visibilityRules; - } - public List getValidations() { return validations; } diff --git a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/RuleModel.java b/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/RuleModel.java deleted file mode 100644 index 69089af..0000000 --- a/src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/RuleModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.eudat.commonmodels.models.descriptiotemplate; - -public class RuleModel { - - private String target; - - private String value; - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -}