[Observe-commits] [Git][ultreiaio/ird-observe][develop] 8 commits: [SFA] Assouplissement de contrôles sur LL Logbooks - Closes #1450

27 Mar 2020


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


Commits:
0ebd1b61 by tchemit at 2020-03-27T11:00:01+01:00
[SFA] Assouplissement de contrôles sur LL Logbooks - Closes #1450

- - - - -
f229daa6 by tchemit at 2020-03-27T12:42:55+01:00
[SFA] LL / Logbooks / Samples : modification d'espèce - Closes #1453

- - - - -
a65028aa by tchemit at 2020-03-27T13:17:46+01:00
Fix backup accessible fields on none local data source

- - - - -
47b3a04f by tchemit at 2020-03-27T13:18:29+01:00
Fix Trip reference decoration

- - - - -
92c74483 by tchemit at 2020-03-27T13:18:50+01:00
Fix template (trip reference has changed)

- - - - -
3df490df by tchemit at 2020-03-27T13:19:19+01:00
Fix topia persistence on table content ui (don't know what does that changed...)

- - - - -
b9434baa by tchemit at 2020-03-27T13:19:52+01:00
[SFA] LL / Logbooks / Samples : mode de saisie par défaut - Closes #1452

- - - - -
a72385a0 by tchemit at 2020-03-27T14:06:44+01:00
[SFA] LL / Logbooks / Captures - Closes #1451

- - - - -


15 changed files:

- client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl
- client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl
- client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIModel.java
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java
- client-datasource-editor-ll/src/main/i18n/getters/java.getter
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SamplePartUIHandler.java
- dto/src/main/i18n/getters/java.getter
- dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
- dto/src/main/models/Observe-31-data-ll-logbook.model
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties


Changes:

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


=====================================
client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl
=====================================
@@ -53,13 +53,8 @@
 
         <#elseif selectDataModel.isDataFull()>
 
-<<<<<<< HEAD
-          Todos los datos de observador deben ser exportados
-          (<#if selectDataModel.getSelectCedount() == 1>
-=======
           Todos los datos del observador deben ser exportados
-          (<#if selectDataModel.selectDataSize() == 1>
->>>>>>> 64a0649... Templates de traduction mis à jour (fixes #8967)
+          (<#if selectDataModel.getSelectedCount() == 1>
              1 marea
           <#else>
             ${selectDataModel.getSelectedCount()} mareas
@@ -88,7 +83,7 @@
 
                     <li>
                       <!--FIXME Bavencoff 17/03/2016 use decorator-->
-                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()}
+                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()}
                     </li>
 
                   </#list>


=====================================
client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl
=====================================
@@ -83,7 +83,7 @@
 
                     <li>
                       <!--FIXME Bavencoff 17/03/2016 use decorator-->
-                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()}
+                      ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVessel().getLabel()} - ${trip.getObserverLabel()}
                     </li>
 
                   </#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;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.ListSelectionModel;
 import java.awt.Component;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -197,7 +198,9 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto>
     }
 
     public C newTableEditBean() {
-        return Objects2.newInstance(getChildType());
+        C c = Objects2.newInstance(getChildType());
+        c.setCreateDate(new Date());
+        return c;
     }
 
     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 {
         if (source.isLocal()) {
             model.setCanUseLocalService(true);
             model.setDbMode(DbMode.USE_LOCAL);
-            model.setDoBackup(true);
         } else if (source.isRemote()) {
             model.setCanUseRemoteService(true);
             model.setDbMode(DbMode.USE_REMOTE);
@@ -86,6 +85,7 @@ public class StorageBackupUILauncher extends StorageUILauncher {
             model.setCanUseServerService(true);
             model.setDbMode(DbMode.USE_SERVER);
         }
+        model.setDoBackup(true);
 
         model.setSteps(StorageStep.BACKUP, StorageStep.SELECT_DATA, StorageStep.CONFIRM);
         ui.setTitle(title);


=====================================
client-datasource-editor-ll/src/main/i18n/getters/java.getter
=====================================
@@ -105,6 +105,8 @@ observe.data.ll.logbook.Catch.table.discardHealthStatus
 observe.data.ll.logbook.Catch.table.discardHealthStatus.tip
 observe.data.ll.logbook.Catch.table.speciesCatch
 observe.data.ll.logbook.Catch.table.speciesCatch.tip
+observe.data.ll.logbook.Catch.table.totalWeight
+observe.data.ll.logbook.Catch.table.totalWeight.tip
 observe.data.ll.logbook.FloatlinesComposition.table.length
 observe.data.ll.logbook.FloatlinesComposition.table.length.tip
 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,
                     n("observe.data.ll.logbook.Catch.table.acquisitionMode.tip"),
                     n("observe.data.ll.logbook.Catch.table.count"),
                     n("observe.data.ll.logbook.Catch.table.count.tip"),
+                    n("observe.data.ll.logbook.Catch.table.totalWeight"),
+                    n("observe.data.ll.logbook.Catch.table.totalWeight.tip"),
                     n("observe.data.ll.logbook.Catch.table.catchHealthStatus"),
                     n("observe.data.ll.logbook.Catch.table.catchHealthStatus.tip"),
                     n("observe.data.ll.logbook.Catch.table.catchFate"),
@@ -143,12 +145,13 @@ public class CatchUIHandler extends ContentTableUIHandler<SetCatchDto, CatchDto,
             UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesReference.class));
             UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEnumTableCellRenderer(renderer, CatchAcquisitionMode.class));
             UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer));
-            UIHelper.setTableColumnRenderer(table, 3, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
-            UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, CatchFateReference.class));
-            UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
-            UIHelper.setTableColumnRenderer(table, 6, UIHelper.newBooleanTableCellRenderer(renderer));
-            UIHelper.setTableColumnRenderer(table, 7, UIHelper.newEmptyNumberTableCellRenderer(renderer));
-            UIHelper.setTableColumnRenderer(table, 8, UIHelper.newStringTableCellRenderer(renderer, 10, true));
+            UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer));
+            UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
+            UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, CatchFateReference.class));
+            UIHelper.setTableColumnRenderer(table, 6, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HealthStatusReference.class));
+            UIHelper.setTableColumnRenderer(table, 7, UIHelper.newBooleanTableCellRenderer(renderer));
+            UIHelper.setTableColumnRenderer(table, 8, UIHelper.newEmptyNumberTableCellRenderer(renderer));
+            UIHelper.setTableColumnRenderer(table, 9, UIHelper.newStringTableCellRenderer(renderer, 10, true));
         }
 
         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> {
                 ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_SPECIES_CATCH, false),
                 ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_ACQUISITION_MODE, false),
                 ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_COUNT, false),
+                ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_TOTAL_WEIGHT, false),
                 ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_CATCH_HEALTH_STATUS, false),
                 ContentTableModel.newTableMeta(CatchDto.class, CatchDto.PROPERTY_CATCH_FATE, false),
                 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
 
                 // on passe le mode de saisie en count
                 ui.getAcquisitionModeGroup().setSelectedValue(null);
-                ui.getAcquisitionModeGroup().setSelectedValue(AcquisitionMode.byEffectif);
+                ui.getAcquisitionModeGroup().setSelectedValue(AcquisitionMode.byIndividu);
             }
 
-            availableSpecies = getModel().getReferenceCache().getReferentialReferences(SamplePartDto.PROPERTY_SPECIES);
             requestFocus = ui.getSpecies();
         } else {
 
@@ -189,10 +188,10 @@ public class SamplePartUIHandler extends NotStandaloneContentTableUIHandler<Samp
             ui.getAcquisitionModeGroup().setSelectedValue(null);
             ui.getAcquisitionModeGroup().setSelectedValue(enumValue);
 
-            availableSpecies = Collections.singletonList(species);
             sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType());
 
         }
+        availableSpecies = getModel().getReferenceCache().getReferentialReferences(SamplePartDto.PROPERTY_SPECIES);
 
         ui.getSizeMeasureType().setSelectedItem(null);
         sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference));


=====================================
dto/src/main/i18n/getters/java.getter
=====================================
@@ -13,7 +13,6 @@ observe.Id.species
 observe.Id.weightMeasureType
 observe.Id.whenArriving
 observe.Id.whenLeaving
-observe.common.WithStartEndDate.startEndDateLabel
 observe.common.WithStartEndDate.validityRangeLabel
 observe.common.gps.activity
 observe.common.gps.gpsPoint


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


=====================================
dto/src/main/models/Observe-31-data-ll-logbook.model
=====================================
@@ -47,8 +47,8 @@ hasSet + {*:1} Boolean
 
 data.ll.logbook.Set > data.Commentable | references=homeId
 number + {*:1} Integer | positiveNumber
-basketsPerSectionCount + {*:1} Integer | notNull | positiveNumber
-branchlinesPerBasketCount + {*:1} Integer | notNull positiveNumber
+basketsPerSectionCount + {*:1} Integer | mayNotNull  positiveNumber
+branchlinesPerBasketCount + {*:1} Integer | mayNotNull positiveNumber
 totalSectionsCount + {*:1} Integer | notNull positiveNumber
 totalBasketsCount + {*:1} Integer | positiveNumber
 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 °
 observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Section hauling id
 observe.data.ll.logbook.Catch.table.speciesCatch=Species
 observe.data.ll.logbook.Catch.table.speciesCatch.tip=Species
+observe.data.ll.logbook.Catch.table.totalWeight=Total weight
+observe.data.ll.logbook.Catch.table.totalWeight.tip=Total weight (kg)
 observe.data.ll.logbook.Catch.tagNumber=Tag number
 observe.data.ll.logbook.Catch.timeSinceContact=Time since contact
 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
 observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Numero de arrastre de la sección
 observe.data.ll.logbook.Catch.table.speciesCatch=Especie
 observe.data.ll.logbook.Catch.table.speciesCatch.tip=Especie
+observe.data.ll.logbook.Catch.table.totalWeight=Peso total
+observe.data.ll.logbook.Catch.table.totalWeight.tip=Peso total (kg)
 observe.data.ll.logbook.Catch.tagNumber=Numéro d'échantillon \#TODO
 observe.data.ll.logbook.Catch.timeSinceContact=Tiempo desde el estallido
 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
 observe.data.ll.logbook.Catch.table.sectionHaulingId.tip=Numéro de virage de la section
 observe.data.ll.logbook.Catch.table.speciesCatch=Espèce
 observe.data.ll.logbook.Catch.table.speciesCatch.tip=Espèce
+observe.data.ll.logbook.Catch.table.totalWeight=Poids total
+observe.data.ll.logbook.Catch.table.totalWeight.tip=Poids total (kg)
 observe.data.ll.logbook.Catch.tagNumber=Id marque
 observe.data.ll.logbook.Catch.timeSinceContact=Temps depuis déclenchement
 observe.data.ll.logbook.Catch.title=Captures



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af09ead3231a161103594c42d...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af09ead3231a161103594c42d...
You're receiving this email because of your account on gitlab.com.

    