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

Commits:

20 changed files:

Changes:

  • client-configuration/src/main/config/Client.ini
    ... ... @@ -142,7 +142,7 @@ final = true
    142 142 
     description = observe.config.logConfigurationFile.description
    143 143 
     key = logConfigurationFile
    144 144 
     type = file
    145 
    -defaultValue = ${resources.directory}/observe-log4j.properties
    145 
    +defaultValue = ${resources.directory}/observe-log4j2.xml
    146 146 
     transient = true
    147 147
    148 148 
     [option swingSessionFile]

  • client/src/main/java/fr/ird/observe/client/ObserveResourceManager.java
    ... ... @@ -24,8 +24,8 @@ package fr.ird.observe.client;
    24 24 
     import fr.ird.observe.client.configuration.ClientConfig;
    25 25 
     import fr.ird.observe.client.configuration.ClientConfigOption;
    26 26 
     import org.apache.commons.io.IOUtils;
    27 
    -import org.apache.logging.log4j.Logger;
    28 27 
     import org.apache.logging.log4j.LogManager;
    28 
    +import org.apache.logging.log4j.Logger;
    29 29 
     import org.nuiton.util.SortedProperties;
    30 30 
     import org.nuiton.util.ZipUtil;
    31 31
    ... ... @@ -60,7 +60,7 @@ public class ObserveResourceManager {
    60 60 
         private static final String OBSERVE_APPLICATION_PROPERTIES = "/observe-application.properties";
    61 61 
         private static final String OBSERVE_REPORTS_PROPERTIES = "/observe-reports.properties";
    62 62 
         private static final String OBSERVE_MAP_ARCHIVE = "/map.zip";
    63 
    -    private static final String OBSERVE_LOG_CONFIGURATION_FILE_PROPERTIES = "/observe-log4j.properties";
    63 
    +    private static final String OBSERVE_LOG_CONFIGURATION_FILE_PROPERTIES = "/observe-log4j2.xml";
    64 64
    65 65 
         /** Logger */
    66 66 
         private static final Logger log = LogManager.getLogger(ObserveResourceManager.class);

  • client/src/main/java/fr/ird/observe/client/ObserveRunner.java
    ... ... @@ -59,6 +59,7 @@ import java.util.Arrays;
    59 59 
     import java.util.Date;
    60 60 
     import java.util.Locale;
    61 61 
     import java.util.Properties;
    62 
    +import java.util.logging.Level;
    62 63
    63 64 
     import static fr.ird.observe.client.configuration.ClientConfigOption.BACKUP_DIRECTORY;
    64 65 
     import static fr.ird.observe.client.configuration.ClientConfigOption.DATA_DIRECTORY;
    ... ... @@ -79,6 +80,12 @@ import static org.nuiton.i18n.I18n.t;
    79 80 
      */
    80 81 
     public abstract class ObserveRunner extends ApplicationRunner {
    81 82
    83 
    +    static {
    84 
    +        System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
    85 
    +        java.util.logging.LogManager.getLogManager().reset();
    86 
    +        java.util.logging.LogManager.getLogManager().getLogger("").setLevel(Level.SEVERE);
    87 
    +    }
    88 
    +
    82 89 
         /** Logger */
    83 90 
         private static Logger log = LogManager.getLogger(ObserveRunner.class);
    84 91

  • client/src/main/java/fr/ird/observe/client/ui/actions/content/GoToTabUIActionSupport.java
    ... ... @@ -58,4 +58,9 @@ public abstract class GoToTabUIActionSupport extends AbstractContentUIAction {
    58 58 
             }
    59 59 
             mainTabbedPane.setSelectedIndex(tabIndex);
    60 60 
         }
    61 
    +
    62 
    +    @Override
    63 
    +    protected ContentUI<?, ?> getContentUI(ContentUI<?, ?> contentUI) {
    64 
    +        return contentUI;
    65 
    +    }
    61 66 
     }

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jaxx
    ... ... @@ -200,6 +200,9 @@
    200 200 
                     <cell weightx='1' anchor='east'>
    201 201 
                       <BeanFilterableComboBox id='onBoardProcessing' constructorParams='this' genericType='OnBoardProcessingReference'/>
    202 202 
                     </cell>
    203 
    +                <cell>
    204 
    +                  <JLabel id='photoReferencesLabel'/>
    205 
    +                </cell>
    203 206 
                     <cell anchor='east' weightx="1" fill="both">
    204 207 
                       <JPanel layout='{new BorderLayout()}'>
    205 208 
                         <JToolBar id='photoReferencesToolbar' constraints='BorderLayout.WEST'>
    ... ... @@ -238,7 +241,7 @@
    238 241 
                       <JLabel id='countDepredatedLabel'/>
    239 242 
                     </cell>
    240 243 
                     <cell weightx='1' anchor='east'>
    241 
    -                  <NumberEditor id='countDepredated' constructorParams='this' styleClass="float3"/>
    244 
    +                  <NumberEditor id='countDepredated' constructorParams='this' styleClass="int6"/>
    242 245 
                     </cell>
    243 246 
                   </row>
    244 247 
                   <!-- depredatedProportion -->
    ... ... @@ -247,7 +250,7 @@
    247 250 
                       <JLabel id='depredatedProportionLabel'/>
    248 251 
                     </cell>
    249 252 
                     <cell weightx='1' anchor='east'>
    250 
    -                  <NumberEditor id='depredatedProportion' constructorParams='this' styleClass="float3"/>
    253 
    +                  <NumberEditor id='depredatedProportion' constructorParams='this' styleClass="int6"/>
    251 254 
                     </cell>
    252 255 
                   </row>
    253 256

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jcss
    ... ... @@ -163,6 +163,11 @@
    163 163 
       numberValue:{tableEditBean.getBeatDiameter()};
    164 164 
     }
    165 165
    166 
    +#countDepredated {
    167 
    +  property:{CatchLonglineLogbookDto.PROPERTY_COUNT_DEPREDATED};
    168 
    +  numberValue:{tableEditBean.getCountDepredated()};
    169 
    +}
    170 
    +
    166 171 
     #depredated {
    167 172 
       horizontalTextPosition:{JCheckBox.LEFT};
    168 173 
       _tablePropertyName:{CatchLonglineLogbookDto.PROPERTY_DEPREDATED};

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
    ... ... @@ -37,6 +37,7 @@ import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSuppo
    37 37 
     import fr.ird.observe.dto.data.longline.ActivityLonglineLogbookDto;
    38 38 
     import fr.ird.observe.dto.data.longline.CatchLonglineLogbookDto;
    39 39 
     import fr.ird.observe.dto.data.longline.SetLonglineLogbookCatchDto;
    40 
    +import fr.ird.observe.dto.data.longline.SetLonglineLogbookCatchHelper;
    40 41 
     import fr.ird.observe.dto.data.longline.TripLonglineReference;
    41 42 
     import fr.ird.observe.dto.form.Form;
    42 43 
     import fr.ird.observe.dto.navigation.edit.node.ObserveLonglineLogbookSetEditNode;
    ... ... @@ -48,8 +49,8 @@ import fr.ird.observe.dto.referential.longline.CatchFateLonglineReference;
    48 49 
     import fr.ird.observe.dto.referential.longline.HealthnessReference;
    49 50 
     import fr.ird.observe.dto.result.SaveResultDto;
    50 51 
     import org.apache.commons.lang3.BooleanUtils;
    51 
    -import org.apache.logging.log4j.Logger;
    52 52 
     import org.apache.logging.log4j.LogManager;
    53 
    +import org.apache.logging.log4j.Logger;
    53 54 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    54 55 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
    55 56 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
    ... ... @@ -381,6 +382,8 @@ public class CatchLonglineLogbookUIHandler extends ContentTableUIHandler<SetLong
    381 382 
             loadReferentialReferenceSetsInModel(form);
    382 383
    383 384 
             model.setForm(form);
    385 
    +
    386 
    +        SetLonglineLogbookCatchHelper.copySetLonglineLogbookCatchDto(form.getObject(), getBean());
    384 387 
         }
    385 388
    386 389 
         @Override
    ... ... @@ -441,14 +444,20 @@ public class CatchLonglineLogbookUIHandler extends ContentTableUIHandler<SetLong
    441 444 
                 // depredated
    442 445 
                 ui.getBeatDiameter().setEnabled(true);
    443 446 
                 ui.getPredator().setEnabled(true);
    447 
    +            ui.getCountDepredated().setEnabled(true);
    448 
    +            ui.getDepredatedProportion().setEnabled(true);
    444 449
    445 450 
             } else {
    446 451
    447 452 
                 // not depredated
    448 453 
                 ui.getBeatDiameter().setEnabled(false);
    449 454 
                 ui.getPredator().setEnabled(false);
    455 
    +            ui.getCountDepredated().setEnabled(false);
    456 
    +            ui.getDepredatedProportion().setEnabled(false);
    450 457 
                 tableEditBean.setBeatDiameter(null);
    451 458 
                 tableEditBean.setPredator(null);
    459 
    +            tableEditBean.setDepredatedProportion(null);
    460 
    +            tableEditBean.setCountDepredated(null);
    452 461
    453 462 
             }
    454 463

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LonglineGlobalCompositionLogbookUI.jaxx
    ... ... @@ -66,6 +66,8 @@
    66 66 
                      errorTableModel='{getErrorTableModel()}' context='update-globalComposition'>
    67 67 
       </BeanValidator>
    68 68
    69 
    +  <Boolean id="delegateContentUI" initializer="true"/>
    70 
    +
    69 71 
       <!-- formulaire -->
    70 72 
       <JPanel id="body" layout='{new BorderLayout()}'>
    71 73

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LonglineGlobalCompositionLogbookUIHandler.java
    ... ... @@ -38,11 +38,12 @@ import fr.ird.observe.dto.navigation.edit.node.ObserveLonglineLogbookSetEditNode
    38 38 
     import fr.ird.observe.dto.navigation.select.node.ObserveLonglineLogbookSetSelectNode;
    39 39 
     import fr.ird.observe.dto.result.SaveResultDto;
    40 40 
     import fr.ird.observe.spi.DtoModelHelper;
    41 
    -import org.apache.logging.log4j.Logger;
    42 41 
     import org.apache.logging.log4j.LogManager;
    42 
    +import org.apache.logging.log4j.Logger;
    43 43 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    44 44 
     import org.nuiton.validator.NuitonValidatorScope;
    45 45
    46 
    +import javax.swing.SwingUtilities;
    46 47 
     import java.util.Optional;
    47 48
    48 49 
     import static org.nuiton.i18n.I18n.t;
    ... ... @@ -90,6 +91,7 @@ public class LonglineGlobalCompositionLogbookUIHandler extends ContentUIHandler<
    90 91 
                 FloatlinesCompositionLogbookUI compositionUI = ui.getFloatlinesCompositionUI();
    91 92 
                 ui.getFloatlinesCompositionPanel().remove(compositionUI);
    92 93 
                 ui.getFloatlinesCompositionPanel().add(compositionUI.getBody());
    94 
    +            ui.getFloatlinesCompositionPanel().putClientProperty("contentUI", compositionUI);
    93 95 
             }
    94 96
    95 97 
             {
    ... ... @@ -97,6 +99,7 @@ public class LonglineGlobalCompositionLogbookUIHandler extends ContentUIHandler<
    97 99 
                 BranchlinesCompositionLogbookUI compositionUI = ui.getBranchlinesCompositionUI();
    98 100 
                 ui.getBranchlinesCompositionPanel().remove(compositionUI);
    99 101 
                 ui.getBranchlinesCompositionPanel().add(compositionUI.getBody());
    102 
    +            ui.getBranchlinesCompositionPanel().putClientProperty("contentUI", compositionUI);
    100 103 
             }
    101 104
    102 105 
             {
    ... ... @@ -104,6 +107,7 @@ public class LonglineGlobalCompositionLogbookUIHandler extends ContentUIHandler<
    104 107 
                 HooksCompositionLogbookUI compositionUI = ui.getHooksCompositionUI();
    105 108 
                 ui.getHooksCompositionPanel().remove(compositionUI);
    106 109 
                 ui.getHooksCompositionPanel().add(compositionUI.getBody());
    110 
    +            ui.getHooksCompositionPanel().putClientProperty("contentUI", compositionUI);
    107 111 
             }
    108 112
    109 113 
             {
    ... ... @@ -111,6 +115,7 @@ public class LonglineGlobalCompositionLogbookUIHandler extends ContentUIHandler<
    111 115 
                 BaitsCompositionLogbookUI compositionUI = ui.getBaitsCompositionUI();
    112 116 
                 ui.getBaitsCompositionPanel().remove(compositionUI);
    113 117 
                 ui.getBaitsCompositionPanel().add(compositionUI.getBody());
    118 
    +            ui.getBaitsCompositionPanel().putClientProperty("contentUI", compositionUI);
    114 119 
             }
    115 120 
         }
    116 121
    ... ... @@ -204,7 +209,7 @@ public class LonglineGlobalCompositionLogbookUIHandler extends ContentUIHandler<
    204 209 
                 compositionUI.open();
    205 210
    206 211 
             }
    207 
    -
    212 
    +        SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0));
    208 213 
         }
    209 214
    210 215 
         @Override

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jaxx
    ... ... @@ -196,7 +196,7 @@
    196 196 
                         <JLabel id='totalLineLengthLabel'/>
    197 197 
                       </cell>
    198 198 
                       <cell fill='both' weightx="1" columns="3">
    199 
    -                    <NumberEditor id='totalLineLength' constructorParams='this' styleClass="long10"/>
    199 
    +                    <NumberEditor id='totalLineLength' constructorParams='this' styleClass="int6"/>
    200 200 
                       </cell>
    201 201 
                     </row>
    202 202 
                     <!-- basket line length -->
    ... ... @@ -205,7 +205,7 @@
    205 205 
                         <JLabel id='basketLineLengthLabel'/>
    206 206 
                       </cell>
    207 207 
                       <cell fill='both' weightx="1" columns="3">
    208 
    -                    <NumberEditor id='basketLineLength' constructorParams='this' styleClass="long10"/>
    208 
    +                    <NumberEditor id='basketLineLength' constructorParams='this' styleClass="int6"/>
    209 209 
                       </cell>
    210 210 
                     </row>
    211 211 
                     <!-- lengthBetweenBranchlines -->
    ... ... @@ -214,7 +214,7 @@
    214 214 
                         <JLabel id='lengthBetweenBranchlinesLabel'/>
    215 215 
                       </cell>
    216 216 
                       <cell fill='both' weightx="1" columns="3">
    217 
    -                    <NumberEditor id='lengthBetweenBranchlines' constructorParams='this' styleClass="long10"/>
    217 
    +                    <NumberEditor id='lengthBetweenBranchlines' constructorParams='this' styleClass="int6"/>
    218 218 
                       </cell>
    219 219 
                     </row>
    220 220
    ... ... @@ -326,7 +326,7 @@
    326 326 
                   </Table>
    327 327 
                 </tab>
    328 328
    329 
    -            <tab id='lightstickssTab' computeI18n="">
    329 
    +            <tab id='lightsticksTab' computeI18n="">
    330 330 
                   <JPanel layout='{new BorderLayout()}'>
    331 331 
                     <Table fill='both' constraints='BorderLayout.NORTH'>
    332 332 
                       <!-- lightsticksUsed -->

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss
    ... ... @@ -50,6 +50,11 @@
    50 50 
       numberValue:{bean.getNumber()};
    51 51 
     }
    52 52
    53 
    +#settingShape {
    54 
    +  property:{SetLonglineLogbookDto.PROPERTY_SETTING_SHAPE};
    55 
    +  selectedItem:{bean.getSettingShape()};
    56 
    +}
    57 
    +
    53 58 
     #settingStartTimeStamp {
    54 59 
       date:{bean.getSettingStartTimeStamp()};
    55 60 
       propertyDate: {SetLonglineLogbookDto.PROPERTY_SETTING_START_TIME_STAMP};
    ... ... @@ -91,6 +96,26 @@
    91 96 
       numberValue:{bean.getSettingVesselSpeed()};
    92 97 
     }
    93 98
    99 
    +#timeBetweenHooks {
    100 
    +  property:{SetLonglineLogbookDto.PROPERTY_TIME_BETWEEN_HOOKS};
    101 
    +  numberValue:{bean.getTimeBetweenHooks()};
    102 
    +}
    103 
    +
    104 
    +#totalLineLength {
    105 
    +  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_LINE_LENGTH};
    106 
    +  numberValue:{bean.getTotalLineLength()};
    107 
    +}
    108 
    +
    109 
    +#basketLineLength {
    110 
    +  property:{SetLonglineLogbookDto.PROPERTY_BASKET_LINE_LENGTH};
    111 
    +  numberValue:{bean.getBasketLineLength()};
    112 
    +}
    113 
    +
    114 
    +#lengthBetweenBranchlines {
    115 
    +  property:{SetLonglineLogbookDto.PROPERTY_LENGTH_BETWEEN_BRANCHLINES};
    116 
    +  numberValue:{bean.getLengthBetweenBranchlines()};
    117 
    +}
    118 
    +
    94 119 
     #shooterUsed {
    95 120 
       horizontalTextPosition:{JCheckBox.LEFT};
    96 121 
       _propertyName:{SetLonglineLogbookDto.PROPERTY_SHOOTER_USED};
    ... ... @@ -103,9 +128,39 @@
    103 128 
       numberValue:{bean.getShooterSpeed()};
    104 129 
     }
    105 130
    106 
    -#settingShape {
    107 
    -  property:{SetLonglineLogbookDto.PROPERTY_SETTING_SHAPE};
    108 
    -  selectedItem:{bean.getSettingShape()};
    131 
    +#maxDepthTargeted {
    132 
    +  property:{SetLonglineLogbookDto.PROPERTY_MAX_DEPTH_TARGETED};
    133 
    +  numberValue:{bean.getMaxDepthTargeted()};
    134 
    +}
    135 
    +
    136 
    +#totalSectionsCount {
    137 
    +  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_SECTIONS_COUNT};
    138 
    +  numberValue:{bean.getTotalSectionsCount()};
    139 
    +}
    140 
    +
    141 
    +#basketsPerSectionCount {
    142 
    +  property:{SetLonglineLogbookDto.PROPERTY_BASKETS_PER_SECTION_COUNT};
    143 
    +  numberValue:{bean.getBasketsPerSectionCount()};
    144 
    +}
    145 
    +
    146 
    +#totalBasketsCount {
    147 
    +  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_BASKETS_COUNT};
    148 
    +  numberValue:{bean.getTotalBasketsCount()};
    149 
    +}
    150 
    +
    151 
    +#branchlinesPerBasketCount {
    152 
    +  property:{SetLonglineLogbookDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT};
    153 
    +  numberValue:{bean.getBranchlinesPerBasketCount()};
    154 
    +}
    155 
    +
    156 
    +#totalHooksCount {
    157 
    +  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_HOOKS_COUNT};
    158 
    +  numberValue:{bean.getTotalHooksCount()};
    159 
    +}
    160 
    +
    161 
    +#lineType {
    162 
    +  property:{SetLonglineLogbookDto.PROPERTY_LINE_TYPE};
    163 
    +  selectedItem:{bean.getLineType()};
    109 164 
     }
    110 165
    111 166 
     #weightedSwivel {
    ... ... @@ -132,37 +187,24 @@
    132 187 
       numberValue:{bean.getSnapWeight()};
    133 188 
     }
    134 189
    135 
    -#lineType {
    136 
    -  property:{SetLonglineLogbookDto.PROPERTY_LINE_TYPE};
    137 
    -  selectedItem:{bean.getLineType()};
    138 
    -}
    139 
    -
    140 
    -#maxDepthTargeted {
    141 
    -  property:{SetLonglineLogbookDto.PROPERTY_MAX_DEPTH_TARGETED};
    142 
    -  numberValue:{bean.getMaxDepthTargeted()};
    143 
    -}
    144 
    -
    145 190 
     #monitored {
    146 191 
       horizontalTextPosition:{JCheckBox.LEFT};
    147 192 
       _propertyName:{SetLonglineLogbookDto.PROPERTY_MONITORED};
    148 193 
       selected:{BooleanUtils.isTrue(bean.getMonitored())};
    149 194 
     }
    150 195
    151 
    -#lightsticksType {
    152 
    -  property:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_TYPE};
    153 
    -  selectedItem:{bean.getLightsticksType()};
    154 
    -  enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0};
    155 
    -}
    196 
    +/* ***************************************************************************** */
    197 
    +/*  LIGHTSTICKS TAB ************************************************************ */
    198 
    +/* ***************************************************************************** */
    156 199
    157 
    -#lightsticksColor {
    158 
    -  property:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_COLOR};
    159 
    -  selectedItem:{bean.getLightsticksColor()};
    160 
    -  enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0};
    200 
    +#lightsticksTab {
    201 
    +  icon:{handler.getErrorIconIfFalse(model.isLightsticksTabValid())};
    161 202 
     }
    162 203
    163 
    -#timeBetweenHooks {
    164 
    -  property:{SetLonglineLogbookDto.PROPERTY_TIME_BETWEEN_HOOKS};
    165 
    -  numberValue:{bean.getTimeBetweenHooks()};
    204 
    +#lightsticksUsed {
    205 
    +  horizontalTextPosition:{JCheckBox.LEFT};
    206 
    +  _propertyName:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_USED};
    207 
    +  selected:{BooleanUtils.isTrue(bean.getLightsticksUsed())};
    166 208 
     }
    167 209
    168 210 
     #lightsticksPerBasketCount {
    ... ... @@ -170,29 +212,14 @@
    170 212 
       numberValue:{bean.getLightsticksPerBasketCount()};
    171 213 
     }
    172 214
    173 
    -#basketsPerSectionCount {
    174 
    -  property:{SetLonglineLogbookDto.PROPERTY_BASKETS_PER_SECTION_COUNT};
    175 
    -  numberValue:{bean.getBasketsPerSectionCount()};
    176 
    -}
    177 
    -
    178 
    -#totalBasketsCount {
    179 
    -  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_BASKETS_COUNT};
    180 
    -  numberValue:{bean.getTotalBasketsCount()};
    181 
    -}
    182 
    -
    183 
    -#branchlinesPerBasketCount {
    184 
    -  property:{SetLonglineLogbookDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT};
    185 
    -  numberValue:{bean.getBranchlinesPerBasketCount()};
    186 
    -}
    187 
    -
    188 
    -#totalSectionsCount {
    189 
    -  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_SECTIONS_COUNT};
    190 
    -  numberValue:{bean.getTotalSectionsCount()};
    215 
    +#lightsticksType {
    216 
    +  property:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_TYPE};
    217 
    +  selectedItem:{bean.getLightsticksType()};
    191 218 
     }
    192 219
    193 
    -#totalHooksCount {
    194 
    -  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_HOOKS_COUNT};
    195 
    -  numberValue:{bean.getTotalHooksCount()};
    220 
    +#lightsticksColor {
    221 
    +  property:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_COLOR};
    222 
    +  selectedItem:{bean.getLightsticksColor()};
    196 223 
     }
    197 224
    198 225 
     /* ***************************************************************************** */

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java
    ... ... @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -39,8 +39,9 @@ import fr.ird.observe.dto.navigation.edit.node.ObserveLonglineLogbookSetEditNode
    39 39 
     import fr.ird.observe.dto.navigation.select.node.ObserveLonglineLogbookSetSelectNode;
    40 40 
     import fr.ird.observe.dto.result.SaveResultDto;
    41 41 
     import fr.ird.observe.spi.DtoModelHelper;
    42 
    -import org.apache.logging.log4j.Logger;
    42 
    +import org.apache.commons.lang3.BooleanUtils;
    43 43 
     import org.apache.logging.log4j.LogManager;
    44 
    +import org.apache.logging.log4j.Logger;
    44 45 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    45 46 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
    46 47 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
    ... ... @@ -69,6 +70,7 @@ public class SetLonglineLogbookUIHandler extends ContentUIHandler<SetLonglineLog
    69 70 
         protected final TableModelListener computeTabValidStateListener;
    70 71 
         private final PropertyChangeListener onToogleTimeEditorSliderChangedListener;
    71 72 
         private final PropertyChangeListener onCoordinateFormatChangedListener;
    73 
    +    private final PropertyChangeListener lightsticksUsedChanged;
    72 74 
         private boolean toggleTimeEditorSliderIsChanging;
    73 75 
         private boolean coordinateFormatChangedIsChanging;
    74 76
    ... ... @@ -86,6 +88,8 @@ public class SetLonglineLogbookUIHandler extends ContentUIHandler<SetLonglineLog
    86 88 
                 CoordinateFormat newValue = (CoordinateFormat) evt.getNewValue();
    87 89 
                 onCoordinateFormatChanged(newValue);
    88 90 
             };
    91 
    +
    92 
    +        lightsticksUsedChanged = evt -> onLightsticksUsedChanged((Boolean) evt.getNewValue());
    89 93 
         }
    90 94
    91 95 
         @Override
    ... ... @@ -244,6 +248,8 @@ public class SetLonglineLogbookUIHandler extends ContentUIHandler<SetLonglineLog
    244 248 
         @Override
    245 249 
         public void startEditUI(String... binding) {
    246 250
    251 
    +        getBean().removePropertyChangeListener(SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_USED, lightsticksUsedChanged);
    252 
    +
    247 253 
             ContentUIModel<SetLonglineLogbookDto> model = getModel();
    248 254 
             boolean create = model.getMode() == ContentMode.CREATE;
    249 255 
             String contextName = getValidatorContextName(model.getMode());
    ... ... @@ -303,6 +309,8 @@ public class SetLonglineLogbookUIHandler extends ContentUIHandler<SetLonglineLog
    303 309
    304 310 
                               SetLonglineLogbookUI.BINDING_HAULING_BREAKS_NUMBER_VALUE);
    305 311
    312 
    +        getBean().addPropertyChangeListener(SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_USED, lightsticksUsedChanged);
    313 
    +        onLightsticksUsedChanged(getBean().getLightsticksUsed());
    306 314 
             model.setModified(create);
    307 315
    308 316 
         }
    ... ... @@ -379,7 +387,6 @@ public class SetLonglineLogbookUIHandler extends ContentUIHandler<SetLonglineLog
    379 387
    380 388 
         }
    381 389
    382 
    -
    383 390 
         protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) {
    384 391
    385 392 
             Set<String> errorProperties = new HashSet<>();
    ... ... @@ -395,11 +402,13 @@ public class SetLonglineLogbookUIHandler extends ContentUIHandler<SetLonglineLog
    395 402 
             boolean settingTabValid = !errorProperties.removeAll(SetLonglineLogbookUIModel.SETTING_TAB_PROPERTIES);
    396 403 
             boolean settingCaracteristicsTabValid = !errorProperties.removeAll(SetLonglineLogbookUIModel.SETTING_CARACTERISTICS_TAB_PROPERTIES);
    397 404 
             boolean haulingTabValid = !errorProperties.removeAll(SetLonglineLogbookUIModel.HAULING_TAB_PROPERTIES);
    405 
    +        boolean lightsticksTabValid = !errorProperties.removeAll(SetLonglineLogbookUIModel.LIGHTSTICKS_TAB_PROPERTIES);
    398 406
    399 407 
             SetLonglineLogbookUIModel model = (SetLonglineLogbookUIModel) getModel();
    400 408 
             model.setSettingTabValid(settingTabValid);
    401 409 
             model.setSettingCaracteristicsTabValid(settingCaracteristicsTabValid);
    402 410 
             model.setHaulingTabValid(haulingTabValid);
    411 
    +        model.setLightsticksTabValid(lightsticksTabValid);
    403 412 
         }
    404 413
    405 414 
         private void onToogleTimeEditorSliderChanged(boolean newValue) {
    ... ... @@ -435,4 +444,31 @@ public class SetLonglineLogbookUIHandler extends ContentUIHandler<SetLonglineLog
    435 444 
             }
    436 445 
         }
    437 446
    447 
    +    private void onLightsticksUsedChanged(Boolean newValue) {
    448 
    +
    449 
    +        SetLonglineLogbookUI ui = getUi();
    450 
    +
    451 
    +        SetLonglineLogbookDto tableEditBean = getBean();
    452 
    +        if (BooleanUtils.isTrue(newValue)) {
    453 
    +
    454 
    +            // depredated
    455 
    +            ui.getLightsticksPerBasketCount().setEnabled(true);
    456 
    +            ui.getLightsticksType().setEnabled(true);
    457 
    +            ui.getLightsticksColor().setEnabled(true);
    458 
    +
    459 
    +        } else {
    460 
    +
    461 
    +            // not depredated
    462 
    +            ui.getLightsticksPerBasketCount().setEnabled(false);
    463 
    +            ui.getLightsticksType().setEnabled(false);
    464 
    +            ui.getLightsticksColor().setEnabled(false);
    465 
    +
    466 
    +            tableEditBean.setLightsticksPerBasketCount(null);
    467 
    +            tableEditBean.setLightsticksType(null);
    468 
    +            tableEditBean.setLightsticksColor(null);
    469 
    +
    470 
    +        }
    471 
    +
    472 
    +    }
    473 
    +
    438 474 
     }

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIModel.java
    ... ... @@ -42,10 +42,13 @@ public class SetLonglineLogbookUIModel extends ContentUIModel<SetLonglineLogbook
    42 42
    43 43 
         public static final String PROPERTY_HAULING_TAB_VALID = "haulingTabValid";
    44 44
    45 
    +    public static final String PROPERTY_LIGHTSTICKS_TAB_VALID = "lightsticksTabValid";
    46 
    +
    45 47 
         public static final Set<String> SETTING_TAB_PROPERTIES =
    46 48 
                 ImmutableSet.<String>builder().add(
    47 49 
                         SetLonglineLogbookDto.PROPERTY_HOME_ID,
    48 50 
                         SetLonglineLogbookDto.PROPERTY_NUMBER,
    51 
    +                    SetLonglineLogbookDto.PROPERTY_SETTING_SHAPE,
    49 52 
                         SetLonglineLogbookDto.PROPERTY_SETTING_START_TIME_STAMP,
    50 53 
                         SetLonglineLogbookDto.PROPERTY_SETTING_START_LATITUDE,
    51 54 
                         SetLonglineLogbookDto.PROPERTY_SETTING_START_LONGITUDE,
    ... ... @@ -58,28 +61,35 @@ public class SetLonglineLogbookUIModel extends ContentUIModel<SetLonglineLogbook
    58 61
    59 62 
         public static final Set<String> SETTING_CARACTERISTICS_TAB_PROPERTIES =
    60 63 
                 ImmutableSet.<String>builder().add(
    61 
    -                    SetLonglineLogbookDto.PROPERTY_SETTING_SHAPE,
    62 
    -                    SetLonglineLogbookDto.PROPERTY_LINE_TYPE,
    63 
    -                    SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_TYPE,
    64 
    -                    SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_COLOR,
    64 
    +
    65 65 
                         SetLonglineLogbookDto.PROPERTY_SETTING_VESSEL_SPEED,
    66 
    -                    SetLonglineLogbookDto.PROPERTY_MAX_DEPTH_TARGETED,
    66 
    +                    SetLonglineLogbookDto.PROPERTY_TIME_BETWEEN_HOOKS,
    67 
    +                    SetLonglineLogbookDto.PROPERTY_TOTAL_LINE_LENGTH,
    68 
    +                    SetLonglineLogbookDto.PROPERTY_BASKET_LINE_LENGTH,
    69 
    +                    SetLonglineLogbookDto.PROPERTY_LENGTH_BETWEEN_BRANCHLINES,
    67 70 
                         SetLonglineLogbookDto.PROPERTY_SHOOTER_USED,
    68 71 
                         SetLonglineLogbookDto.PROPERTY_SHOOTER_SPEED,
    72 
    +                    SetLonglineLogbookDto.PROPERTY_MAX_DEPTH_TARGETED,
    73 
    +                    SetLonglineLogbookDto.PROPERTY_TOTAL_SECTIONS_COUNT,
    74 
    +                    SetLonglineLogbookDto.PROPERTY_BASKETS_PER_SECTION_COUNT,
    75 
    +                    SetLonglineLogbookDto.PROPERTY_TOTAL_BASKETS_COUNT,
    76 
    +                    SetLonglineLogbookDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT,
    77 
    +                    SetLonglineLogbookDto.PROPERTY_TOTAL_HOOKS_COUNT,
    78 
    +                    SetLonglineLogbookDto.PROPERTY_LINE_TYPE,
    69 79 
                         SetLonglineLogbookDto.PROPERTY_WEIGHTED_SWIVEL,
    70 80 
                         SetLonglineLogbookDto.PROPERTY_SWIVEL_WEIGHT,
    71 81 
                         SetLonglineLogbookDto.PROPERTY_WEIGHTED_SNAP,
    72 82 
                         SetLonglineLogbookDto.PROPERTY_SNAP_WEIGHT,
    73 
    -                    SetLonglineLogbookDto.PROPERTY_MONITORED,
    74 
    -                    SetLonglineLogbookDto.PROPERTY_TIME_BETWEEN_HOOKS,
    75 
    -                    SetLonglineLogbookDto.PROPERTY_BASKETS_PER_SECTION_COUNT,
    76 
    -                    SetLonglineLogbookDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT,
    77 
    -                    SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT,
    78 
    -                    SetLonglineLogbookDto.PROPERTY_TOTAL_SECTIONS_COUNT,
    79 
    -                    SetLonglineLogbookDto.PROPERTY_TOTAL_BASKETS_COUNT,
    80 
    -                    SetLonglineLogbookDto.PROPERTY_TOTAL_HOOKS_COUNT
    83 
    +                    SetLonglineLogbookDto.PROPERTY_MONITORED
    81 84 
                 ).build();
    82 85
    86 
    +    public static final Set<String> LIGHTSTICKS_TAB_PROPERTIES =
    87 
    +            ImmutableSet.<String>builder().add(
    88 
    +                    SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_USED,
    89 
    +                    SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT,
    90 
    +                    SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_TYPE,
    91 
    +                    SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_COLOR
    92 
    +            ).build();
    83 93 
         public static final Set<String> HAULING_TAB_PROPERTIES =
    84 94 
                 ImmutableSet.<String>builder().add(
    85 95 
                         SetLonglineLogbookDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING,
    ... ... @@ -99,6 +109,7 @@ public class SetLonglineLogbookUIModel extends ContentUIModel<SetLonglineLogbook
    99 109 
         protected boolean settingCaracteristicsTabValid;
    100 110
    101 111 
         protected boolean haulingTabValid;
    112 
    +    protected boolean lightsticksTabValid;
    102 113
    103 114 
         public SetLonglineLogbookUIModel() {
    104 115 
             super(SetLonglineLogbookDto.class);
    ... ... @@ -131,4 +142,12 @@ public class SetLonglineLogbookUIModel extends ContentUIModel<SetLonglineLogbook
    131 142 
             firePropertyChange(PROPERTY_SETTING_TAB_VALID, null, settingTabValid);
    132 143 
         }
    133 144
    145 
    +    public boolean isLightsticksTabValid() {
    146 
    +        return lightsticksTabValid;
    147 
    +    }
    148 
    +
    149 
    +    public void setLightsticksTabValid(boolean lightsticksTabValid) {
    150 
    +        this.lightsticksTabValid = lightsticksTabValid;
    151 
    +        firePropertyChange(PROPERTY_LIGHTSTICKS_TAB_VALID, null, lightsticksTabValid);
    152 
    +    }
    134 153 
     }

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/LonglineGlobalCompositionObsUI.jaxx
    ... ... @@ -66,6 +66,8 @@
    66 66 
                      errorTableModel='{getErrorTableModel()}' context='update-globalComposition'>
    67 67 
       </BeanValidator>
    68 68
    69 
    +  <Boolean id="delegateContentUI" initializer="true"/>
    70 
    +
    69 71 
       <!-- formulaire -->
    70 72 
       <JPanel id="body" layout='{new BorderLayout()}'>
    71 73

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/LonglineGlobalCompositionObsUIHandler.java
    ... ... @@ -38,8 +38,8 @@ import fr.ird.observe.dto.navigation.edit.node.ObserveLonglineObsSetEditNode;
    38 38 
     import fr.ird.observe.dto.navigation.select.node.ObserveLonglineObsSetSelectNode;
    39 39 
     import fr.ird.observe.dto.result.SaveResultDto;
    40 40 
     import fr.ird.observe.spi.DtoModelHelper;
    41 
    -import org.apache.logging.log4j.Logger;
    42 41 
     import org.apache.logging.log4j.LogManager;
    42 
    +import org.apache.logging.log4j.Logger;
    43 43 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    44 44 
     import org.nuiton.validator.NuitonValidatorScope;
    45 45
    ... ... @@ -88,6 +88,7 @@ public class LonglineGlobalCompositionObsUIHandler extends ContentUIHandler<SetL
    88 88 
                 FloatlinesCompositionObsUI compositionUI = ui.getFloatlinesCompositionUI();
    89 89 
                 ui.getFloatlinesCompositionPanel().remove(compositionUI);
    90 90 
                 ui.getFloatlinesCompositionPanel().add(compositionUI.getBody());
    91 
    +            ui.getFloatlinesCompositionPanel().putClientProperty("contentUI", compositionUI);
    91 92 
             }
    92 93
    93 94 
             {
    ... ... @@ -95,6 +96,7 @@ public class LonglineGlobalCompositionObsUIHandler extends ContentUIHandler<SetL
    95 96 
                 BranchlinesCompositionObsUI compositionUI = ui.getBranchlinesCompositionUI();
    96 97 
                 ui.getBranchlinesCompositionPanel().remove(compositionUI);
    97 98 
                 ui.getBranchlinesCompositionPanel().add(compositionUI.getBody());
    99 
    +            ui.getBranchlinesCompositionPanel().putClientProperty("contentUI", compositionUI);
    98 100 
             }
    99 101
    100 102 
             {
    ... ... @@ -102,6 +104,7 @@ public class LonglineGlobalCompositionObsUIHandler extends ContentUIHandler<SetL
    102 104 
                 HooksCompositionObsUI compositionUI = ui.getHooksCompositionUI();
    103 105 
                 ui.getHooksCompositionPanel().remove(compositionUI);
    104 106 
                 ui.getHooksCompositionPanel().add(compositionUI.getBody());
    107 
    +            ui.getHooksCompositionPanel().putClientProperty("contentUI", compositionUI);
    105 108 
             }
    106 109
    107 110 
             {
    ... ... @@ -109,6 +112,7 @@ public class LonglineGlobalCompositionObsUIHandler extends ContentUIHandler<SetL
    109 112 
                 BaitsCompositionObsUI compositionUI = ui.getBaitsCompositionUI();
    110 113 
                 ui.getBaitsCompositionPanel().remove(compositionUI);
    111 114 
                 ui.getBaitsCompositionPanel().add(compositionUI.getBody());
    115 
    +            ui.getBaitsCompositionPanel().putClientProperty("contentUI", compositionUI);
    112 116 
             }
    113 117 
         }
    114 118

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -1100,8 +1100,8 @@ observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Reset home id
    1100 1100 
     observe.common.SetLonglineLogbookDto.basketLineLength=Bakset line length (m)
    1101 1101 
     observe.common.SetLonglineLogbookDto.haulingTab=Hauling
    1102 1102 
     observe.common.SetLonglineLogbookDto.lengthBetweenBranchlines=Length between branchlines (m)
    1103 
    +observe.common.SetLonglineLogbookDto.lightsticksTab=Lightsticks
    1103 1104 
     observe.common.SetLonglineLogbookDto.lightsticksUsed=Lightsticks used
    1104 
    -observe.common.SetLonglineLogbookDto.lightstickssTab=Lightsticks
    1105 1105 
     observe.common.SetLonglineLogbookDto.message.creating=Creating fishing operation
    1106 1106 
     observe.common.SetLonglineLogbookDto.message.updating=Updating fishing operation
    1107 1107 
     observe.common.SetLonglineLogbookDto.monitored=Monitored

  • client/src/main/resources/i18n/client_es_ES.properties
    ... ... @@ -1100,8 +1100,8 @@ observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Reiniciar el id de
    1100 1100 
     observe.common.SetLonglineLogbookDto.basketLineLength=Bakset line length (m) \#TODO
    1101 1101 
     observe.common.SetLonglineLogbookDto.haulingTab=Arrastre
    1102 1102 
     observe.common.SetLonglineLogbookDto.lengthBetweenBranchlines=Length between branchlines (m) \#TODO
    1103 
    +observe.common.SetLonglineLogbookDto.lightsticksTab=Lightsticks \#TODO
    1103 1104 
     observe.common.SetLonglineLogbookDto.lightsticksUsed=Lightsticks used \#TODO
    1104 
    -observe.common.SetLonglineLogbookDto.lightstickssTab=Lightsticks \#TODO
    1105 1105 
     observe.common.SetLonglineLogbookDto.message.creating=Lance en proceso de creación.
    1106 1106 
     observe.common.SetLonglineLogbookDto.message.updating=La operación de pesca está en proceso de modificación.
    1107 1107 
     observe.common.SetLonglineLogbookDto.monitored=Instrumentada

  • client/src/main/resources/i18n/client_fr_FR.properties
    ... ... @@ -1100,14 +1100,14 @@ observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Réinitialiser l'id
    1100 1100 
     observe.common.SetLonglineLogbookDto.basketLineLength=Longueur de la ligne par panier (m)
    1101 1101 
     observe.common.SetLonglineLogbookDto.haulingTab=Virage
    1102 1102 
     observe.common.SetLonglineLogbookDto.lengthBetweenBranchlines=Distance entre avançons (m)
    1103 
    -observe.common.SetLonglineLogbookDto.lightsticksUsed=Lightsticks used
    1104 
    -observe.common.SetLonglineLogbookDto.lightstickssTab=Lightsticks
    1103 
    +observe.common.SetLonglineLogbookDto.lightsticksTab=Cyalumnes
    1104 
    +observe.common.SetLonglineLogbookDto.lightsticksUsed=Utilisation des cyalumnes
    1105 1105 
     observe.common.SetLonglineLogbookDto.message.creating=L'opération de pêche est en cours de création.
    1106 1106 
     observe.common.SetLonglineLogbookDto.message.updating=L'opération de pêche est en cours de modification.
    1107 1107 
     observe.common.SetLonglineLogbookDto.monitored=Instrumentée
    1108 1108 
     observe.common.SetLonglineLogbookDto.settingCaracteristicsTab=Caractéristiques
    1109 1109 
     observe.common.SetLonglineLogbookDto.settingTab=Filage
    1110 
    -observe.common.SetLonglineLogbookDto.shooterUsed=Shooter used
    1110 
    +observe.common.SetLonglineLogbookDto.shooterUsed=Utilisation du shooter
    1111 1111 
     observe.common.SetLonglineLogbookDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1112 1112 
     observe.common.SetLonglineLogbookDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ?
    1113 1113 
     observe.common.SetLonglineLogbookDto.totalLineLength=Longueur totale de la ligne (m)

  • persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookEntityDtoBinder.java
    ... ... @@ -45,27 +45,39 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
    45 45 
             entity.setComment(dto.getComment());
    46 46 
             entity.setHomeId(dto.getHomeId());
    47 47 
             entity.setNumber(dto.getNumber());
    48 
    -        entity.setBasketsPerSectionCount(dto.getBasketsPerSectionCount());
    49 
    -        entity.setBranchlinesPerBasketCount(dto.getBranchlinesPerBasketCount());
    50 
    -        entity.setTotalSectionsCount(dto.getTotalSectionsCount());
    51 
    -        entity.setTotalBasketsCount(dto.getTotalBasketsCount());
    52 
    -        entity.setTotalHooksCount(dto.getTotalHooksCount());
    53 
    -        entity.setWeightedSnap(dto.getWeightedSnap());
    54 
    -        entity.setSnapWeight(dto.getSnapWeight());
    55 
    -        entity.setWeightedSwivel(dto.getWeightedSwivel());
    56 
    -        entity.setSwivelWeight(dto.getSwivelWeight());
    57 
    -        entity.setLightsticksPerBasketCount(dto.getLightsticksPerBasketCount());
    58 
    -        entity.setTimeBetweenHooks(dto.getTimeBetweenHooks());
    59 
    -        entity.setShooterUsed(dto.getShooterUsed());
    60 
    -        entity.setShooterSpeed(dto.getShooterSpeed());
    61 
    -        entity.setMaxDepthTargeted(dto.getMaxDepthTargeted());
    48 
    +        entity.setSettingShape(toEntity(dto.getSettingShape()));
    62 49 
             entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp());
    63 50 
             entity.setSettingStartLatitude(dto.getSettingStartLatitude());
    64 51 
             entity.setSettingStartLongitude(dto.getSettingStartLongitude());
    65 52 
             entity.setSettingEndTimeStamp(dto.getSettingEndTimeStamp());
    66 53 
             entity.setSettingEndLatitude(dto.getSettingEndLatitude());
    67 54 
             entity.setSettingEndLongitude(dto.getSettingEndLongitude());
    55 
    +
    68 56 
             entity.setSettingVesselSpeed(dto.getSettingVesselSpeed());
    57 
    +        entity.setTimeBetweenHooks(dto.getTimeBetweenHooks());
    58 
    +        entity.setTotalLineLength(dto.getTotalLineLength());
    59 
    +        entity.setBasketLineLength(dto.getBasketLineLength());
    60 
    +        entity.setLengthBetweenBranchlines(dto.getLengthBetweenBranchlines());
    61 
    +        entity.setShooterUsed(dto.getShooterUsed());
    62 
    +        entity.setShooterSpeed(dto.getShooterSpeed());
    63 
    +        entity.setMaxDepthTargeted(dto.getMaxDepthTargeted());
    64 
    +        entity.setTotalSectionsCount(dto.getTotalSectionsCount());
    65 
    +        entity.setBasketsPerSectionCount(dto.getBasketsPerSectionCount());
    66 
    +        entity.setTotalBasketsCount(dto.getTotalBasketsCount());
    67 
    +        entity.setBranchlinesPerBasketCount(dto.getBranchlinesPerBasketCount());
    68 
    +        entity.setTotalHooksCount(dto.getTotalHooksCount());
    69 
    +        entity.setLineType(toEntity(dto.getLineType()));
    70 
    +        entity.setWeightedSwivel(dto.getWeightedSwivel());
    71 
    +        entity.setSwivelWeight(dto.getSwivelWeight());
    72 
    +        entity.setWeightedSnap(dto.getWeightedSnap());
    73 
    +        entity.setSnapWeight(dto.getSnapWeight());
    74 
    +        entity.setMonitored(dto.getMonitored());
    75 
    +
    76 
    +        entity.setLightsticksUsed(dto.getLightsticksUsed());
    77 
    +        entity.setLightsticksPerBasketCount(dto.getLightsticksPerBasketCount());
    78 
    +        entity.setLightsticksType(toEntity(dto.getLightsticksType()));
    79 
    +        entity.setLightsticksColor(toEntity(dto.getLightsticksColor()));
    80 
    +
    69 81 
             entity.setHaulingDirectionSameAsSetting(dto.getHaulingDirectionSameAsSetting());
    70 82 
             entity.setHaulingStartTimeStamp(dto.getHaulingStartTimeStamp());
    71 83 
             entity.setHaulingStartLatitude(dto.getHaulingStartLatitude());
    ... ... @@ -74,13 +86,6 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
    74 86 
             entity.setHaulingEndLatitude(dto.getHaulingEndLatitude());
    75 87 
             entity.setHaulingEndLongitude(dto.getHaulingEndLongitude());
    76 88 
             entity.setHaulingBreaks(dto.getHaulingBreaks());
    77 
    -        entity.setMonitored(dto.getMonitored());
    78 
    -        entity.setLastUpdateDate(dto.getLastUpdateDate());
    79 
    -        entity.setSettingShape(toEntity(dto.getSettingShape()));
    80 
    -        entity.setLineType(toEntity(dto.getLineType()));
    81 
    -        entity.setLightsticksType(toEntity(dto.getLightsticksType()));
    82 
    -        entity.setLightsticksColor(toEntity(dto.getLightsticksColor()));
    83 
    -
    84 89 
         }
    85 90
    86 91 
         @Override
    ... ... @@ -90,20 +95,7 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
    90 95 
             dto.setComment(entity.getComment());
    91 96 
             dto.setHomeId(entity.getHomeId());
    92 97 
             dto.setNumber(entity.getNumber());
    93 
    -        dto.setBasketsPerSectionCount(entity.getBasketsPerSectionCount());
    94 
    -        dto.setBranchlinesPerBasketCount(entity.getBranchlinesPerBasketCount());
    95 
    -        dto.setTotalSectionsCount(entity.getTotalSectionsCount());
    96 
    -        dto.setTotalBasketsCount(entity.getTotalBasketsCount());
    97 
    -        dto.setTotalHooksCount(entity.getTotalHooksCount());
    98 
    -        dto.setWeightedSnap(entity.getWeightedSnap());
    99 
    -        dto.setSnapWeight(entity.getSnapWeight());
    100 
    -        dto.setWeightedSwivel(entity.getWeightedSwivel());
    101 
    -        dto.setSwivelWeight(entity.getSwivelWeight());
    102 
    -        dto.setLightsticksPerBasketCount(entity.getLightsticksPerBasketCount());
    103 
    -        dto.setTimeBetweenHooks(entity.getTimeBetweenHooks());
    104 
    -        dto.setShooterUsed(entity.getShooterUsed());
    105 
    -        dto.setShooterSpeed(entity.getShooterSpeed());
    106 
    -        dto.setMaxDepthTargeted(entity.getMaxDepthTargeted());
    98 
    +        dto.setSettingShape(toReferentialReference(referentialLocale, entity.getSettingShape()));
    107 99 
             dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp());
    108 100 
             dto.setSettingStartLatitude(entity.getSettingStartLatitude());
    109 101 
             dto.setSettingStartLongitude(entity.getSettingStartLongitude());
    ... ... @@ -112,7 +104,32 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
    112 104 
             dto.setSettingEndLatitude(entity.getSettingEndLatitude());
    113 105 
             dto.setSettingEndLongitude(entity.getSettingEndLongitude());
    114 106 
             dto.setSettingEndQuadrant(entity.getSettingEndQuadrant());
    107 
    +
    115 108 
             dto.setSettingVesselSpeed(entity.getSettingVesselSpeed());
    109 
    +        dto.setTimeBetweenHooks(entity.getTimeBetweenHooks());
    110 
    +        dto.setTotalLineLength(entity.getTotalLineLength());
    111 
    +        dto.setBasketLineLength(entity.getBasketLineLength());
    112 
    +        dto.setLengthBetweenBranchlines(entity.getLengthBetweenBranchlines());
    113 
    +        dto.setShooterUsed(entity.getShooterUsed());
    114 
    +        dto.setShooterSpeed(entity.getShooterSpeed());
    115 
    +        dto.setMaxDepthTargeted(entity.getMaxDepthTargeted());
    116 
    +        dto.setTotalSectionsCount(entity.getTotalSectionsCount());
    117 
    +        dto.setBasketsPerSectionCount(entity.getBasketsPerSectionCount());
    118 
    +        dto.setTotalBasketsCount(entity.getTotalBasketsCount());
    119 
    +        dto.setBranchlinesPerBasketCount(entity.getBranchlinesPerBasketCount());
    120 
    +        dto.setTotalHooksCount(entity.getTotalHooksCount());
    121 
    +        dto.setLineType(toReferentialReference(referentialLocale, entity.getLineType()));
    122 
    +        dto.setWeightedSwivel(entity.getWeightedSwivel());
    123 
    +        dto.setSwivelWeight(entity.getSwivelWeight());
    124 
    +        dto.setWeightedSnap(entity.getWeightedSnap());
    125 
    +        dto.setSnapWeight(entity.getSnapWeight());
    126 
    +        dto.setMonitored(entity.getMonitored());
    127 
    +
    128 
    +        dto.setLightsticksUsed(entity.getLightsticksUsed());
    129 
    +        dto.setLightsticksPerBasketCount(entity.getLightsticksPerBasketCount());
    130 
    +        dto.setLightsticksType(toReferentialReference(referentialLocale, entity.getLightsticksType()));
    131 
    +        dto.setLightsticksColor(toReferentialReference(referentialLocale, entity.getLightsticksColor()));
    132 
    +
    116 133 
             dto.setHaulingDirectionSameAsSetting(entity.getHaulingDirectionSameAsSetting());
    117 134 
             dto.setHaulingStartTimeStamp(entity.getHaulingStartTimeStamp());
    118 135 
             dto.setHaulingStartLatitude(entity.getHaulingStartLatitude());
    ... ... @@ -123,13 +140,6 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
    123 140 
             dto.setHaulingEndLongitude(entity.getHaulingEndLongitude());
    124 141 
             dto.setHaulingEndQuadrant(entity.getHaulingEndQuadrant());
    125 142 
             dto.setHaulingBreaks(entity.getHaulingBreaks());
    126 
    -        dto.setMonitored(entity.getMonitored());
    127 
    -
    128 
    -        dto.setSettingShape(toReferentialReference(referentialLocale, entity.getSettingShape()));
    129 
    -        dto.setLineType(toReferentialReference(referentialLocale, entity.getLineType()));
    130 
    -        dto.setLightsticksType(toReferentialReference(referentialLocale, entity.getLightsticksType()));
    131 
    -        dto.setLightsticksColor(toReferentialReference(referentialLocale, entity.getLightsticksColor()));
    132 
    -
    133 143 
         }
    134 144
    135 145 
     }

  • persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookEntityReferenceBinder.java
    ... ... @@ -41,9 +41,7 @@ public class SetLonglineLogbookEntityReferenceBinder extends DataEntityReference
    41 41
    42 42 
         @Override
    43 43 
         public SetLonglineLogbookReference toReference(ReferentialLocale referentialLocale, SetLonglineLogbook entity) {
    44 
    -
    45 44 
             return new SetLonglineLogbookReference(entity, entity.getHomeId());
    46 
    -
    47 45 
         }
    48 46
    49 47 
     }

    • —
    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.