Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3d070135 by tchemit at 2020-04-04T16:24:52+02:00 Mise à jour simple de référentiel échoue en v7.5.0 - Closes #1461 - - - - - 20 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIModel.java - dto/src/main/models/Observe.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/TdrEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java - persistence/src/main/models/Observe.model - test/src/main/resources/db/7.5/dataForTestLongline.sql.gz - test/src/main/resources/db/7.5/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5/empty_h2.sql.gz - test/src/main/resources/db/7.5/empty_pg.sql.gz - test/src/main/resources/db/7.5/referentiel.sql.gz - validation/src/main/i18n/getters/validation-fields.getter - validation/src/main/i18n/getters/validation-messages.getter - validation/src/main/resources/fr/ird/observe/dto/data/longline/TdrDto-update-error-validation.xml Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -608,8 +608,8 @@ observe.common.TdrDto.dataLocation observe.common.TdrDto.dataLocation.tip observe.common.TdrDto.deleteData observe.common.TdrDto.deleteData.tip -observe.common.TdrDto.deployementEnd -observe.common.TdrDto.deployementStart +observe.common.TdrDto.deploymentEnd +observe.common.TdrDto.deploymentStart observe.common.TdrDto.enableTimestamp observe.common.TdrDto.enableTimestamp.tip observe.common.TdrDto.exportData @@ -628,9 +628,9 @@ observe.common.TdrDto.keyDataTab observe.common.TdrDto.localisationTab observe.common.TdrDto.locationOnLongline observe.common.TdrDto.maxFishingDepth -observe.common.TdrDto.meanDeployementDepth +observe.common.TdrDto.meanDeploymentDepth observe.common.TdrDto.meanFishingDepth -observe.common.TdrDto.medianDeployementDepth +observe.common.TdrDto.medianDeploymentDepth observe.common.TdrDto.medianFishingDepth observe.common.TdrDto.minFishingDepth observe.common.TdrDto.section ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jaxx ===================================== @@ -253,10 +253,10 @@ <Table id='timestampPanel' fill='both' constraints='BorderLayout.CENTER' insets="0"> - <!-- deployementStart --> + <!-- deploymentStart --> <row> <cell weightx="1" fill="both"> - <DateTimeEditor id='deployementStart' constructorParams='this'/> + <DateTimeEditor id='deploymentStart' constructorParams='this'/> </cell> </row> <!-- fishingStart --> @@ -271,10 +271,10 @@ <DateTimeEditor id='fishingEnd' constructorParams='this'/> </cell> </row> - <!-- deployementEnd --> + <!-- deploymentEnd --> <row> <cell> - <DateTimeEditor id='deployementEnd' constructorParams='this'/> + <DateTimeEditor id='deploymentEnd' constructorParams='this'/> </cell> </row> </Table> @@ -342,22 +342,22 @@ <NumberEditor id='medianFishingDepth' constructorParams='this' styleClass='float2'/> </cell> </row> - <!-- meanDeployementDepth --> + <!-- meanDeploymentDepth --> <row> <cell> - <JLabel id='meanDeployementDepthLabel'/> + <JLabel id='meanDeploymentDepthLabel'/> </cell> <cell weightx='1' anchor='east'> - <NumberEditor id='meanDeployementDepth' constructorParams='this' styleClass='float2'/> + <NumberEditor id='meanDeploymentDepth' constructorParams='this' styleClass='float2'/> </cell> </row> - <!-- medianDeployementDepth --> + <!-- medianDeploymentDepth --> <row> <cell> - <JLabel id='medianDeployementDepthLabel'/> + <JLabel id='medianDeploymentDepthLabel'/> </cell> <cell weightx='1' anchor='east'> - <NumberEditor id='medianDeployementDepth' constructorParams='this' styleClass='float2'/> + <NumberEditor id='medianDeploymentDepth' constructorParams='this' styleClass='float2'/> </cell> </row> </Table> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jcss ===================================== @@ -154,14 +154,14 @@ visible:{enableTimestamp.isSelected()}; } -#deployementStart { - date:{tableEditBean.getDeployementStart()}; - propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_START}; +#deploymentStart { + date:{tableEditBean.getDeploymentStart()}; + propertyDate: {TdrDto.PROPERTY_DEPLOYMENT_START}; } -#deployementEnd { - date:{tableEditBean.getDeployementEnd()}; - propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_END}; +#deploymentEnd { + date:{tableEditBean.getDeploymentEnd()}; + propertyDate: {TdrDto.PROPERTY_DEPLOYMENT_END}; } #fishingStart { @@ -192,14 +192,14 @@ numberValue:{tableEditBean.getFishingEndDepth()}; } -#meanDeployementDepth { - property:{TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH}; - numberValue:{tableEditBean.getMeanDeployementDepth()}; +#meanDeploymentDepth { + property:{TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH}; + numberValue:{tableEditBean.getMeanDeploymentDepth()}; } -#medianDeployementDepth { - property:{TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH}; - numberValue:{tableEditBean.getMedianDeployementDepth()}; +#medianDeploymentDepth { + property:{TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH}; + numberValue:{tableEditBean.getMedianDeploymentDepth()}; } #minFishingDepth { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java ===================================== @@ -202,8 +202,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt POSITION_HELPER_ENTRY.setContextValue(ui, positionHelper); - ui.getDeployementStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - ui.getDeployementEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getDeploymentStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getDeploymentEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); ui.getFishingStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); ui.getFishingEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); @@ -416,8 +416,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt boolean selected = !newValue; - getUi().getDeployementStart().getSliderHidor().setSelected(selected); - getUi().getDeployementStart().getSliderHidor().setTargetVisible(newValue); + getUi().getDeploymentStart().getSliderHidor().setSelected(selected); + getUi().getDeploymentStart().getSliderHidor().setTargetVisible(newValue); getUi().getFishingStart().getSliderHidor().setSelected(selected); getUi().getFishingStart().getSliderHidor().setTargetVisible(newValue); @@ -425,8 +425,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt getUi().getFishingEnd().getSliderHidor().setSelected(selected); getUi().getFishingEnd().getSliderHidor().setTargetVisible(newValue); - getUi().getDeployementEnd().getSliderHidor().setSelected(selected); - getUi().getDeployementEnd().getSliderHidor().setTargetVisible(newValue); + getUi().getDeploymentEnd().getSliderHidor().setSelected(selected); + getUi().getDeploymentEnd().getSliderHidor().setTargetVisible(newValue); } finally { @@ -440,8 +440,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt private void setTimestamp(TdrDto bean, Date timestamp) { - bean.setDeployementStart(timestamp); - bean.setDeployementEnd(timestamp); + bean.setDeploymentStart(timestamp); + bean.setDeploymentEnd(timestamp); bean.setFishingStart(timestamp); bean.setFishingEnd(timestamp); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIModel.java ===================================== @@ -62,8 +62,8 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { public static final Set<String> TIMESTAMP_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TdrDto.PROPERTY_DEPLOYEMENT_START, - TdrDto.PROPERTY_DEPLOYEMENT_END, + ImmutableSet.<String>builder().add(TdrDto.PROPERTY_DEPLOYMENT_START, + TdrDto.PROPERTY_DEPLOYMENT_END, TdrDto.PROPERTY_FISHING_START, TdrDto.PROPERTY_FISHING_END ).build(); @@ -71,8 +71,8 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { public static final Set<String> KEY_DATA_TAB_PROPERTIES = ImmutableSet.<String>builder().add(TdrDto.PROPERTY_FISHING_START_DEPTH, TdrDto.PROPERTY_FISHING_END_DEPTH, - TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, - TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH, TdrDto.PROPERTY_MEAN_FISHING_DEPTH, TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, TdrDto.PROPERTY_MIN_FISHING_DEPTH, @@ -129,16 +129,16 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { TdrDto.PROPERTY_FLOATLINE2_LENGTH, // timestamp tab - TdrDto.PROPERTY_DEPLOYEMENT_START, - TdrDto.PROPERTY_DEPLOYEMENT_END, + TdrDto.PROPERTY_DEPLOYMENT_START, + TdrDto.PROPERTY_DEPLOYMENT_END, TdrDto.PROPERTY_FISHING_START, TdrDto.PROPERTY_FISHING_END, // key data tab TdrDto.PROPERTY_FISHING_START_DEPTH, TdrDto.PROPERTY_FISHING_END_DEPTH, - TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, - TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH, TdrDto.PROPERTY_MEAN_FISHING_DEPTH, TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, TdrDto.PROPERTY_MIN_FISHING_DEPTH, ===================================== dto/src/main/models/Observe.model ===================================== @@ -310,14 +310,14 @@ floatline1Length + {*:1} Float | strictlyPositiveNumber floatline2Length + {*:1} Float | strictlyPositiveNumber serialNo + {*:1} String hasData + {*:1} boolean -deployementStart + {*:1} Date -deployementEnd + {*:1} Date +deploymentStart + {*:1} Date +deploymentEnd + {*:1} Date fishingStart + {*:1} Date fishingEnd + {*:1} Date fishingStartDepth + {*:1} Float | strictlyPositiveNumber fishingEndDepth + {*:1} Float | strictlyPositiveNumber -meanDeployementDepth + {*:1} Float | strictlyPositiveNumber -medianDeployementDepth + {*:1} Float | strictlyPositiveNumber +meanDeploymentDepth + {*:1} Float | strictlyPositiveNumber +medianDeploymentDepth + {*:1} Float | strictlyPositiveNumber minFishingDepth + {*:1} Float | strictlyPositiveNumber maxFishingDepth + {*:1} Float | strictlyPositiveNumber meanFishingDepth + {*:1} Float | strictlyPositiveNumber ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Data location observe.common.TdrDto.delete.data.message=Confirm to delete saved data observe.common.TdrDto.deleteData=Delete observe.common.TdrDto.deleteData.tip=Delete data -observe.common.TdrDto.deployementEnd=Deployement end -observe.common.TdrDto.deployementStart=Deployement start +observe.common.TdrDto.deploymentEnd=Deployement end +observe.common.TdrDto.deploymentStart=Deployement start observe.common.TdrDto.enableTimestamp=Use timestamp observe.common.TdrDto.enableTimestamp.tip=Use timestamp for this recorder observe.common.TdrDto.exportData=Export @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Data keys observe.common.TdrDto.localisationTab=Localisation observe.common.TdrDto.locationOnLongline=Location on longline observe.common.TdrDto.maxFishingDepth=Maximum fishing depth (m) -observe.common.TdrDto.meanDeployementDepth=Mean deployement depth (m) +observe.common.TdrDto.meanDeploymentDepth=Mean deployement depth (m) observe.common.TdrDto.meanFishingDepth=Maximum fishing depth (m) -observe.common.TdrDto.medianDeployementDepth=Median deployement depth (m) +observe.common.TdrDto.medianDeploymentDepth=Median deployement depth (m) observe.common.TdrDto.medianFishingDepth=Median fishing depth (m) observe.common.TdrDto.minFishingDepth=Minimum fishing depth (m) observe.common.TdrDto.replace.data.message=Confirm to replace existing data file «%s» @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=Weight must be bound between %s and %s. observe.validation.targetCatch.uniqueKey=Tuple (weight category - well) must be unique. observe.validation.targetDiscarded.uniqueKey=Tuple (species - category - reasonForDiscard - brought on deck) must be unique. observe.validation.targetLength.required.weight.or.taille=Weight or size must be filled. -observe.validation.tdr.deployementStart.before.fishingStart=fishing start time must be before deployement start time. -observe.validation.tdr.fishingEnd.before.deployementEnd=Deployement end time must be before fishing end time. +observe.validation.tdr.deploymentStart.before.fishingStart=fishing start time must be before deployement start time. +observe.validation.tdr.fishingEnd.before.deploymentEnd=Deployement end time must be before fishing end time. observe.validation.tdr.fishingStart.before.fishingEnd=Fishing end time must be before fishing start time. observe.validation.tdr.required.position=Position must be filled. observe.validation.technology.too.big=Field size can not exceed %s characters (actual length\: %s). ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Ubicación del archivo de datos observe.common.TdrDto.delete.data.message=Confirmar la eliminación del archivo de datos observe.common.TdrDto.deleteData=Eliminar observe.common.TdrDto.deleteData.tip=Eliminar el archivo de datos -observe.common.TdrDto.deployementEnd=Fin de despliegue -observe.common.TdrDto.deployementStart=Inicio de despliegue +observe.common.TdrDto.deploymentEnd=Fin de despliegue +observe.common.TdrDto.deploymentStart=Inicio de despliegue observe.common.TdrDto.enableTimestamp=Activar la FechaHora observe.common.TdrDto.enableTimestamp.tip=Activar la FechaHora para este registro observe.common.TdrDto.exportData=Exportar @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Datos clave observe.common.TdrDto.localisationTab=Localización observe.common.TdrDto.locationOnLongline=Localización sobre la línea observe.common.TdrDto.maxFishingDepth=Profundidad máxima de pesca (m) -observe.common.TdrDto.meanDeployementDepth=Profundidad media de despliegue (m) +observe.common.TdrDto.meanDeploymentDepth=Profundidad media de despliegue (m) observe.common.TdrDto.meanFishingDepth=Profundidad media de pesca (m) -observe.common.TdrDto.medianDeployementDepth=Profundidad mediana de despliegue (m) +observe.common.TdrDto.medianDeploymentDepth=Profundidad mediana de despliegue (m) observe.common.TdrDto.medianFishingDepth=Profundidad mediana de pesca (m) observe.common.TdrDto.minFishingDepth=Profundidad mínima de pesca (m) observe.common.TdrDto.replace.data.message=Confirmar la sustitución del archivo existente «%s» @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=El peso para esta especie debe estar com observe.validation.targetCatch.uniqueKey=El par categoría de peso-cuba debe ser único. observe.validation.targetDiscarded.uniqueKey=La serie especie / categoria / causa del descarte / izado a bordo debe ser única. Esta serie ya se ha usado observe.validation.targetLength.required.weight.or.taille=Al menos uno de los valores (talla / peso) debe ser registrado -observe.validation.tdr.deployementStart.before.fishingStart=La FechaHora de inicio de pesca debe llegar después de la FechaHora de inicio de despliegue -observe.validation.tdr.fishingEnd.before.deployementEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca +observe.validation.tdr.deploymentStart.before.fishingStart=La FechaHora de inicio de pesca debe llegar después de la FechaHora de inicio de despliegue +observe.validation.tdr.fishingEnd.before.deploymentEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca observe.validation.tdr.fishingStart.before.fishingEnd=La FechaHora de fin de pesca debe llegar después del inicio del de inicio de pesca observe.validation.tdr.required.position=Deben registrarse posiciones observe.validation.technology.too.big=El tamaño está limitado a %s caracteres (tamaño actual\: %s). ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Hébergement du fichier de données observe.common.TdrDto.delete.data.message=Confirmer la suppression du fichier de données observe.common.TdrDto.deleteData=Supprimer observe.common.TdrDto.deleteData.tip=Supprimer le fichier de données -observe.common.TdrDto.deployementEnd=Fin déploiement -observe.common.TdrDto.deployementStart=Début déploiement +observe.common.TdrDto.deploymentEnd=Fin déploiement +observe.common.TdrDto.deploymentStart=Début déploiement observe.common.TdrDto.enableTimestamp=Activer l'horodatage observe.common.TdrDto.enableTimestamp.tip=Activer l'horodatage pour cet enregistreur observe.common.TdrDto.exportData=Exporter @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Données clef observe.common.TdrDto.localisationTab=Localisation observe.common.TdrDto.locationOnLongline=Localisation sur la ligne observe.common.TdrDto.maxFishingDepth=Profondeur maximale de pêche (m) -observe.common.TdrDto.meanDeployementDepth=Profondeur moyenne de déploiement (m) +observe.common.TdrDto.meanDeploymentDepth=Profondeur moyenne de déploiement (m) observe.common.TdrDto.meanFishingDepth=Profondeur moyenne de pêche (m) -observe.common.TdrDto.medianDeployementDepth=Profondeur médiane de déploiement (m) +observe.common.TdrDto.medianDeploymentDepth=Profondeur médiane de déploiement (m) observe.common.TdrDto.medianFishingDepth=Profondeur médiane de pêche (m) observe.common.TdrDto.minFishingDepth=Profondeur minimale de pêche (m) observe.common.TdrDto.replace.data.message=Confirmer le remplacement du fichier de données déjà existant «%s» @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=Le poids pour cette espèce doit être c observe.validation.targetCatch.uniqueKey=Le couple (catégorie poids - cuve) doit être unique. observe.validation.targetDiscarded.uniqueKey=Le tuple (espèce - catégorie - raison rejet - monté sur le pont) doit être unique. observe.validation.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. -observe.validation.tdr.deployementStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement. -observe.validation.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. +observe.validation.tdr.deploymentStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement. +observe.validation.tdr.fishingEnd.before.deploymentEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. observe.validation.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. observe.validation.tdr.required.position=Pas de position renseignée sur la palangre. observe.validation.technology.too.big=La taille du champs est limitée à %s caractères (taille actuelle %s). ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/TdrEntityDtoBinder.java ===================================== @@ -59,14 +59,14 @@ public class TdrEntityDtoBinder extends DataEntityDtoBinderSupport<TdrDto, Tdr> entity.setDataFilename(null); } entity.setDataLocation(dto.getDataLocation()); - entity.setDeployementStart(dto.getDeployementStart()); - entity.setDeployementEnd(dto.getDeployementEnd()); + entity.setDeploymentStart(dto.getDeploymentStart()); + entity.setDeploymentEnd(dto.getDeploymentEnd()); entity.setFishingStart(dto.getFishingStart()); entity.setFishingEnd(dto.getFishingEnd()); entity.setFishingStartDepth(dto.getFishingStartDepth()); entity.setFishingEndDepth(dto.getFishingEndDepth()); - entity.setMeanDeployementDepth(dto.getMeanDeployementDepth()); - entity.setMedianDeployementDepth(dto.getMedianDeployementDepth()); + entity.setMeanDeploymentDepth(dto.getMeanDeploymentDepth()); + entity.setMedianDeploymentDepth(dto.getMedianDeploymentDepth()); entity.setMinFishingDepth(dto.getMinFishingDepth()); entity.setMaxFishingDepth(dto.getMaxFishingDepth()); entity.setMeanFishingDepth(dto.getMeanFishingDepth()); @@ -96,14 +96,14 @@ public class TdrEntityDtoBinder extends DataEntityDtoBinderSupport<TdrDto, Tdr> // le champ data ne sert que pour l'upload du fichier si il a changé dto.setData(null); dto.setDataLocation(entity.getDataLocation()); - dto.setDeployementStart(entity.getDeployementStart()); - dto.setDeployementEnd(entity.getDeployementEnd()); + dto.setDeploymentStart(entity.getDeploymentStart()); + dto.setDeploymentEnd(entity.getDeploymentEnd()); dto.setFishingStart(entity.getFishingStart()); dto.setFishingEnd(entity.getFishingEnd()); dto.setFishingStartDepth(entity.getFishingStartDepth()); dto.setFishingEndDepth(entity.getFishingEndDepth()); - dto.setMeanDeployementDepth(entity.getMeanDeployementDepth()); - dto.setMedianDeployementDepth(entity.getMedianDeployementDepth()); + dto.setMeanDeploymentDepth(entity.getMeanDeploymentDepth()); + dto.setMedianDeploymentDepth(entity.getMedianDeploymentDepth()); dto.setMinFishingDepth(entity.getMinFishingDepth()); dto.setMaxFishingDepth(entity.getMaxFishingDepth()); dto.setMeanFishingDepth(entity.getMeanFishingDepth()); ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java ===================================== @@ -31,23 +31,23 @@ public class TdrImpl extends TdrAbstract { private static final long serialVersionUID = 1L; @Override - public Date getDeployementStartDate() { - return deployementStart == null ? null : DateUtil.getDay(deployementStart); + public Date getDeploymentStartDate() { + return deploymentStart == null ? null : DateUtil.getDay(deploymentStart); } @Override - public Date getDeployementStartTime() { - return deployementStart == null ? null : DateUtil.getTime(deployementStart, false, false); + public Date getDeploymentStartTime() { + return deploymentStart == null ? null : DateUtil.getTime(deploymentStart, false, false); } @Override - public Date getDeployementEndDate() { - return deployementEnd == null ? null : DateUtil.getDay(deployementEnd); + public Date getDeploymentEndDate() { + return deploymentEnd == null ? null : DateUtil.getDay(deploymentEnd); } @Override - public Date getDeployementEndTime() { - return deployementEnd == null ? null : DateUtil.getTime(deployementEnd, false, false); + public Date getDeploymentEndTime() { + return deploymentEnd == null ? null : DateUtil.getTime(deploymentEnd, false, false); } @Override @@ -71,34 +71,34 @@ public class TdrImpl extends TdrAbstract { } @Override - public void setDeployementStartDate(Date date) { - if (deployementStart != null) { - Date dateAndTime = DateUtil.getDateAndTime(date, deployementStart, true, false); - setDeployementStart(dateAndTime); + public void setDeploymentStartDate(Date date) { + if (deploymentStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deploymentStart, true, false); + setDeploymentStart(dateAndTime); } } @Override - public void setDeployementStartTime(Date time) { - if (deployementStart != null) { - Date dateAndTime = DateUtil.getDateAndTime(deployementStart, time, false, false); - setDeployementStart(dateAndTime); + public void setDeploymentStartTime(Date time) { + if (deploymentStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(deploymentStart, time, false, false); + setDeploymentStart(dateAndTime); } } @Override - public void setDeployementEndDate(Date date) { - if (deployementEnd != null) { - Date dateAndTime = DateUtil.getDateAndTime(date, deployementEnd, true, false); - setDeployementEnd(dateAndTime); + public void setDeploymentEndDate(Date date) { + if (deploymentEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deploymentEnd, true, false); + setDeploymentEnd(dateAndTime); } } @Override - public void setDeployementEndTime(Date time) { - if (deployementEnd != null) { - Date dateAndTime = DateUtil.getDateAndTime(deployementEnd, time, false, false); - setDeployementEnd(dateAndTime); + public void setDeploymentEndTime(Date time) { + if (deploymentEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(deploymentEnd, time, false, false); + setDeploymentEnd(dateAndTime); } } ===================================== persistence/src/main/models/Observe.model ===================================== @@ -291,7 +291,7 @@ longline.SizeMeasure > ObserveDataEntity | entity size + {*:1} Float | sqlType=numeric sizeMeasureType {*:1} referentiel.SizeMeasureType -longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deployementStartDate,deployementStartTime,deployementEndDate,deployementEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime +longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deploymentStartDate,deploymentStartTime,deploymentEndDate,deploymentEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime homeId + {*:1} String floatline1Length + {*:1} Float | sqlType=numeric floatline2Length + {*:1} Float | sqlType=numeric @@ -299,14 +299,14 @@ serialNo + {*:1} String data + {*:1} !java.sql.Blob dataFilename + {*:1} String dataLocation + {*:1} String -deployementStart + {*:1} Date -deployementEnd + {*:1} Date +deploymentStart + {*:1} Date +deploymentEnd + {*:1} Date fishingStart + {*:1} Date fishingEnd + {*:1} Date fishingStartDepth + {*:1} Float fishingEndDepth + {*:1} Float -meanDeployementDepth + {*:1} Float -medianDeployementDepth + {*:1} Float +meanDeploymentDepth + {*:1} Float +medianDeploymentDepth + {*:1} Float minFishingDepth + {*:1} Float maxFishingDepth + {*:1} Float meanFishingDepth + {*:1} Float @@ -319,18 +319,18 @@ section {*:0..1} longline.Section basket {*:0..1} longline.Basket itemHorizontalPosition {*:0..1} referentiel.longline.ItemHorizontalPosition itemVerticalPosition {*:0..1} referentiel.longline.ItemVerticalPosition -getDeployementStartDate() Date -getDeployementStartTime() Date -getDeployementEndDate() Date -getDeployementEndTime() Date +getDeploymentStartDate() Date +getDeploymentStartTime() Date +getDeploymentEndDate() Date +getDeploymentEndTime() Date getFishingStartDate() Date getFishingStartTime() Date getFishingEndDate() Date getFishingEndTime() Date -setDeployementStartDate(date Date) -setDeployementEndDate(date Date) -setDeployementStartTime(time Date) -setDeployementEndTime(time Date) +setDeploymentStartDate(date Date) +setDeploymentEndDate(date Date) +setDeploymentStartTime(time Date) +setDeploymentEndTime(time Date) setFishingStartDate(date Date) setFishingStartTime(time Date) setFishingEndDate(date Date) ===================================== test/src/main/resources/db/7.5/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.5/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_h2.sql.gz and b/test/src/main/resources/db/7.5/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_pg.sql.gz and b/test/src/main/resources/db/7.5/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.5/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/referentiel.sql.gz and b/test/src/main/resources/db/7.5/referentiel.sql.gz differ ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -248,7 +248,7 @@ observe.common.TargetLengthDto.length observe.common.TargetLengthDto.weight observe.common.TdrDto.basket observe.common.TdrDto.branchline -observe.common.TdrDto.deployementEnd +observe.common.TdrDto.deploymentEnd observe.common.TdrDto.fishingEnd observe.common.TdrDto.fishingEndDepth observe.common.TdrDto.fishingStart @@ -258,9 +258,9 @@ observe.common.TdrDto.floatline2Length observe.common.TdrDto.itemHorizontalPosition observe.common.TdrDto.itemVerticalPosition observe.common.TdrDto.maxFishingDepth -observe.common.TdrDto.meanDeployementDepth +observe.common.TdrDto.meanDeploymentDepth observe.common.TdrDto.meanFishingDepth -observe.common.TdrDto.medianDeployementDepth +observe.common.TdrDto.medianDeploymentDepth observe.common.TdrDto.medianFishingDepth observe.common.TdrDto.minFishingDepth observe.common.TdrDto.section ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -56,8 +56,8 @@ observe.validation.species.weight.bound observe.validation.targetCatch.uniqueKey observe.validation.targetDiscarded.uniqueKey observe.validation.targetLength.required.weight.or.taille -observe.validation.tdr.deployementStart.before.fishingStart -observe.validation.tdr.fishingEnd.before.deployementEnd +observe.validation.tdr.deploymentStart.before.fishingStart +observe.validation.tdr.fishingEnd.before.deploymentEnd observe.validation.tdr.fishingStart.before.fishingEnd observe.validation.tdr.required.position observe.validation.technology.too.big ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TdrDto-update-error-validation.xml ===================================== @@ -24,12 +24,12 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="fishingStart"> - <!-- deployementStart < fishingStart --> + <!-- deploymentStart < fishingStart --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ deployementStart == null || fishingStart == null || deployementStart.time < fishingStart.time ]]> + <![CDATA[ deploymentStart == null || fishingStart == null || deploymentStart.time < fishingStart.time ]]> </param> - <message>observe.validation.tdr.deployementStart.before.fishingStart</message> + <message>observe.validation.tdr.deploymentStart.before.fishingStart</message> </field-validator> </field> <field name="fishingEnd"> @@ -41,13 +41,13 @@ <message>observe.validation.tdr.fishingStart.before.fishingEnd</message> </field-validator> </field> - <field name="deployementEnd"> - <!-- fishingEnd < deployementEnd --> + <field name="deploymentEnd"> + <!-- fishingEnd < deploymentEnd --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ fishingEnd == null || deployementEnd == null || fishingEnd.time < deployementEnd.time ]]> + <![CDATA[ fishingEnd == null || deploymentEnd == null || fishingEnd.time < deploymentEnd.time ]]> </param> - <message>observe.validation.tdr.fishingEnd.before.deployementEnd</message> + <message>observe.validation.tdr.fishingEnd.before.deploymentEnd</message> </field-validator> </field> </validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3d070135f025d5eede0f1909a3... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3d070135f025d5eede0f1909a3... You're receiving this email because of your account on gitlab.com.