branch feature/#8171 updated (2fda67c -> aadc504)
This is an automated email from the git hooks/post-receive script. New change to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 2fda67c on repasse sur develop pour avancer même si le point n'est pas complètement traité :(. Merge branch 'feature/8089' into develop new 4aafd84 Modify model following #8171 new 10edeab Correct model new a35a117 Finish modification for the model with tagValues and declaration new 211f806 Rename comment to comments new aadc504 Add missing decorators The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aadc504523a7631df2589a37b3c2b37e8f30f311 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:33:05 2016 +0200 Add missing decorators commit 211f80651a2a9fd6075869c7a8b51cae1a9a4415 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:32:42 2016 +0200 Rename comment to comments commit a35a1178df1107a34c5c33df0acb30ef5e16defd Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:05:14 2016 +0200 Finish modification for the model with tagValues and declaration commit 10edeabfb6ea007ec980ba22325ef634861ef4eb Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 12:08:56 2016 +0200 Correct model commit 4aafd84cd99bb65fdeed2c77eb8b7ec57a21cc00 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 11:51:38 2016 +0200 Modify model following #8171 Summary of changes: .../echobase/persistence/EchoBaseDbMeta.java | 5 ++++- echobase-domain/src/main/xmi/echobase.properties | 19 +++++++++++++++++++ echobase-domain/src/main/xmi/echobase.zargo | Bin 89705 -> 97460 bytes .../echobase/services/service/DecoratorService.java | 12 ++++++++++++ .../service/importdata/csv/TransectImportModel.java | 2 +- .../service/importdata/csv/TransectImportRow.java | 4 ++-- 6 files changed, 38 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 4aafd84cd99bb65fdeed2c77eb8b7ec57a21cc00 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 11:51:38 2016 +0200 Modify model following #8171 --- echobase-domain/src/main/xmi/echobase.zargo | Bin 89705 -> 97620 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index 066030f..5a30fe7 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 10edeabfb6ea007ec980ba22325ef634861ef4eb Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 12:08:56 2016 +0200 Correct model --- echobase-domain/src/main/xmi/echobase.zargo | Bin 97620 -> 97460 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index 5a30fe7..e03b879 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit a35a1178df1107a34c5c33df0acb30ef5e16defd Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:05:14 2016 +0200 Finish modification for the model with tagValues and declaration --- .../ifremer/echobase/persistence/EchoBaseDbMeta.java | 5 ++++- echobase-domain/src/main/xmi/echobase.properties | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java index 3cc1300..70f3255 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java @@ -69,6 +69,8 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { EchoBaseUserEntityEnum.MeasureType, EchoBaseUserEntityEnum.MeasurementMetadata, EchoBaseUserEntityEnum.ReferencingMethod, + EchoBaseUserEntityEnum.Port, + EchoBaseUserEntityEnum.AncillaryInstrumentation, // with deps EchoBaseUserEntityEnum.Strata, @@ -114,7 +116,8 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { EchoBaseUserEntityEnum.LengthAgeKey, EchoBaseUserEntityEnum.LengthWeightKey, - EchoBaseUserEntityEnum.Voyage)); + EchoBaseUserEntityEnum.Voyage, + EchoBaseUserEntityEnum.Mooring)); private final List<TableMeta<EchoBaseUserEntityEnum>> referenceTables; diff --git a/echobase-domain/src/main/xmi/echobase.properties b/echobase-domain/src/main/xmi/echobase.properties index f3a1f92..767fb2e 100644 --- a/echobase-domain/src/main/xmi/echobase.properties +++ b/echobase-domain/src/main/xmi/echobase.properties @@ -188,6 +188,12 @@ fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.naturalId fr.ifremer.echobase.entities.references.VesselType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.naturalId=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.attribute.serialNumber.tagValue.naturalId=true + +fr.ifremer.echobase.entities.references.Port.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.references.Port.attribute.id.tagValue.naturalId=true + ############################################################################### ### Not null for references ################################################### ############################################################################### @@ -266,6 +272,12 @@ fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.notNull=t fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.notNull=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.attribute.name.tagValue.notNull=true +fr.ifremer.echobase.entities.references.AncillaryInstrumentation.attribute.serialNumber.tagValue.notNull=true + +fr.ifremer.echobase.entities.references.Port.attribute.id.tagValue.notNull=true +fr.ifremer.echobase.entities.references.Port.attribute.name.tagValue.notNull=true + ############################################################################### ### Natural id for data ###################################################### ############################################################################### @@ -284,6 +296,9 @@ fr.ifremer.echobase.entities.data.Category.attribute.speciesCategory.tagValue.na fr.ifremer.echobase.entities.data.Voyage.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.data.Voyage.attribute.name.tagValue.naturalId=true +fr.ifremer.echobase.entities.data.Mooring.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.data.Mooring.attribute.code.tagValue.naturalId=true + ############################################################################### ### Not null for data ######################################################### ############################################################################### @@ -364,3 +379,7 @@ fr.ifremer.echobase.entities.data.Voyage.attribute.endPort.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.description.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.mission.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.datum.tagValue.notNull=true + +fr.ifremer.echobase.entities.data.Mooring.attribute.code.tagValue.notNull=true +fr.ifremer.echobase.entities.data.Mooring.attribute.mission.tagValue.notNull=true +fr.ifremer.echobase.entities.data.Mooring.attribute.description.tagValue.notNull=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 211f80651a2a9fd6075869c7a8b51cae1a9a4415 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:32:42 2016 +0200 Rename comment to comments --- .../echobase/services/service/importdata/csv/TransectImportModel.java | 2 +- .../echobase/services/service/importdata/csv/TransectImportRow.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java index 31363f7..6f3c392 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java @@ -51,7 +51,7 @@ public class TransectImportModel extends AbstractImportModel<TransectImportRow> newMandatoryColumn(Transect.PROPERTY_TITLE); newMandatoryColumn(Transect.PROPERTY_TRANSECT_ABSTRACT); newMandatoryColumn(Transect.PROPERTY_STRATUM); - newMandatoryColumn(Transect.PROPERTY_COMMENT); + newMandatoryColumn(Transect.PROPERTY_COMMENTS); newMandatoryColumn(Transect.PROPERTY_DATE_CREATED, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_START, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java index 67a2a6d..8d39b77 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java @@ -68,8 +68,8 @@ public class TransectImportRow implements Serializable { transect.setTransectAbstract(transectAbstract); } - public void setComment(String comment) { - transect.setComment(comment); + public void setComments(String comments) { + transect.setComments(comments); } public void setDateCreated(Date dateCreated) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit aadc504523a7631df2589a37b3c2b37e8f30f311 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:33:05 2016 +0200 Add missing decorators --- .../ifremer/echobase/services/service/DecoratorService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java index 4c19c44..9a9d573 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java @@ -37,6 +37,7 @@ import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.GearMetadataValue; import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.LengthWeightKey; +import fr.ifremer.echobase.entities.data.Mooring; import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.OperationMetadataValue; import fr.ifremer.echobase.entities.data.Result; @@ -47,6 +48,7 @@ import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AcousticInstrument; import fr.ifremer.echobase.entities.references.AgeCategory; +import fr.ifremer.echobase.entities.references.AncillaryInstrumentation; import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Calibration; import fr.ifremer.echobase.entities.references.CategoryMeaning; @@ -70,6 +72,7 @@ import fr.ifremer.echobase.entities.references.MeasurementMetadata; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.OperationEvent; import fr.ifremer.echobase.entities.references.OperationMetadata; +import fr.ifremer.echobase.entities.references.Port; import fr.ifremer.echobase.entities.references.ReferenceDatum; import fr.ifremer.echobase.entities.references.ReferenceDatumType; import fr.ifremer.echobase.entities.references.ReferencingMethod; @@ -383,6 +386,15 @@ public class DecoratorService extends EchoBaseServiceSupport { // Voyage decorator registerJXPathDecorator(locale, Voyage.class, "${name}$s [ ${startDate}$td/%2$tm/%2$tY - ${endDate}$td/%3$tm/%3$tY ]"); + + // Port decorator + registerJXPathDecorator(locale, Port.class, "${name}$s"); + + // Mooring decorator + registerJXPathDecorator(locale, Mooring.class, "${code}$s"); + + // AncillaryInstrumentation decorator + registerJXPathDecorator(locale, AncillaryInstrumentation.class, "${name}$s"); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm