Remove description template numbering

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/FieldEntity.java

@@ -15,8 +15,6 @@ public class FieldEntity {
     @XmlElementWrapper(name = "schematics")
     @XmlElement(name = "schematic")
     private List<String> schematics;
-    @XmlAttribute(name="numbering")
-    private String numbering;
     @XmlElement(name="defaultValue")
     private DefaultValueEntity defaultValue;
     @XmlElementWrapper(name = "visibilityRules")
@@ -81,13 +79,6 @@ public class FieldEntity {
         this.validations = validations;
     }
 
-    public String getNumbering() {
-        return this.numbering;
-    }
-    public void setNumbering(String numbering) {
-        this.numbering = numbering;
-    }
-
     public Boolean getIncludeInExport() {
         return this.includeInExport;
     }

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/FieldSetEntity.java

@@ -15,8 +15,6 @@ public class FieldSetEntity {
     @XmlElementWrapper(name = "fields")
     @XmlElement(name = "field")
     private List<FieldEntity> fields;
-    @XmlAttribute(name="numbering")
-    private String numbering;
     @XmlAttribute(name="title")
     private String title;
     @XmlAttribute(name="description")
@@ -88,13 +86,6 @@ public class FieldSetEntity {
         this.hasCommentField = hasCommentField;
     }
 
-    public String getNumbering() {
-        return this.numbering;
-    }
-    public void setNumbering(String numbering) {
-        this.numbering = numbering;
-    }
-
     public String getAdditionalInformation() {
         return this.additionalInformation;
     }

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/SectionEntity.java

@@ -11,15 +11,12 @@ public class SectionEntity{
     private String id;
     @XmlAttribute(name="ordinal")
     private int ordinal;
-    @XmlAttribute(name="numbering")
-    private String numbering;
     @XmlAttribute(name="title")
     private String title;
     @XmlAttribute(name="description")
     private String description;
     @XmlAttribute(name="extendedDescription")
     private String extendedDescription;
-
     @XmlElementWrapper(name = "sections")
     @XmlElement(name = "section")
     private List<SectionEntity> sections;
@@ -83,14 +80,6 @@ public class SectionEntity{
         this.extendedDescription = extendedDescription;
     }
 
-    public String getNumbering() {
-        return this.numbering;
-    }
-
-    public void setNumbering(String numbering) {
-        this.numbering = numbering;
-    }
-
     public List<FieldEntity> getAllField(){
         List<FieldEntity> fieldEntities = new ArrayList<>();
         if (this.getFieldSets() != null){

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/importexport/DescriptionTemplateFieldImportExport.java

@@ -16,9 +16,6 @@ public class DescriptionTemplateFieldImportExport {
     @XmlAttribute(name = "ordinal")
     private int ordinal;
 
-    @XmlElement(name = "numbering")
-    private String numbering;
-
     @XmlElementWrapper(name = "validations")
     @XmlElement(name = "validation")
     private List<FieldValidationType> validations;
@@ -63,14 +60,6 @@ public class DescriptionTemplateFieldImportExport {
         this.ordinal = ordinal;
     }
 
-    public String getNumbering() {
-        return this.numbering;
-    }
-
-    public void setNumbering(String numbering) {
-        this.numbering = numbering;
-    }
-
     public DescriptionTemplateDefaultValueImportExport getDefaultValue() {
         return this.defaultValue;
     }

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/importexport/DescriptionTemplateFieldSetImportExport.java

@@ -15,8 +15,6 @@ public class DescriptionTemplateFieldSetImportExport {
     @XmlElementWrapper(name = "fields")
     @XmlElement(name = "field")
     private List<DescriptionTemplateFieldImportExport> fields;
-    @XmlAttribute(name="numbering")
-    private String numbering;
     @XmlAttribute(name="title")
     private String title;
     @XmlAttribute(name="description")
@@ -34,7 +32,7 @@ public class DescriptionTemplateFieldSetImportExport {
     private Boolean hasCommentField;
 
     public String getId() {
-        return id;
+        return this.id;
     }
 
     public void setId(String id) {
@@ -42,7 +40,7 @@ public class DescriptionTemplateFieldSetImportExport {
     }
 
     public int getOrdinal() {
-        return ordinal;
+        return this.ordinal;
     }
 
     public void setOrdinal(int ordinal) {
@@ -50,30 +48,22 @@ public class DescriptionTemplateFieldSetImportExport {
     }
 
     public List<DescriptionTemplateFieldImportExport> getFields() {
-        return fields;
+        return this.fields;
     }
 
     public void setFields(List<DescriptionTemplateFieldImportExport> fields) {
         this.fields = fields;
     }
 
-    public String getNumbering() {
-        return numbering;
-    }
-
-    public void setNumbering(String numbering) {
-        this.numbering = numbering;
-    }
-
     public Boolean getHasCommentField() {
-        return hasCommentField;
+        return this.hasCommentField;
     }
     public void setHasCommentField(Boolean hasCommentField) {
         this.hasCommentField = hasCommentField;
     }
 
     public DescriptionTemplateMultiplicityImportExport getMultiplicity() {
-        return multiplicity;
+        return this.multiplicity;
     }
 
     public void setMultiplicity(DescriptionTemplateMultiplicityImportExport multiplicity) {
@@ -81,11 +71,11 @@ public class DescriptionTemplateFieldSetImportExport {
     }
 
     public String getTitle() {
-        return title;
+        return this.title;
     }
 
     public String getDescription() {
-        return description;
+        return this.description;
     }
 
     public void setDescription(String description) {
@@ -93,7 +83,7 @@ public class DescriptionTemplateFieldSetImportExport {
     }
 
     public String getExtendedDescription() {
-        return extendedDescription;
+        return this.extendedDescription;
     }
 
     public void setExtendedDescription(String extendedDescription) {
@@ -101,7 +91,7 @@ public class DescriptionTemplateFieldSetImportExport {
     }
 
     public String getAdditionalInformation() {
-        return additionalInformation;
+        return this.additionalInformation;
     }
 
     public void setAdditionalInformation(String additionalInformation) {
@@ -113,7 +103,7 @@ public class DescriptionTemplateFieldSetImportExport {
     }
 
     public boolean getHasMultiplicity() {
-        return hasMultiplicity;
+        return this.hasMultiplicity;
     }
 
     public void setHasMultiplicity(boolean hasMultiplicity) {

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/importexport/DescriptionTemplateSectionImportExport.java

@@ -13,8 +13,6 @@ public class DescriptionTemplateSectionImportExport {
     @XmlElementWrapper(name = "fieldSets")
     @XmlElement(name = "fieldSet")
     private List<DescriptionTemplateFieldSetImportExport> fieldSets;
-    @XmlElement(name = "numbering")
-    private String numbering;
     @XmlElement(name = "description")
     private String description;
     @XmlElement(name = "title")
@@ -22,8 +20,6 @@ public class DescriptionTemplateSectionImportExport {
     @XmlElementWrapper(name = "sections")
     @XmlElement(name = "section")
     private List<DescriptionTemplateSectionImportExport> sections;
-    @XmlAttribute(name = "multiplicity")
-    private Boolean multiplicity;
 
     public String getId() {
         return this.id;
@@ -49,14 +45,6 @@ public class DescriptionTemplateSectionImportExport {
         this.fieldSets = fieldSets;
     }
 
-    public String getNumbering() {
-        return this.numbering;
-    }
-
-    public void setNumbering(String numbering) {
-        this.numbering = numbering;
-    }
-
      public String getDescription() {
         return this.description;
     }
@@ -81,12 +69,4 @@ public class DescriptionTemplateSectionImportExport {
         this.sections = sections;
     }
 
-    public Boolean getMultiplicity() {
-        return this.multiplicity;
-    }
-
-    public void setMultiplicity(Boolean multiplicity) {
-        this.multiplicity = multiplicity;
-    }
-
 }

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java

@@ -53,7 +53,6 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder<FieldModel,
             FieldModel m = new FieldModel();
             m.setId(d.getId());
             m.setOrdinal(d.getOrdinal());
-            m.setNumbering(d.getNumbering());
             m.setSchematics(d.getSchematics());
             //m.setDefaultValue(d.getDefaultValue()); //TODO
             m.setIncludeInExport(d.getIncludeInExport());
@@ -69,8 +68,6 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder<FieldModel,
                     
                 }
             }
-            m.setNumbering(d.getNumbering());
-            m.setNumbering(d.getNumbering());
             if (d.getData() != null){
                 FieldDataHelperService fieldDataHelperService = this.fieldDataHelperServiceProvider.get(d.getData().getFieldType());
                 m.setData(fieldDataHelperService.buildCommonModelOne(d.getData(), this.authorize));

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java

@@ -1,16 +1,14 @@
 package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
 
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.logging.LoggerService;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commonmodels.models.descriptiotemplate.FieldSetModel;
 import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;
-import org.opencdmp.model.builder.descriptiontemplatedefinition.FieldBuilder;
-import org.opencdmp.model.builder.descriptiontemplatedefinition.MultiplicityBuilder;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -23,7 +21,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class FieldSetCommonModelBuilder extends BaseCommonModelBuilder<FieldSetModel, FieldSetEntity> {
     private final BuilderFactory builderFactory;
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
@@ -51,7 +49,6 @@ public class FieldSetCommonModelBuilder extends BaseCommonModelBuilder<FieldSetM
             m.setId(d.getId());
             m.setOrdinal(d.getOrdinal());
             m.setTitle(d.getTitle());
-            m.setNumbering(d.getNumbering());
             m.setDescription(d.getDescription());
             m.setExtendedDescription(d.getExtendedDescription());
             m.setAdditionalInformation(d.getAdditionalInformation());

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java

@@ -49,7 +49,6 @@ public class SectionCommonModelBuilder extends BaseCommonModelBuilder<SectionMod
             m.setId(d.getId());
             m.setDescription(d.getDescription());
             m.setOrdinal(d.getOrdinal());
-            m.setNumbering(d.getNumbering());
             m.setTitle(d.getTitle());
             m.setExtendedDescription(d.getExtendedDescription());
             if (d.getSections() != null) m.setSections(this.builderFactory.builder(SectionCommonModelBuilder.class).authorize(this.authorize).build(d.getSections()));

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplatedefinition/FieldBuilder.java

@@ -58,12 +58,9 @@ public class FieldBuilder extends BaseBuilder<Field, FieldEntity> {
             Field m = new Field();
             if (fields.hasField(this.asIndexer(Field._id))) m.setId(d.getId());
             if (fields.hasField(this.asIndexer(Field._ordinal))) m.setOrdinal(d.getOrdinal());
-            if (fields.hasField(this.asIndexer(Field._numbering))) m.setNumbering(d.getNumbering());
             if (fields.hasField(this.asIndexer(Field._schematics))) m.setSchematics(d.getSchematics());
             if (fields.hasField(this.asIndexer(Field._includeInExport))) m.setIncludeInExport(d.getIncludeInExport());
             if (fields.hasField(this.asIndexer(Field._validations))) m.setValidations(d.getValidations());
-            if (fields.hasField(this.asIndexer(Field._numbering))) m.setNumbering(d.getNumbering());
-            if (fields.hasField(this.asIndexer(Field._numbering))) m.setNumbering(d.getNumbering());
             if (!defaultValueFields.isEmpty() && d.getDefaultValue() != null) m.setDefaultValue(this.builderFactory.builder(DefaultValueBuilder.class).withFieldEntity(d).authorize(this.authorize).build(defaultValueFields, d.getDefaultValue()));
             if (!visibilityRulesFields.isEmpty() && d.getVisibilityRules() != null) m.setVisibilityRules(this.builderFactory.builder(RuleBuilder.class).withFieldEntity(d).authorize(this.authorize).build(visibilityRulesFields, d.getVisibilityRules()));
             if (!dataFields.isEmpty() && d.getData() != null){

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplatedefinition/FieldSetBuilder.java

@@ -1,15 +1,14 @@
 package org.opencdmp.model.builder.descriptiontemplatedefinition;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Field;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +18,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class FieldSetBuilder extends BaseBuilder<org.opencdmp.model.descriptiontemplatedefinition.FieldSet, FieldSetEntity> {
 
     private final BuilderFactory builderFactory;
@@ -52,7 +51,6 @@ public class FieldSetBuilder extends BaseBuilder<org.opencdmp.model.descriptiont
             if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._id))) m.setId(d.getId());
             if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._ordinal))) m.setOrdinal(d.getOrdinal());
             if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._title))) m.setTitle(d.getTitle());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._numbering))) m.setNumbering(d.getNumbering());
             if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._description))) m.setDescription(d.getDescription());
             if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._extendedDescription))) m.setExtendedDescription(d.getExtendedDescription());
             if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._additionalInformation))) m.setAdditionalInformation(d.getAdditionalInformation());

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplatedefinition/SectionBuilder.java

@@ -53,7 +53,6 @@ public class SectionBuilder extends BaseBuilder<Section, SectionEntity> {
             if (fields.hasField(this.asIndexer(Section._id))) m.setId(d.getId());
             if (fields.hasField(this.asIndexer(Section._description))) m.setDescription(d.getDescription());
             if (fields.hasField(this.asIndexer(Section._ordinal))) m.setOrdinal(d.getOrdinal());
-            if (fields.hasField(this.asIndexer(Section._numbering))) m.setNumbering(d.getNumbering());
             if (fields.hasField(this.asIndexer(Section._title))) m.setTitle(d.getTitle());
             if (fields.hasField(this.asIndexer(Section._extendedDescription))) m.setExtendedDescription(d.getExtendedDescription());
             if (d.getSections() != null) m.setSections(this.builderFactory.builder(SectionBuilder.class).authorize(this.authorize).build(fields, d.getSections()));

backend/core/src/main/java/org/opencdmp/model/descriptiontemplatedefinition/Field.java

@@ -13,9 +13,6 @@ public class Field {
 	public final static String _ordinal = "ordinal";
 	private Integer ordinal;
 
-	public final static String _numbering = "numbering";
-	private String numbering; //TODO maybe remove
-
 	public final static String _schematics = "schematics";
 	private List<String> schematics;
 
@@ -50,14 +47,6 @@ public class Field {
 		this.ordinal = ordinal;
 	}
 
-	public String getNumbering() {
-		return this.numbering;
-	}
-
-	public void setNumbering(String numbering) {
-		this.numbering = numbering;
-	}
-
 	public List<String> getSchematics() {
 		return this.schematics;
 	}

backend/core/src/main/java/org/opencdmp/model/descriptiontemplatedefinition/FieldSet.java

@@ -10,9 +10,6 @@ public class FieldSet {
 	public final static String _ordinal = "ordinal";
 	private Integer ordinal;
 
-	public final static String _numbering = "numbering";
-	private String numbering;
-
 	public final static String _title = "title";
 	private String title;
 
@@ -53,14 +50,6 @@ public class FieldSet {
 		this.ordinal = ordinal;
 	}
 
-	public String getNumbering() {
-		return this.numbering;
-	}
-
-	public void setNumbering(String numbering) {
-		this.numbering = numbering;
-	}
-
 	public String getTitle() {
 		return this.title;
 	}

backend/core/src/main/java/org/opencdmp/model/descriptiontemplatedefinition/Section.java

@@ -11,9 +11,6 @@ public class Section {
 	public final static String _ordinal = "ordinal";
 	private Integer ordinal;
 
-	public final static String _numbering = "numbering";
-	private String numbering; //TODO maybe remove
-
 	public final static String _title = "title";
 	private String title;
 
@@ -45,14 +42,6 @@ public class Section {
 		this.ordinal = ordinal;
 	}
 
-	public String getNumbering() {
-		return this.numbering;
-	}
-
-	public void setNumbering(String numbering) {
-		this.numbering = numbering;
-	}
-
 	public String getTitle() {
 		return this.title;
 	}

backend/core/src/main/java/org/opencdmp/model/mapper/publicapi/DescriptionFieldSetToDatasetFieldSetMapper.java

@@ -18,7 +18,6 @@ public class DescriptionFieldSetToDatasetFieldSetMapper {
         model.setId(fieldSet.getId());
         model.setDescription(fieldSet.getDescription());
         model.setOrdinal(fieldSet.getOrdinal());
-        model.setNumbering(fieldSet.getNumbering());
         model.setTitle(fieldSet.getTitle());
         model.setAdditionalInformation(fieldSet.getAdditionalInformation());
         model.setExtendedDescription(fieldSet.getExtendedDescription());
@@ -30,7 +29,7 @@ public class DescriptionFieldSetToDatasetFieldSetMapper {
             multiplicityEntity.setTableView(fieldSet.getMultiplicity().getTableView());
             model.setMultiplicity(multiplicityEntity);
         }
-        model.setFields(fieldSet.getFields().stream().map(descriptionFieldToDatasetFieldMapper::toPublicModel).toList());
+        model.setFields(fieldSet.getFields().stream().map(this.descriptionFieldToDatasetFieldMapper::toPublicModel).toList());
         return model;
     }
 }

backend/core/src/main/java/org/opencdmp/model/mapper/publicapi/DescriptionFieldToDatasetFieldMapper.java

@@ -21,7 +21,6 @@ public class DescriptionFieldToDatasetFieldMapper {
         defaultValueEntity.setValue(field.getDefaultValue() != null ? field.getDefaultValue().getTextValue(): null); //TODO
         model.setDefaultValue(defaultValueEntity);
         model.setExport(field.getIncludeInExport());
-        model.setNumbering(field.getNumbering());
         model.setSchematics(field.getSchematics());
         model.setValidations(field.getValidations().stream().map(x -> (int) x.getValue()).toList());
         VisibilityEntity visibilityEntity = new VisibilityEntity();

backend/core/src/main/java/org/opencdmp/model/mapper/publicapi/DescriptionSectionToDatasetSectionMapper.java

@@ -19,7 +19,6 @@ public class DescriptionSectionToDatasetSectionMapper {
         model.setOrdinal(section.getOrdinal());
         model.setTitle(section.getTitle());
         model.setSections(section.getSections().stream().map(x-> this.toPublicModel(x, page)).toList());
-        model.setNumbering(section.getNumbering());
         model.setPage("page_" + page);
         model.setCompositeFields(section.getFieldSets().stream().map(this.descriptionFieldSetToDatasetFieldSetMapper::toPublicModel).toList());
         return model;

backend/core/src/main/java/org/opencdmp/model/persist/descriptiontemplatedefinition/FieldSetPersist.java

@@ -24,10 +24,6 @@ public class FieldSetPersist {
 
     public static final String _ordinal = "ordinal";
 
-    private String numbering;
-
-    public static final String _numbering = "numbering";
-
     private String title;
 
     public static final String _title = "title";
@@ -71,14 +67,6 @@ public class FieldSetPersist {
         this.ordinal = ordinal;
     }
 
-    public String getNumbering() {
-        return this.numbering;
-    }
-
-    public void setNumbering(String numbering) {
-        this.numbering = numbering;
-    }
-
     public String getTitle() {
         return this.title;
     }
@@ -173,9 +161,6 @@ public class FieldSetPersist {
                     this.spec()
                             .must(() -> !this.isNull(item.getOrdinal()))
                             .failOn(FieldSetPersist._ordinal).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldSetPersist._ordinal}, LocaleContextHolder.getLocale())),
-                    this.spec()
-                            .must(() -> !this.isEmpty(item.getNumbering()))
-                            .failOn(FieldSetPersist._numbering).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldSetPersist._numbering}, LocaleContextHolder.getLocale())),
                     this.spec()
                             .must(() -> !this.isNull(item.getHasMultiplicity()))
                             .failOn(FieldSetPersist._hasMultiplicity).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldSetPersist._hasMultiplicity}, LocaleContextHolder.getLocale())),

backend/core/src/main/java/org/opencdmp/model/publicapi/datasetwizard/Field.java

@@ -200,7 +200,7 @@ public class Field implements Comparable, PropertiesModelBuilder {
         FieldDescriptionEntity fieldDescription = new FieldDescriptionEntity();
         fieldDescription.setFieldType(item.getData().getFieldType());
         this.viewStyle =  fieldDescription;
-        this.numbering = item.getNumbering();
+//        this.numbering = item.getNumbering();
         this.data = item.getData();
 
         DefaultValueEntity defaultValueEntity = new DefaultValueEntity();

backend/core/src/main/java/org/opencdmp/model/publicapi/datasetwizard/FieldSet.java

@@ -5,7 +5,7 @@ import org.opencdmp.commons.types.descriptiontemplate.MultiplicityEntity;
 
 import java.util.*;
 import java.util.stream.Collectors;
-
+ 
 public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     private String id;
     private Integer ordinal;
@@ -22,11 +22,11 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
 
     public List<Field> getFields() {
         Collections.sort(this.fields);
-        return fields;
+        return this.fields;
     }
 
     public String getTitle() {
-        return title;
+        return this.title;
     }
 
     public void setTitle(String title) {
@@ -34,7 +34,7 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getDescription() {
-        return description;
+        return this.description;
     }
 
     public void setDescription(String description) {
@@ -42,7 +42,7 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getExtendedDescription() {
-        return extendedDescription;
+        return this.extendedDescription;
     }
 
     public void setExtendedDescription(String extendedDescription) {
@@ -54,7 +54,7 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getId() {
-        return id;
+        return this.id;
     }
 
     public void setId(String id) {
@@ -62,7 +62,7 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public int getOrdinal() {
-        return ordinal;
+        return this.ordinal;
     }
 
     public void setOrdinal(int ordinal) {
@@ -70,7 +70,7 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public MultiplicityEntity getMultiplicity() {
-        return multiplicity;
+        return this.multiplicity;
     }
 
     public void setMultiplicity(MultiplicityEntity multiplicity) {
@@ -78,12 +78,12 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public List<FieldSet> getMultiplicityItems() {
-        if (multiplicityItems != null) Collections.sort(multiplicityItems);
+        if (this.multiplicityItems != null) Collections.sort(this.multiplicityItems);
-        return multiplicityItems;
+        return this.multiplicityItems;
     }
 
     public String getNumbering() {
-        return numbering;
+        return this.numbering;
     }
 
     public void setNumbering(String numbering) {
@@ -103,11 +103,11 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public boolean getHasCommentField() {
-        return hasCommentField;
+        return this.hasCommentField;
     }
 
     public String getCommentFieldValue() {
-        return commentFieldValue;
+        return this.commentFieldValue;
     }
 
     public void setCommentFieldValue(String commentFieldValue) {
@@ -115,7 +115,7 @@ public class FieldSet implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getAdditionalInformation() {
-        return additionalInformation;
+        return this.additionalInformation;
     }
 
     public void setAdditionalInformation(String additionalInformation) {

backend/core/src/main/java/org/opencdmp/model/publicapi/datasetwizard/Section.java

@@ -19,8 +19,8 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     private Boolean multiplicity;
 
     public List<Section> getSections() {
-        Collections.sort(sections);
+        Collections.sort(this.sections);
-        return sections;
+        return this.sections;
     }
 
     public void setSections(List<Section> sections) {
@@ -28,8 +28,8 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public List<FieldSet> getCompositeFields() {
-        Collections.sort(compositeFields);
+        Collections.sort(this.compositeFields);
-        return compositeFields;
+        return this.compositeFields;
     }
 
     public void setCompositeFields(List<FieldSet> compositeFields) {
@@ -37,7 +37,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public Boolean getDefaultVisibility() {
-        return defaultVisibility;
+        return this.defaultVisibility;
     }
 
     public void setDefaultVisibility(Boolean defaultVisibility) {
@@ -45,7 +45,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getPage() {
-        return page;
+        return this.page;
     }
 
     public void setPage(String page) {
@@ -53,7 +53,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getId() {
-        return id;
+        return this.id;
     }
 
     public void setId(String id) {
@@ -61,7 +61,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getTitle() {
-        return title;
+        return this.title;
     }
 
     public void setTitle(String title) {
@@ -69,7 +69,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getDescription() {
-        return description;
+        return this.description;
     }
 
     public void setDescription(String description) {
@@ -77,7 +77,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public int getOrdinal() {
-        return ordinal;
+        return this.ordinal;
     }
 
     public void setOrdinal(int ordinal) {
@@ -85,7 +85,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public String getNumbering() {
-        return numbering;
+        return this.numbering;
     }
 
     public void setNumbering(String numbering) {
@@ -93,7 +93,7 @@ public class Section implements Comparable<Object>, PropertiesModelBuilder {
     }
 
     public Boolean getMultiplicity() {
-        return multiplicity;
+        return this.multiplicity;
     }
 
     public void setMultiplicity(Boolean multiplicity) {

backend/core/src/main/java/org/opencdmp/service/descriptiontemplate/DescriptionTemplateServiceImpl.java

@@ -337,7 +337,6 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
         data.setOrdinal(persist.getOrdinal());
         data.setTitle(persist.getTitle());
         data.setHasMultiplicity(persist.getHasMultiplicity());
-        data.setNumbering(persist.getNumbering());
         data.setAdditionalInformation(persist.getAdditionalInformation());
         data.setExtendedDescription(persist.getExtendedDescription());
         if (persist.getMultiplicity() != null && persist.getHasMultiplicity() && (

backend/web/src/main/java/org/opencdmp/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java

@@ -162,7 +162,6 @@ public class PublicDatasetsDescriptionDocumentation {
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._description),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._extendedDescription),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._title),
-                String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._numbering),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._ordinal),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._sections),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._id),
@@ -175,11 +174,9 @@ public class PublicDatasetsDescriptionDocumentation {
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._multiplicity, Multiplicity._max),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._multiplicity, Multiplicity._placeholder),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._multiplicity, Multiplicity._tableView),
-                String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._numbering),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._title),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._id),
-                String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._numbering),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._ordinal),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._data, BaseFieldData._label),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._data, BaseFieldData._fieldType),

dmp-frontend/src/app/core/model/description-template/description-template-persist.ts

@@ -58,7 +58,6 @@ export interface DescriptionTemplateSectionPersist {
 export interface DescriptionTemplateFieldSetPersist {
 	id: string;
 	ordinal: number;
-	numbering: string;
 	title: string;
 	description: string;
 	extendedDescription: string;

dmp-frontend/src/app/core/model/description-template/description-template.ts

@@ -55,7 +55,6 @@ export interface DescriptionTemplateSection {
 export interface DescriptionTemplateFieldSet {
 	id: string;
 	ordinal: number;
-	numbering: string;
 	title: string;
 	description: string;
 	extendedDescription: string;
@@ -69,7 +68,6 @@ export interface DescriptionTemplateFieldSet {
 export interface DescriptionTemplateField {
 	id: string;
 	ordinal: number;
-	numbering?: string;
 	schematics?: string[];
 	defaultValue?: DescriptionTemplateDefaultValue;
 	visibilityRules?: DescriptionTemplateRule[];

dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.ts

@@ -248,7 +248,6 @@ export class DescriptionTemplateEditorCompositeFieldComponent extends BaseCompon
 		const fieldSet: DescriptionTemplateFieldSet = {
 			id: formValue.id,
 			ordinal: formValue.ordinal,
-			numbering: '',
 			title: formValue.title,
 			description: formValue.description,
 			extendedDescription: formValue.extendedDescription,

dmp-frontend/src/app/ui/admin/description-template/editor/components/final-preview/final-preview.component.ts

@@ -101,7 +101,6 @@ export class FinalPreviewComponent implements OnInit {
 		return {
 			id: persist.id,
 			ordinal: persist.ordinal,
-			numbering: '',
 			title: persist.title,
 			description: persist.description,
 			extendedDescription: persist.extendedDescription,

dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts

@@ -481,7 +481,6 @@ export class DescriptionTemplateSectionEditorModel implements DescriptionTemplat
 export class DescriptionTemplateFieldSetEditorModel implements DescriptionTemplateFieldSetPersist {
 	id: string;
 	ordinal: number;
-	numbering: string = "0"; // Check if used and remove
 	title: string;
 	description: string;
 	extendedDescription: string;
@@ -501,7 +500,6 @@ export class DescriptionTemplateFieldSetEditorModel implements DescriptionTempla
 		if (item) {
 			this.id = item.id;
 			this.ordinal = item.ordinal;
-			this.numbering = item.numbering;
 			this.title = item.title;
 			this.description = item.description;
 			this.extendedDescription = item.extendedDescription;
@@ -531,7 +529,6 @@ export class DescriptionTemplateFieldSetEditorModel implements DescriptionTempla
 		return this.formBuilder.group({
 			id: [{ value: this.id, disabled: disabled }, context.getValidation('id').validators],
 			ordinal: [{ value: this.ordinal, disabled: disabled }, context.getValidation('ordinal').validators],
-			numbering: [{ value: this.numbering, disabled: disabled }, context.getValidation('numbering').validators],
 			title: [{ value: this.title, disabled: disabled }, context.getValidation('title').validators],
 			description: [{ value: this.description, disabled: disabled }, context.getValidation('description').validators],
 			extendedDescription: [{ value: this.extendedDescription, disabled: disabled }, context.getValidation('extendedDescription').validators],
@@ -561,7 +558,6 @@ export class DescriptionTemplateFieldSetEditorModel implements DescriptionTempla
 		const baseValidationArray: Validation[] = new Array<Validation>();
 		baseValidationArray.push({ key: 'id', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}id`)] });
 		baseValidationArray.push({ key: 'ordinal', validators: [Validators.required, BackendErrorValidator(validationErrorModel, `${rootPath}ordinal`)] });
-		baseValidationArray.push({ key: 'numbering', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}numbering`)] });
 		baseValidationArray.push({ key: 'title', validators: [Validators.required, BackendErrorValidator(validationErrorModel, `${rootPath}title`)] });
 		baseValidationArray.push({ key: 'description', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}description`)] });
 		baseValidationArray.push({ key: 'extendedDescription', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}extendedDescription`)] });
@@ -586,7 +582,7 @@ export class DescriptionTemplateFieldSetEditorModel implements DescriptionTempla
 			validationErrorModel
 		});
 
-		['id', 'ordinal', 'numbering', 'title', 'description', 'extendedDescription', 'additionalInformation', 'hasCommentField', 'hasMultiplicity'].forEach(keyField => {
+		['id', 'ordinal', 'title', 'description', 'extendedDescription', 'additionalInformation', 'hasCommentField', 'hasMultiplicity'].forEach(keyField => {
 			const control = formGroup?.get(keyField);
 			control?.clearValidators();
 			control?.addValidators(context.getValidation(keyField).validators);

dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.resolver.ts

@@ -45,7 +45,6 @@ export class DescriptionTemplateEditorResolver extends BaseEditorResolver {
 
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.id)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.ordinal)].join('.'),
-			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.numbering)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.title)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.description)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.extendedDescription)].join('.'),
@@ -58,7 +57,6 @@ export class DescriptionTemplateEditorResolver extends BaseEditorResolver {
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.multiplicity), nameof<DescriptionTemplateMultiplicity>(x => x.tableView)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.id)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.ordinal)].join('.'),
-			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.numbering)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.schematics)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.defaultValue), nameof<DescriptionTemplateDefaultValue>(x => x.textValue)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.defaultValue), nameof<DescriptionTemplateDefaultValue>(x => x.dateValue)].join('.'),