Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

20 changed files:

Changes:

  • client-core/src/main/i18n/getters/java.getter
    ... ... @@ -713,6 +713,7 @@ observe.content.map.west
    713 713 
     observe.converter.error.float.format
    714 714 
     observe.converter.error.no.convertor
    715 715 
     observe.converter.error.noValue
    716 
    +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip
    716 717 
     observe.entity.message.updating
    717 718 
     observe.error.can.not.create.directory
    718 719 
     observe.error.storage.could.not.backup.unsane.local.db

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/BranchlineSetDefaultTimerTimeOnBoard.java
    1 
    +package fr.ird.observe.client.ui.actions.content;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Client core
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import fr.ird.observe.client.ui.ObserveMainUI;
    26 
    +import fr.ird.observe.client.ui.content.data.longline.BranchlineUI;
    27 
    +import fr.ird.observe.dto.data.longline.BranchlineDto;
    28 
    +
    29 
    +import java.util.Date;
    30 
    +
    31 
    +/**
    32 
    + * Created on 19/01/2021.
    33 
    + *
    34 
    + * @author Tony Chemit - dev@tchemit.fr
    35 
    + * @since 7.6.7
    36 
    + */
    37 
    +public class BranchlineSetDefaultTimerTimeOnBoard extends SetDefaultTimerTimeOnBoard<BranchlineUI> {
    38 
    +
    39 
    +    public static final String ACTION_NAME = BranchlineSetDefaultTimerTimeOnBoard.class.getName();
    40 
    +
    41 
    +    public BranchlineSetDefaultTimerTimeOnBoard(ObserveMainUI mainUI) {
    42 
    +        super(mainUI,ACTION_NAME);
    43 
    +    }
    44 
    +
    45 
    +    @Override
    46 
    +    protected Date getHaulingStartTimeStamp(BranchlineUI ui) {
    47 
    +        return ui.getModel().getHaulingStartTimeStamp();
    48 
    +    }
    49 
    +
    50 
    +    @Override
    51 
    +    protected BranchlineDto getBranchlineBean(BranchlineUI ui) {
    52 
    +        return ui.getBean();
    53 
    +    }
    54 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/CatchSetDefaultTimerTimeOnBoard.java
    1 
    +package fr.ird.observe.client.ui.actions.content;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Client core
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import fr.ird.observe.client.ui.ObserveMainUI;
    26 
    +import fr.ird.observe.client.ui.content.data.longline.CatchLonglineUI;
    27 
    +import fr.ird.observe.dto.data.longline.BranchlineDto;
    28 
    +
    29 
    +import java.util.Date;
    30 
    +
    31 
    +/**
    32 
    + * Created on 19/01/2021.
    33 
    + *
    34 
    + * @author Tony Chemit - dev@tchemit.fr
    35 
    + * @since 7.6.7
    36 
    + */
    37 
    +public class CatchSetDefaultTimerTimeOnBoard  extends SetDefaultTimerTimeOnBoard<CatchLonglineUI> {
    38 
    +
    39 
    +    public static final String ACTION_NAME = CatchSetDefaultTimerTimeOnBoard.class.getName();
    40 
    +
    41 
    +    public CatchSetDefaultTimerTimeOnBoard(ObserveMainUI mainUI) {
    42 
    +        super(mainUI,ACTION_NAME);
    43 
    +    }
    44 
    +
    45 
    +    @Override
    46 
    +    protected Date getHaulingStartTimeStamp(CatchLonglineUI ui) {
    47 
    +        return ui.getBean().getHaulingStartTimeStamp();
    48 
    +    }
    49 
    +
    50 
    +    @Override
    51 
    +    protected BranchlineDto getBranchlineBean(CatchLonglineUI ui) {
    52 
    +        return ui.getBranchlineBean();
    53 
    +    }
    54 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/SetDefaultTimerTimeOnBoard.java
    1 
    +package fr.ird.observe.client.ui.actions.content;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe Client :: DataSource :: Editor :: LL
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +
    26 
    +import fr.ird.observe.client.ui.ObserveMainUI;
    27 
    +import fr.ird.observe.client.ui.content.ContentUI;
    28 
    +import fr.ird.observe.dto.data.longline.BranchlineDto;
    29 
    +
    30 
    +import javax.swing.KeyStroke;
    31 
    +import java.util.Date;
    32 
    +
    33 
    +import static io.ultreia.java4all.i18n.I18n.t;
    34 
    +
    35 
    +/**
    36 
    + * Created on 15/01/2021.
    37 
    + *
    38 
    + * @author Tony Chemit - dev@tchemit.fr
    39 
    + * @since 8.0.3
    40 
    + */
    41 
    +abstract class SetDefaultTimerTimeOnBoard<U extends ContentUI> extends AbstractContentUIAction {
    42 
    +
    43 
    +    SetDefaultTimerTimeOnBoard(ObserveMainUI mainUI, String actionName) {
    44 
    +        super(mainUI, actionName, "", t("observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip"), "combobox-reset2", KeyStroke.getKeyStroke("alt pressed G"));
    45 
    +    }
    46 
    +
    47 
    +    protected abstract Date getHaulingStartTimeStamp(U ui);
    48 
    +
    49 
    +    protected abstract BranchlineDto getBranchlineBean(U ui);
    50 
    +
    51 
    +    @Override
    52 
    +    protected void actionPerformed(ContentUI<?, ?> contentUI) {
    53 
    +        U ui = (U) contentUI;
    54 
    +        BranchlineDto branchlineBean = getBranchlineBean(ui);
    55 
    +        Date haulingStartTimeStamp = getHaulingStartTimeStamp(ui);
    56 
    +        branchlineBean.setTimerTimeOnBoard(haulingStartTimeStamp);
    57 
    +    }
    58 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx
    ... ... @@ -31,6 +31,7 @@
    31 31 
         fr.ird.observe.dto.referential.longline.BaitSettingStatusReference
    32 32 
         fr.ird.observe.dto.referential.longline.HookSizeReference
    33 33 
         fr.ird.observe.dto.referential.longline.HookTypeReference
    34 
    +    fr.ird.observe.client.ui.actions.content.BranchlineSetDefaultTimerTimeOnBoard
    34 35
    35 36 
         fr.ird.observe.client.ui.util.JComment
    36 37
    ... ... @@ -109,6 +110,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); }
    109 110 
                             <JCheckBox id='depthRecorder' styleClass="i18n"/>
    110 111 
                             <JCheckBox id='hookLost' styleClass="i18n"/>
    111 112 
                             <JCheckBox id='traceCutOff' styleClass="i18n"/>
    113 
    +                        <JButton id='setDefaultTimerTimeOnBoard'/>
    112 114 
                           </JPanel>
    113 115 
                         </cell>
    114 116 
                       </row>

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss
    ... ... @@ -68,7 +68,6 @@
    68 68 
     }
    69 69
    70 70 
     #timerTimeOnBoard {
    71 
    -  enabled:{BooleanUtils.isTrue(bean.getTimer())};
    72 71 
       date:{bean.getTimerTimeOnBoard()};
    73 72 
       showTimeEditorSlider:false;
    74 73 
       propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD};
    ... ... @@ -145,3 +144,7 @@
    145 144 
       property:{BranchlineDto.PROPERTY_BAIT_TYPE};
    146 145 
       selectedItem:{bean.getBaitType()};
    147 146 
     }
    147 
    +
    148 
    +#setDefaultTimerTimeOnBoard {
    149 
    +  _observeAction:{BranchlineSetDefaultTimerTimeOnBoard.ACTION_NAME};
    150 
    +}
    \ No newline at end of file

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java
    ... ... @@ -110,6 +110,9 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl
    110 110
    111 111 
             getModel().addPropertyChangeListener(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT,
    112 112 
                                                  evt -> getUi().getValidator().setChanged(true));
    113 
    +
    114 
    +        ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true);
    115 
    +        ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard());
    113 116 
         }
    114 117
    115 118 
         public void edit(BranchlineDto branchline) {

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java
    ... ... @@ -74,6 +74,7 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> {
    74 74 
         private boolean hookAndBaitTabValid;
    75 75
    76 76 
         private Date timeSinceContact;
    77 
    +    private Date haulingStartTimeStamp;
    77 78
    78 79 
         public BranchlineUIModel() {
    79 80 
             super(BranchlineDto.class);
    ... ... @@ -119,4 +120,13 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> {
    119 120 
             firePropertyChange(PROPERTY_SAVED, null, true);
    120 121 
         }
    121 122
    123 
    +    public Date getHaulingStartTimeStamp() {
    124 
    +        return haulingStartTimeStamp;
    125 
    +    }
    126 
    +
    127 
    +    public void setHaulingStartTimeStamp(Date haulingStartTimeStamp) {
    128 
    +        Date oldValue = this.haulingStartTimeStamp;
    129 
    +        this.haulingStartTimeStamp = haulingStartTimeStamp;
    130 
    +        firePropertyChange("haulingStartTimeStamp", oldValue, haulingStartTimeStamp);
    131 
    +    }
    122 132 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesTableModel.java
    ... ... @@ -24,8 +24,6 @@ package fr.ird.observe.client.ui.content.data.longline;
    24 24
    25 25 
     import fr.ird.observe.dto.data.longline.BranchlineDto;
    26 26
    27 
    -import java.util.Date;
    28 
    -
    29 27 
     /**
    30 28 
      * Created on 12/11/14.
    31 29 
      *
    ... ... @@ -36,23 +34,16 @@ public class BranchlinesTableModel extends LonglineCompositionTableModelSupport<
    36 34
    37 35 
         private static final long serialVersionUID = 1L;
    38 36
    39 
    -    protected Date defaultDate;
    40 
    -
    41 37 
         private boolean useTimer;
    42 38
    43 39 
         public BranchlinesTableModel(LonglineDetailCompositionUIModel model) {
    44 40 
             super(model);
    45 41 
         }
    46 42
    47 
    -    public void setDefaultDate(Date defaultDate) {
    48 
    -        this.defaultDate = defaultDate;
    49 
    -    }
    50 
    -
    51 43 
         @Override
    52 44 
         public BranchlineDto createNewRow() {
    53 45
    54 46 
             BranchlineDto branchline = new BranchlineDto();
    55 
    -        branchline.setTimerTimeOnBoard(defaultDate);
    56 47 
             branchline.setTimer(useTimer);
    57 48 
             return branchline;
    58 49

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx
    ... ... @@ -49,6 +49,8 @@
    49 49 
         fr.ird.observe.client.ui.util.BooleanEditor
    50 50 
         fr.ird.observe.client.ui.util.JComment
    51 51
    52 
    +    fr.ird.observe.client.ui.actions.content.CatchSetDefaultTimerTimeOnBoard
    53 
    +
    52 54 
         org.nuiton.jaxx.widgets.number.NumberEditor
    53 55 
         io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox
    54 56 
         org.nuiton.jaxx.widgets.select.FilterableDoubleList
    ... ... @@ -401,6 +403,7 @@
    401 403 
                           <JCheckBox id='depthRecorder'/>
    402 404 
                           <JCheckBox id='hookLost'/>
    403 405 
                           <JCheckBox id='traceCutOff'/>
    406 
    +                      <JButton id='setDefaultTimerTimeOnBoard'/>
    404 407 
                         </JPanel>
    405 408 
                       </cell>
    406 409 
                     </row>

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss
    ... ... @@ -360,3 +360,7 @@ JCheckBox {
    360 360 
       actionIcon:"save";
    361 361 
       enabled:{branchlineValidator.isChanged() && branchlineValidator.isValid()};
    362 362 
     }
    363 
    +
    364 
    +#setDefaultTimerTimeOnBoard {
    365 
    +  _observeAction:{CatchSetDefaultTimerTimeOnBoard.ACTION_NAME};
    366 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java
    ... ... @@ -235,6 +235,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
    235 235 
             model.addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT,
    236 236 
                                             evt -> ui.getBranchlineValidator().setChanged(true));
    237 237
    238 
    +        ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true);
    239 
    +        ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard());
    238 240 
         }
    239 241
    240 242 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java
    ... ... @@ -383,6 +383,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
    383 383 
             Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null);
    384 384
    385 385 
             BranchlineUIModel branchlineUIModel = getUi().getBranchlineDetailUI().getModel();
    386 
    +        branchlineUIModel.setHaulingStartTimeStamp(bean.getHaulingStartTimeStamp());
    386 387 
     //        branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
    387 388
    388 389 
             Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class);
    ... ... @@ -390,11 +391,6 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
    390 391
    391 392 
             branchlineUIModel.setForm(branchlineDtoForm);
    392 393
    393 
    -        //FIXME Validate this default date
    394 
    -        if (log.isInfoEnabled()) {
    395 
    -            log.info("Use as default branchline timer date: " + bean.getSettingStartTimeStamp());
    396 
    -        }
    397 
    -        getBranchlinesTableModel().setDefaultDate(bean.getSettingStartTimeStamp());
    398 394 
             getBranchlinesTableModel().setUseTimer(BooleanUtils.isTrue(bean.getMonitored()));
    399 395
    400 396 
             // by default, can generate if there is no section in database

  • client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java
    ... ... @@ -49,6 +49,8 @@ import org.nuiton.jaxx.runtime.swing.renderer.DecoratorTableCellRenderer;
    49 49 
     import org.nuiton.jaxx.widgets.error.ErrorDialogUI;
    50 50 
     import org.nuiton.jaxx.widgets.file.JaxxFileChooser;
    51 51
    52 
    +import javax.swing.AbstractButton;
    53 
    +import javax.swing.Action;
    52 54 
     import javax.swing.JComponent;
    53 55 
     import javax.swing.JDialog;
    54 56 
     import javax.swing.JOptionPane;
    ... ... @@ -697,4 +699,16 @@ public class UIHelper extends SwingUtil {
    697 699 
             editor.getInputMap()
    698 700 
                     .put(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), "none");
    699 701 
         }
    702 
    +
    703 
    +    public static void setAction(AbstractButton editor, Action action) {
    704 
    +        String text = editor.getText();
    705 
    +        String toolTipText = editor.getToolTipText();
    706 
    +        editor.setAction(action);
    707 
    +        if (text != null) {
    708 
    +            editor.setText(text);
    709 
    +        }
    710 
    +        if (toolTipText != null) {
    711 
    +            editor.setToolTipText(toolTipText);
    712 
    +        }
    713 
    +    }
    700 714 
     }

  • dto/src/main/models/Observe.model
    ... ... @@ -266,13 +266,14 @@ lightsticksColor {*:0..1} fr.ird.observe.dto.referential.longline.LightsticksCol
    266 266 
     otherSets {*} data.longline.SetLonglineStub
    267 267
    268 268 
     data.longline.SetLonglineCatch > data.Data >> data.longline.LonglinePositionSetDto | form=data.longline.CatchLongline
    269 
    +haulingStartTimeStamp + {*:1} Date
    269 270 
     catchLongline {*} data.longline.CatchLongline | ordered
    270 271 
     sections {*:*} fr.ird.observe.dto.data.longline.SectionReference
    271 272 
     baskets {*:*} fr.ird.observe.dto.data.longline.BasketReference
    272 273 
     branchlines {*:*} fr.ird.observe.dto.data.longline.BranchlineReference
    273 274
    274 275 
     data.longline.SetLonglineDetailComposition > data.Data
    275 
    -settingStartTimeStamp + {*:1} Date
    276 
    +haulingStartTimeStamp + {*:1} Date
    276 277 
     monitored + {*:1} Boolean
    277 278 
     totalSectionsCount + {*:1} Integer | positiveNumber
    278 279 
     basketsPerSectionCount + {*:1} Integer | positiveNumber

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1950,6 +1950,7 @@ observe.content.selection.empty=< Please select a node in the navigation tree >
    1950 1950 
     observe.converter.error.float.format=Decimal format not correct for value %s
    1951 1951 
     observe.converter.error.no.convertor=could not convert decimal %s using convertor %s
    1952 1952 
     observe.converter.error.noValue=No value to convert using convertor %s
    1953 
    +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip=Set hauling start timestamp
    1953 1954 
     observe.entity.message.updating=object '%1$s' is in editing mode.
    1954 1955 
     observe.error.DuplicateLengthLengthParameterException=Found multiple length length relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s
    1955 1956 
     observe.error.DuplicateLengthWeightParameterException=Found multiple length weight paramters for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1950,6 +1950,7 @@ observe.content.selection.empty=< Seleccione un nodo de conexión en el árbol d
    1950 1950 
     observe.converter.error.float.format=Formato de decimal incorrecto para el valor %s
    1951 1951 
     observe.converter.error.no.convertor=Impossible de convertir el decimal %s con el convertidor %s
    1952 1952 
     observe.converter.error.noValue=Ningún valor necesita ser convertida con el convertidor %s
    1953 
    +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip=Set hauling start timestamp \#TODO
    1953 1954 
     observe.entity.message.updating=Se está modificando el objeto actual '%1$s'.
    1954 1955 
     observe.error.DuplicateLengthLengthParameterException=Found multiple length length relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s \#TODO
    1955 1956 
     observe.error.DuplicateLengthWeightParameterException=Found multiple length weight relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s \#TODO

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1950,6 +1950,7 @@ observe.content.selection.empty=< Veuillez sélectionner un nœud dans l'arbre d
    1950 1950 
     observe.converter.error.float.format=Format de décimal incorrecte pour la valeur %s
    1951 1951 
     observe.converter.error.no.convertor=Impossible de convertir le décimal %s depuis le convertisseur %s
    1952 1952 
     observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s
    1953 
    +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip=Utiliser l'horodatage de début de filage
    1953 1954 
     observe.entity.message.updating=L'objet '%1$s' est en cours de modification.
    1954 1955 
     observe.error.DuplicateLengthLengthParameterException=Plusieurs relations taille-taille ont été trouvées pour l'espèce\: %s, l'ocean\: %s, le sexe\: %s et la date\: %s \:\n * %s
    1955 1956 
     observe.error.DuplicateLengthWeightParameterException=Plusieurs relations taille-poids ont été trouvées pour l'espèce\: %s, l'ocean\: %s, le sexe\: %s et la date\: %s \:\n * %s

  • persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineCatchEntityDtoBinder.java
    ... ... @@ -54,6 +54,6 @@ public class SetLonglineCatchEntityDtoBinder extends DataEntityDtoBinderSupport<
    54 54 
             copyEntityDataFieldsToDto(entity, dto);
    55 55
    56 56 
             dto.setCatchLongline(toListData(referentialLocale, entity.getCatchLongline()));
    57 
    -
    57 
    +        dto.setHaulingStartTimeStamp(entity.getHaulingStartTimeStamp());
    58 58 
         }
    59 59 
     }

  • persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineDetailCompositionEntityDtoBinder.java
    ... ... @@ -44,7 +44,6 @@ public class SetLonglineDetailCompositionEntityDtoBinder extends DataEntityDtoBi
    44 44 
             copyDtoDataFieldsToEntity(dto, entity);
    45 45
    46 46 
             entity.setSection(toEntitySet(referentialLocale, dto.getSection(), entity.getSection()));
    47 
    -        entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp());
    48 47 
             entity.setMonitored(dto.getMonitored());
    49 48 
             entity.setTotalSectionsCount(dto.getTotalSectionsCount());
    50 49 
             entity.setBasketsPerSectionCount(dto.getBasketsPerSectionCount());
    ... ... @@ -60,7 +59,7 @@ public class SetLonglineDetailCompositionEntityDtoBinder extends DataEntityDtoBi
    60 59 
             copyEntityDataFieldsToDto(entity, dto);
    61 60
    62 61 
             dto.setSection(toLinkedHashSetData(referentialLocale, entity.getSection()));
    63 
    -        dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp());
    62 
    +        dto.setHaulingStartTimeStamp(entity.getHaulingStartTimeStamp());
    64 63 
             dto.setMonitored(entity.getMonitored());
    65 64 
             dto.setTotalSectionsCount(entity.getTotalSectionsCount());
    66 65 
             dto.setBasketsPerSectionCount(entity.getBasketsPerSectionCount());

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.