Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 815494d9 by Tony CHEMIT at 2018-06-14T14:46:38Z [GEAR] Page des caractéristiques d'équipements -> ordonancement des caractéristiques - Closes #956 - - - - - 11 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java - dto/src/main/models/Observe.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/GearUseFeaturesLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineGearUseEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/seine/GearUseFeaturesSeineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineGearUseEntityDtoBinder.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineTableModel.java @@ -112,7 +112,7 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon measurements = measurementsTableModel.getData(); } - rowBean.setGearUseFeaturesMeasurement(Sets.newLinkedHashSet(measurements)); + rowBean.setGearUseFeaturesMeasurement(measurements); super.updateRowFromEditBean(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -46,6 +46,7 @@ import fr.ird.observe.dto.referential.GearDto; import fr.ird.observe.dto.referential.GearReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.referential.ReferentialService; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -62,6 +63,7 @@ import java.awt.GridBagConstraints; import java.awt.Insets; import java.beans.PropertyChangeListener; import java.util.Collections; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -80,10 +82,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip /** Logger */ private static final Log log = LogFactory.getLog(GearUseFeaturesLonglineUIHandler.class); - + private final Comparator<GearUseFeaturesMeasurementLonglineDto> GEAR_USE_FEATURES_MEASUREMENT_LONGLINE_DTO_COMPARATOR; // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - private final PropertyChangeListener measurementsTableModelModified; GearUseFeaturesLonglineUIHandler() { @@ -95,6 +96,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip }; measurementsTableModelModified = evt -> onMeasurementsTableModelModified((Boolean) evt.getNewValue()); + GEAR_USE_FEATURES_MEASUREMENT_LONGLINE_DTO_COMPARATOR = Comparator.comparing(m -> StringUtils.leftPad(m.getGearCaracteristic().getCode(), 6, "0")); } @Override @@ -168,12 +170,12 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); int response = UIHelper.askUser(mainUI, - t("observe.title.delete"), - t("observe.common.GearUseFeatures.delete"), - JOptionPane.WARNING_MESSAGE, - new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, - 1); + t("observe.title.delete"), + t("observe.common.GearUseFeatures.delete"), + JOptionPane.WARNING_MESSAGE, + new Object[]{t("observe.choice.confirm.delete"), + t("observe.choice.cancel")}, + 1); if (response != 0) { @@ -205,6 +207,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } return measurementLonglineDto; }) + .sorted(GEAR_USE_FEATURES_MEASUREMENT_LONGLINE_DTO_COMPARATOR) .collect(Collectors.toList()); } @@ -296,14 +299,14 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip JTable table = getUi().getTable(); UIHelper.setI18nTableHeaderRenderer(table, - n("observe.common.GearUseFeaturesLonglineDto.table.gear"), - n("observe.common.GearUseFeaturesLonglineDto.table.gear.tip"), - n("observe.common.GearUseFeaturesLonglineDto.table.number"), - n("observe.common.GearUseFeaturesLonglineDto.table.number.tip"), - n("observe.common.GearUseFeaturesLonglineDto.table.usedInTrip"), - n("observe.common.GearUseFeaturesLonglineDto.table.usedInTrip.tip"), - n("observe.common.GearUseFeaturesLonglineDto.table.comment"), - n("observe.common.GearUseFeaturesLonglineDto.table.comment.tip")); + n("observe.common.GearUseFeaturesLonglineDto.table.gear"), + n("observe.common.GearUseFeaturesLonglineDto.table.gear.tip"), + n("observe.common.GearUseFeaturesLonglineDto.table.number"), + n("observe.common.GearUseFeaturesLonglineDto.table.number.tip"), + n("observe.common.GearUseFeaturesLonglineDto.table.usedInTrip"), + n("observe.common.GearUseFeaturesLonglineDto.table.usedInTrip.tip"), + n("observe.common.GearUseFeaturesLonglineDto.table.comment"), + n("observe.common.GearUseFeaturesLonglineDto.table.comment.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, GearReference.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -316,10 +319,10 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip JTable table = getUi().getMeasurementsTable(); UIHelper.setI18nTableHeaderRenderer(table, - n("observe.common.GearUseFeaturesLonglineDto.table.gearCaracteristic"), - n("observe.common.GearUseFeaturesLonglineDto.table.gearCaracteristic.tip"), - n("observe.common.GearUseFeaturesLonglineDto.table.value"), - n("observe.common.GearUseFeaturesLonglineDto.table.value.tip")); + n("observe.common.GearUseFeaturesLonglineDto.table.gearCaracteristic"), + n("observe.common.GearUseFeaturesLonglineDto.table.gearCaracteristic.tip"), + n("observe.common.GearUseFeaturesLonglineDto.table.value"), + n("observe.common.GearUseFeaturesLonglineDto.table.value.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, GearCaracteristicReference.class)); UIHelper.setTableColumnRenderer(table, 1, new GearUseFeatureMeasurementCellRenderer(0, renderer)); @@ -334,12 +337,12 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); initInlineTable(getUi().getMeasurementsScrollPane(), - table, - getModel().getMeasurementsTableModel(), - measurementsTableModelModified, - getUi().getMeasurementsTablePopup(), - getUi().getAddMeasurement(), - getUi().getDeleteSelectedMeasurement()); + table, + getModel().getMeasurementsTableModel(), + measurementsTableModelModified, + getUi().getMeasurementsTablePopup(), + getUi().getAddMeasurement(), + getUi().getDeleteSelectedMeasurement()); } @@ -406,9 +409,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip // mode lecture : la marée n'est pas ouverte addMessage(getUi(), - NuitonValidatorScope.INFO, - getTypeI18nKey(TripLonglineDto.class), - t("observe.common.TripLonglineDto.message.not.open")); + NuitonValidatorScope.INFO, + getTypeI18nKey(TripLonglineDto.class), + t("observe.common.TripLonglineDto.message.not.open")); return ContentMode.READ; } @@ -475,6 +478,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip protected void loadEditBean(String beanId) { Form<TripLonglineGearUseDto> form = getTripLonglineGearUseService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); + for (GearUseFeaturesLonglineDto gearUseFeaturesLonglineDto : form.getObject().getGearUseFeaturesLongline()) { + gearUseFeaturesLonglineDto.getGearUseFeaturesMeasurement().sort(GEAR_USE_FEATURES_MEASUREMENT_LONGLINE_DTO_COMPARATOR); + } getModel().setForm(form); TripLonglineGearUseHelper.copyTripLonglineGearUseDto(form.getObject(), getBean()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -101,10 +101,12 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable switch (columnIndex) { case 0: measure.setGearCaracteristic((GearCaracteristicReference) aValue); - String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); - if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { - // on force à avoir false par défaut - measure.setMeasurementValue("false"); + if (aValue != null) { + String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); + if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { + // on force à avoir false par défaut + measure.setMeasurementValue("false"); + } } break; case 1: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.seine; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -101,10 +101,12 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit switch (columnIndex) { case 0: measure.setGearCaracteristic((GearCaracteristicReference) aValue); - String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); - if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { - // on force à avoir false par défaut - measure.setMeasurementValue("false"); + if (aValue != null) { + String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); + if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { + // on force à avoir false par défaut + measure.setMeasurementValue("false"); + } } break; case 1: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineTableModel.java @@ -10,19 +10,18 @@ package fr.ird.observe.client.ui.content.data.seine; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -import com.google.common.collect.Sets; import fr.ird.observe.client.ui.content.table.ContentTableMeta; import fr.ird.observe.client.ui.content.table.ContentTableModel; import fr.ird.observe.client.ui.content.table.ObserveContentTableUI; @@ -113,11 +112,8 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineG measurements = measurementsTableModel.getData(); } - rowBean.setGearUseFeaturesMeasurement(Sets.newLinkedHashSet(measurements)); - + rowBean.setGearUseFeaturesMeasurement(measurements); super.updateRowFromEditBean(); - - } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.seine; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -46,6 +46,7 @@ import fr.ird.observe.dto.referential.GearDto; import fr.ird.observe.dto.referential.GearReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.referential.ReferentialService; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -62,6 +63,7 @@ import java.awt.GridBagConstraints; import java.awt.Insets; import java.beans.PropertyChangeListener; import java.util.Collections; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -81,6 +83,8 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei /** Logger */ private static final Log log = LogFactory.getLog(GearUseFeaturesSeineUIHandler.class); + private final Comparator<GearUseFeaturesMeasurementSeineDto> GEAR_USE_FEATURES_MEASUREMENT_SEINE_DTO_COMPARATOR; + // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; @@ -95,6 +99,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei }; measurementsTableModelModified = evt -> onMeasurementsTableModelModified((Boolean) evt.getNewValue()); + GEAR_USE_FEATURES_MEASUREMENT_SEINE_DTO_COMPARATOR = Comparator.comparing(m -> StringUtils.leftPad(m.getGearCaracteristic().getCode(), 6, "0")); } @Override @@ -169,11 +174,11 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); int response = UIHelper.askUser(mainUI, - t("observe.title.delete"), - t("observe.common.GearUseFeatures.delete"), - JOptionPane.WARNING_MESSAGE, - new Object[]{t("observe.choice.confirm.delete"), t("observe.choice.cancel")}, - 1); + t("observe.title.delete"), + t("observe.common.GearUseFeatures.delete"), + JOptionPane.WARNING_MESSAGE, + new Object[]{t("observe.choice.confirm.delete"), t("observe.choice.cancel")}, + 1); if (response != 0) { @@ -205,6 +210,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei measurementSeineDto.setGearCaracteristic(input); return measurementSeineDto; }) + .sorted(GEAR_USE_FEATURES_MEASUREMENT_SEINE_DTO_COMPARATOR) .collect(Collectors.toList()); } @@ -295,14 +301,14 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei JTable table = getUi().getTable(); UIHelper.setI18nTableHeaderRenderer(table, - n("observe.common.GearUseFeaturesSeineDto.table.gear"), - n("observe.common.GearUseFeaturesSeineDto.table.gear.tip"), - n("observe.common.GearUseFeaturesSeineDto.table.number"), - n("observe.common.GearUseFeaturesSeineDto.table.number.tip"), - n("observe.common.GearUseFeaturesSeineDto.table.usedInTrip"), - n("observe.common.GearUseFeaturesSeineDto.table.usedInTrip.tip"), - n("observe.common.GearUseFeaturesSeineDto.table.comment"), - n("observe.common.GearUseFeaturesSeineDto.table.comment.tip")); + n("observe.common.GearUseFeaturesSeineDto.table.gear"), + n("observe.common.GearUseFeaturesSeineDto.table.gear.tip"), + n("observe.common.GearUseFeaturesSeineDto.table.number"), + n("observe.common.GearUseFeaturesSeineDto.table.number.tip"), + n("observe.common.GearUseFeaturesSeineDto.table.usedInTrip"), + n("observe.common.GearUseFeaturesSeineDto.table.usedInTrip.tip"), + n("observe.common.GearUseFeaturesSeineDto.table.comment"), + n("observe.common.GearUseFeaturesSeineDto.table.comment.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, GearReference.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -315,10 +321,10 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei JTable table = getUi().getMeasurementsTable(); UIHelper.setI18nTableHeaderRenderer(table, - n("observe.common.GearUseFeaturesSeineDto.table.gearCaracteristic"), - n("observe.common.GearUseFeaturesSeineDto.table.gearCaracteristic.tip"), - n("observe.common.GearUseFeaturesSeineDto.table.value"), - n("observe.common.GearUseFeaturesSeineDto.table.value.tip")); + n("observe.common.GearUseFeaturesSeineDto.table.gearCaracteristic"), + n("observe.common.GearUseFeaturesSeineDto.table.gearCaracteristic.tip"), + n("observe.common.GearUseFeaturesSeineDto.table.value"), + n("observe.common.GearUseFeaturesSeineDto.table.value.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, GearCaracteristicReference.class)); UIHelper.setTableColumnRenderer(table, 1, new GearUseFeatureMeasurementCellRenderer(0, renderer)); @@ -333,12 +339,12 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); initInlineTable(getUi().getMeasurementsScrollPane(), - table, - getModel().getMeasurementsTableModel(), - measurementsTableModelModified, - getUi().getMeasurementsTablePopup(), - getUi().getAddMeasurement(), - getUi().getDeleteSelectedMeasurement()); + table, + getModel().getMeasurementsTableModel(), + measurementsTableModelModified, + getUi().getMeasurementsTablePopup(), + getUi().getAddMeasurement(), + getUi().getDeleteSelectedMeasurement()); } @@ -405,9 +411,9 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei // mode lecture addMessage(getUi(), - NuitonValidatorScope.INFO, - getTypeI18nKey(TripSeineDto.class), - t("observe.common.TripSeineDto.message.not.open")); + NuitonValidatorScope.INFO, + getTypeI18nKey(TripSeineDto.class), + t("observe.common.TripSeineDto.message.not.open")); return ContentMode.READ; } @@ -475,6 +481,9 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei protected void loadEditBean(String beanId) { Form<TripSeineGearUseDto> form = getTripSeineGearUseService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); + for (GearUseFeaturesSeineDto gearUseFeaturesSeineDto : form.getObject().getGearUseFeaturesSeine()) { + gearUseFeaturesSeineDto.getGearUseFeaturesMeasurement().sort(GEAR_USE_FEATURES_MEASUREMENT_SEINE_DTO_COMPARATOR); + } getModel().setForm(form); TripSeineGearUseHelper.copyTripSeineGearUseDto(form.getObject(), getBean()); } ===================================== dto/src/main/models/Observe.model ===================================== --- a/dto/src/main/models/Observe.model +++ b/dto/src/main/models/Observe.model @@ -190,7 +190,7 @@ lineType {*:1} fr.ird.observe.dto.referential.longline.LineTypeReference data.longline.GearUseFeaturesLongline > data.Commentable | references=number,usedInTrip number + {*:1} Integer usedInTrip + {*:1} Boolean -gearUseFeaturesMeasurement + {*} data.longline.GearUseFeaturesMeasurementLongline | ordered unique +gearUseFeaturesMeasurement + {*} data.longline.GearUseFeaturesMeasurementLongline | ordered gear {*:1} fr.ird.observe.dto.referential.GearReference data.longline.GearUseFeaturesMeasurementLongline > data.Data @@ -349,7 +349,7 @@ data.longline.TripLonglineActivity > data.Data timeStamp + {*:1} Date data.longline.TripLonglineGearUse > data.Data | form=data.longline.GearUseFeaturesLongline -gearUseFeaturesLongline + {*} data.longline.GearUseFeaturesLongline | ordered unique +gearUseFeaturesLongline + {*} data.longline.GearUseFeaturesLongline | ordered data.longline.WeightMeasure > data.Data | references=weightMeasureTypeLabel,weight weight + {*:1} Float @@ -671,7 +671,7 @@ gearCaracteristic {*:1} fr.ird.observe.dto.referential.GearCaracteristicReferenc data.seine.GearUseFeaturesSeine > data.Commentable | references=number,usedInTrip number + {*:1} Integer usedInTrip + {*:1} Boolean -gearUseFeaturesMeasurement + {*} data.seine.GearUseFeaturesMeasurementSeine | unique +gearUseFeaturesMeasurement + {*} data.seine.GearUseFeaturesMeasurementSeine | ordered gear {*:1} fr.ird.observe.dto.referential.GearReference data.seine.NonTargetCatch > data.Commentable | references=speciesLabel,speciesFateLabel @@ -838,4 +838,4 @@ route {*} data.seine.RouteStub | ordered unique program {*:1} fr.ird.observe.dto.referential.ProgramReference data.seine.TripSeineGearUse > data.Data | form=data.seine.GearUseFeaturesSeine -gearUseFeaturesSeine + {*} data.seine.GearUseFeaturesSeine | ordered unique +gearUseFeaturesSeine + {*} data.seine.GearUseFeaturesSeine | ordered ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/GearUseFeaturesLonglineEntityDtoBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/data/longline/GearUseFeaturesLonglineEntityDtoBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/data/longline/GearUseFeaturesLonglineEntityDtoBinder.java @@ -58,7 +58,7 @@ public class GearUseFeaturesLonglineEntityDtoBinder extends DataEntityDtoBinderS dto.setNumber(entity.getNumber()); dto.setUsedInTrip(entity.getUsedInTrip()); dto.setGear(toReferentialReference(referentialLocale, entity.getGear())); - dto.setGearUseFeaturesMeasurement(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesMeasurement())); + dto.setGearUseFeaturesMeasurement(toListData(referentialLocale, entity.getGearUseFeaturesMeasurement())); } } ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineGearUseEntityDtoBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineGearUseEntityDtoBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineGearUseEntityDtoBinder.java @@ -40,19 +40,13 @@ public class TripLonglineGearUseEntityDtoBinder extends DataEntityDtoBinderSuppo @Override public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineGearUseDto dto, TripLongline entity) { - copyDtoDataFieldsToEntity(dto, entity); - entity.setGearUseFeaturesLongline(toEntitySet(referentialLocale, dto.getGearUseFeaturesLongline(), entity.getGearUseFeaturesLongline())); - } @Override public void copyToDto(ReferentialLocale referentialLocale, TripLongline entity, TripLonglineGearUseDto dto) { - copyEntityDataFieldsToDto(entity, dto); - - dto.setGearUseFeaturesLongline(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesLongline())); - + dto.setGearUseFeaturesLongline(toListData(referentialLocale, entity.getGearUseFeaturesLongline())); } } ===================================== persistence/src/main/java/fr/ird/observe/binder/data/seine/GearUseFeaturesSeineEntityDtoBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/data/seine/GearUseFeaturesSeineEntityDtoBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/data/seine/GearUseFeaturesSeineEntityDtoBinder.java @@ -40,26 +40,20 @@ public class GearUseFeaturesSeineEntityDtoBinder extends DataEntityDtoBinderSupp @Override public void copyToEntity(ReferentialLocale referentialLocale, GearUseFeaturesSeineDto dto, GearUseFeaturesSeine entity) { - copyDtoDataFieldsToEntity(dto, entity); - entity.setNumber(dto.getNumber()); entity.setUsedInTrip(dto.getUsedInTrip()); entity.setGear(toEntity(dto.getGear())); entity.setGearUseFeaturesMeasurement(toEntityCollection(referentialLocale, dto.getGearUseFeaturesMeasurement(), entity.getGearUseFeaturesMeasurement())); - } @Override public void copyToDto(ReferentialLocale referentialLocale, GearUseFeaturesSeine entity, GearUseFeaturesSeineDto dto) { - copyEntityDataFieldsToDto(entity, dto); - dto.setNumber(entity.getNumber()); dto.setUsedInTrip(entity.getUsedInTrip()); dto.setGear(toReferentialReference(referentialLocale, entity.getGear())); - dto.setGearUseFeaturesMeasurement(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesMeasurement())); - + dto.setGearUseFeaturesMeasurement(toListData(referentialLocale, entity.getGearUseFeaturesMeasurement())); } } ===================================== persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineGearUseEntityDtoBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineGearUseEntityDtoBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineGearUseEntityDtoBinder.java @@ -40,20 +40,14 @@ public class TripSeineGearUseEntityDtoBinder extends DataEntityDtoBinderSupport< @Override public void copyToEntity(ReferentialLocale referentialLocale, TripSeineGearUseDto dto, TripSeine entity) { - copyDtoDataFieldsToEntity(dto, entity); - entity.setGearUseFeaturesSeine(toEntityCollection(referentialLocale, dto.getGearUseFeaturesSeine(), entity.getGearUseFeaturesSeine())); - } @Override public void copyToDto(ReferentialLocale referentialLocale, TripSeine entity, TripSeineGearUseDto dto) { - copyEntityDataFieldsToDto(entity, dto); - - dto.setGearUseFeaturesSeine(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesSeine())); - + dto.setGearUseFeaturesSeine(toListData(referentialLocale, entity.getGearUseFeaturesSeine())); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/815494d9a365c1f027b118b473c0... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/815494d9a365c1f027b118b473c0... You're receiving this email because of your account on gitlab.com.