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

Commits:

15 changed files:

Changes:

  • client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl
    ... ... @@ -83,7 +83,7 @@
    83 83
    84 84 
                         <li>
    85 85 
                           <!--FIXME Bavencoff 17/03/2016 use decorator-->
    86 
    -                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()}
    86 
    +                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()}
    87 87 
                         </li>
    88 88
    89 89 
                       </#list>

  • client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl
    ... ... @@ -53,13 +53,8 @@
    53 53
    54 54 
             <#elseif selectDataModel.isDataFull()>
    55 55
    56 
    -<<<<<<< HEAD
    57 
    -          Todos los datos de observador deben ser exportados
    58 
    -          (<#if selectDataModel.getSelectCedount() == 1>
    59 
    -=======
    60 56 
               Todos los datos del observador deben ser exportados
    61 
    -          (<#if selectDataModel.selectDataSize() == 1>
    62 
    ->>>>>>> 64a0649... Templates de traduction mis à jour (fixes #8967)
    57 
    +          (<#if selectDataModel.getSelectedCount() == 1>
    63 58 
                  1 marea
    64 59 
               <#else>
    65 60 
                 ${selectDataModel.getSelectedCount()} mareas
    ... ... @@ -88,7 +83,7 @@
    88 83
    89 84 
                         <li>
    90 85 
                           <!--FIXME Bavencoff 17/03/2016 use decorator-->
    91 
    -                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()}
    86 
    +                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()}
    92 87 
                         </li>
    93 88
    94 89 
                       </#list>

  • client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl
    ... ... @@ -83,7 +83,7 @@
    83 83
    84 84 
                         <li>
    85 85 
                           <!--FIXME Bavencoff 17/03/2016 use decorator-->
    86 
    -                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()}
    86 
    +                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()}
    87 87 
                         </li>
    88 88
    89 89 
                       </#list>

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java
    ... ... @@ -36,6 +36,7 @@ import org.nuiton.util.beans.BinderModelBuilder;
    36 36 
     import javax.swing.DefaultListSelectionModel;
    37 37 
     import javax.swing.ListSelectionModel;
    38 38 
     import java.awt.Component;
    39 
    +import java.util.Date;
    39 40 
     import java.util.List;
    40 41
    41 42 
     /**
    ... ... @@ -197,7 +198,9 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto>
    197 198 
         }
    198 199
    199 200 
         public C newTableEditBean() {
    200 
    -        return Objects2.newInstance(getChildType());
    201 
    +        C c = Objects2.newInstance(getChildType());
    202 
    +        c.setCreateDate(new Date());
    203 
    +        return c;
    201 204 
         }
    202 205
    203 206 
         public boolean isCanSaveRow() {

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java
    ... ... @@ -78,7 +78,6 @@ public class StorageBackupUILauncher extends StorageUILauncher {
    78 78 
             if (source.isLocal()) {
    79 79 
                 model.setCanUseLocalService(true);
    80 80 
                 model.setDbMode(DbMode.USE_LOCAL);
    81 
    -            model.setDoBackup(true);
    82 81 
             } else if (source.isRemote()) {
    83 82 
                 model.setCanUseRemoteService(true);
    84 83 
                 model.setDbMode(DbMode.USE_REMOTE);
    ... ... @@ -86,6 +85,7 @@ public class StorageBackupUILauncher extends StorageUILauncher {
    86 85 
                 model.setCanUseServerService(true);
    87 86 
                 model.setDbMode(DbMode.USE_SERVER);
    88 87 
             }
    88 
    +        model.setDoBackup(true);
    89 89
    90 90 
             model.setSteps(StorageStep.BACKUP, StorageStep.SELECT_DATA, StorageStep.CONFIRM);
    91 91 
             ui.setTitle(title);

  • client-datasource-editor-ll/src/main/i18n/getters/java.getter
    ... ... @@ -105,6 +105,8 @@ observe.data.ll.logbook.Catch.table.discardHealthStatus
    105 105 
     observe.data.ll.logbook.Catch.table.discardHealthStatus.tip
    106 106 
     observe.data.ll.logbook.Catch.table.speciesCatch
    107 107 
     observe.data.ll.logbook.Catch.table.speciesCatch.tip
    108 
    +observe.data.ll.logbook.Catch.table.totalWeight
    109 
    +observe.data.ll.logbook.Catch.table.totalWeight.tip
    108 110 
     observe.data.ll.logbook.FloatlinesComposition.table.length
    109 111 
     observe.data.ll.logbook.FloatlinesComposition.table.length.tip
    110 112 
     observe.data.ll.logbook.FloatlinesComposition.table.lineType

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java
    ... ... @@ -126,6 +126,8 @@ public class CatchUIHandler extends ContentTableUIHandler<SetCatchDto, CatchDto,
    126 126 
                         n("observe.data.ll.logbook.Catch.table.acquisitionMode.tip"),
    127 127 
                         n("observe.data.ll.logbook.Catch.table.count"),
    128 128 
                         n("observe.data.ll.logbook.Catch.table.count.tip"),
    129 
    +                    n("observe.data.ll.logbook.Catch.table.totalWeight"),
    130 
    +                    n("observe.data.ll.logbook.Catch.table.totalWeight.tip"),
    129 131 
                         n("observe.data.ll.logbook.Catch.table.catchHealthStatus"),
    130 132 
                         n("observe.data.ll.logbook.Catch.table.catchHealthStatus.tip"),
    131 133 
                         n("observe.data.ll.logbook.Catch.table.catchFate"),
    ... ... @@ -143,12 +145,13 @@ public class CatchUIHandler extends ContentTableUIHandler<SetCatchDto, CatchDto,
    143 145 
                 UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesReference.class));
    144 146 
                 UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEnumTableCellRenderer(renderer, CatchAcquisitionMode.class));
    145 147 
                 UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    146 
    -            UIHelper.setTableColumnRenderer(table, 3, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
    147 
    -            UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, CatchFateReference.class));
    148 
    -            UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
    149 
    -            UIHelper.setTableColumnRenderer(table, 6, UIHelper.newBooleanTableCellRenderer(renderer));
    150 
    -            UIHelper.setTableColumnRenderer(table, 7, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    151 
    -            UIHelper.setTableColumnRenderer(table, 8, UIHelper.newStringTableCellRenderer(renderer, 10, true));
    148 
    +            UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    149 
    +            UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
    150 
    +            UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, CatchFateReference.class));
    151 
    +            UIHelper.setTableColumnRenderer(table, 6, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
    152 
    +            UIHelper.setTableColumnRenderer(table, 7, UIHelper.newBooleanTableCellRenderer(renderer));
    153 
    +            UIHelper.setTableColumnRenderer(table, 8, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    154 
    +            UIHelper.setTableColumnRenderer(table, 9, UIHelper.newStringTableCellRenderer(renderer, 10, true));
    152 155 
             }
    153 156
    154 157 
             getTableModel().addPropertyChangeListener(ContentTableModel.CREATE_PROPERTY, evt -> {

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java
    ... ... @@ -78,6 +78,7 @@ public class CatchUIModel extends ContentTableUIModel<SetCatchDto, CatchDto> {
    78 78 
                     ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_SPECIES_CATCH, false),
    79 79 
                     ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_ACQUISITION_MODE, false),
    80 80 
                     ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_COUNT, false),
    81 
    +                ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_TOTAL_WEIGHT, false),
    81 82 
                     ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_CATCH_HEALTH_STATUS, false),
    82 83 
                     ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_CATCH_FATE, false),
    83 84 
                     ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_DISCARD_HEALTH_STATUS, false),

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartUIHandler.java
    ... ... @@ -174,10 +174,9 @@ public class SamplePartUIHandler extends NotStandaloneContentTableUIHandler<Samp
    174 174
    175 175 
                     // on passe le mode de saisie en count
    176 176 
                     ui.getAcquisitionModeGroup().setSelectedValue(null);
    177 
    -                ui.getAcquisitionModeGroup().setSelectedValue(AcquisitionMode.byEffectif);
    177 
    +                ui.getAcquisitionModeGroup().setSelectedValue(AcquisitionMode.byIndividu);
    178 178 
                 }
    179 179
    180 
    -            availableSpecies = getModel().getReferenceCache().getReferentialReferences(SamplePartDto.PROPERTY_SPECIES);
    181 180 
                 requestFocus = ui.getSpecies();
    182 181 
             } else {
    183 182
    ... ... @@ -189,10 +188,10 @@ public class SamplePartUIHandler extends NotStandaloneContentTableUIHandler<Samp
    189 188 
                 ui.getAcquisitionModeGroup().setSelectedValue(null);
    190 189 
                 ui.getAcquisitionModeGroup().setSelectedValue(enumValue);
    191 190
    192 
    -            availableSpecies = Collections.singletonList(species);
    193 191 
                 sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType());
    194 192
    195 193 
             }
    194 
    +        availableSpecies = getModel().getReferenceCache().getReferentialReferences(SamplePartDto.PROPERTY_SPECIES);
    196 195
    197 196 
             ui.getSizeMeasureType().setSelectedItem(null);
    198 197 
             sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference));

  • dto/src/main/i18n/getters/java.getter
    ... ... @@ -13,7 +13,6 @@ observe.Id.species
    13 13 
     observe.Id.weightMeasureType
    14 14 
     observe.Id.whenArriving
    15 15 
     observe.Id.whenLeaving
    16 
    -observe.common.WithStartEndDate.startEndDateLabel
    17 16 
     observe.common.WithStartEndDate.validityRangeLabel
    18 17 
     observe.common.gps.activity
    19 18 
     observe.common.gps.gpsPoint

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
    ... ... @@ -104,7 +104,6 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport
    104 104 
             n("observe.referential.WithFormula.speciesLabel");
    105 105 
             n("observe.referential.WithFormula.speciesFaoCode");
    106 106 
             n("observe.common.WithStartEndDate.validityRangeLabel");
    107 
    -        n("observe.common.WithStartEndDate.startEndDateLabel");
    108 107 
         }
    109 108
    110 109 
         public ObserveI18nLabelsBuilder() {

  • dto/src/main/models/Observe-31-data-ll-logbook.model
    ... ... @@ -47,8 +47,8 @@ hasSet + {*:1} Boolean
    47 47
    48 48 
     data.ll.logbook.Set > data.Commentable | references=homeId
    49 49 
     number + {*:1} Integer | positiveNumber
    50 
    -basketsPerSectionCount + {*:1} Integer | notNull | positiveNumber
    51 
    -branchlinesPerBasketCount + {*:1} Integer | notNull positiveNumber
    50 
    +basketsPerSectionCount + {*:1} Integer | mayNotNull  positiveNumber
    51 
    +branchlinesPerBasketCount + {*:1} Integer | mayNotNull positiveNumber
    52 52 
     totalSectionsCount + {*:1} Integer | notNull positiveNumber
    53 53 
     totalBasketsCount + {*:1} Integer | positiveNumber
    54 54 
     totalHooksCount + {*:1} Integer | positiveNumber

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1102,6 +1102,8 @@ observe.data.ll.logbook.Catch.table.sectionHaulingId=Section °
    1102 1102 
     observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Section hauling id
    1103 1103 
     observe.data.ll.logbook.Catch.table.speciesCatch=Species
    1104 1104 
     observe.data.ll.logbook.Catch.table.speciesCatch.tip=Species
    1105 
    +observe.data.ll.logbook.Catch.table.totalWeight=Total weight
    1106 
    +observe.data.ll.logbook.Catch.table.totalWeight.tip=Total weight (kg)
    1105 1107 
     observe.data.ll.logbook.Catch.tagNumber=Tag number
    1106 1108 
     observe.data.ll.logbook.Catch.timeSinceContact=Time since contact
    1107 1109 
     observe.data.ll.logbook.Catch.title=Catches

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1102,6 +1102,8 @@ observe.data.ll.logbook.Catch.table.sectionHaulingId=N° sección
    1102 1102 
     observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Numero de arrastre de la sección
    1103 1103 
     observe.data.ll.logbook.Catch.table.speciesCatch=Especie
    1104 1104 
     observe.data.ll.logbook.Catch.table.speciesCatch.tip=Especie
    1105 
    +observe.data.ll.logbook.Catch.table.totalWeight=Peso total
    1106 
    +observe.data.ll.logbook.Catch.table.totalWeight.tip=Peso total (kg)
    1105 1107 
     observe.data.ll.logbook.Catch.tagNumber=Numéro d'échantillon \#TODO
    1106 1108 
     observe.data.ll.logbook.Catch.timeSinceContact=Tiempo desde el estallido
    1107 1109 
     observe.data.ll.logbook.Catch.title=Capturas

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1102,6 +1102,8 @@ observe.data.ll.logbook.Catch.table.sectionHaulingId=N° section
    1102 1102 
     observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Numéro de virage de la section
    1103 1103 
     observe.data.ll.logbook.Catch.table.speciesCatch=Espèce
    1104 1104 
     observe.data.ll.logbook.Catch.table.speciesCatch.tip=Espèce
    1105 
    +observe.data.ll.logbook.Catch.table.totalWeight=Poids total
    1106 
    +observe.data.ll.logbook.Catch.table.totalWeight.tip=Poids total (kg)
    1105 1107 
     observe.data.ll.logbook.Catch.tagNumber=Id marque
    1106 1108 
     observe.data.ll.logbook.Catch.timeSinceContact=Temps depuis déclenchement
    1107 1109 
     observe.data.ll.logbook.Catch.title=Captures

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