[Git][ultreiaio/ird-observe][develop] 2 commits: add temperature config option + continue ui storm

24 Dec 2017

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


Commits:
26fd5a96 by Tony CHEMIT at 2017-12-23T16:20:58+01:00
add temperature config option + continue ui storm

- - - - -
58b6dbbf by Tony CHEMIT at 2017-12-24T10:51:51+01:00
review activity seine ui

- - - - -


21 changed files:

- client-configuration/pom.xml
- client-configuration/src/main/config/Client.ini
- client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
- client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
- client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
- client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java
- client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss
- client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx
- client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx
- client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java
- dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java


Changes:

=====================================
client-configuration/pom.xml
=====================================

--- a/client-configuration/pom.xml
+++ b/client-configuration/pom.xml
@@ -102,6 +102,10 @@
       <groupId>io.ultreia.java4all.jaxx</groupId>
       <artifactId>jaxx-widgets-gis</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.ultreia.java4all.jaxx</groupId>
+      <artifactId>jaxx-widgets-temperature</artifactId>
+    </dependency>
 
   </dependencies>
 


=====================================
client-configuration/src/main/config/Client.ini
=====================================
--- a/client-configuration/src/main/config/Client.ini
+++ b/client-configuration/src/main/config/Client.ini
@@ -506,6 +506,12 @@ key = ui.coordinate.format
 type = org.nuiton.jaxx.widgets.gis.CoordinateFormat
 defaultValue = "dmd"
 
+[option temperatureFormat]
+description = observe.config.temperature.format
+key = ui.temperature.format
+type = org.nuiton.jaxx.widgets.temperature.TemperatureFormat
+defaultValue = "C"
+
 [option focusBorderColor]
 description = observe.config.ui.focusBorderColor
 key = ui.focusBorder.color


=====================================
client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
=====================================
--- a/client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
+++ b/client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
@@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory;
 import org.nuiton.config.ApplicationConfig;
 import org.nuiton.config.ArgumentsParserException;
 import org.nuiton.jaxx.widgets.gis.CoordinateFormat;
+import org.nuiton.jaxx.widgets.temperature.TemperatureFormat;
 import org.nuiton.version.Version;
 import org.nuiton.version.Versions;
 
@@ -200,6 +201,11 @@ public class ClientConfig extends GeneratedClientConfig implements ClientApplica
         return CoordinateFormat.valueOf(get().getOption(ClientConfigOption.COORDINATE_FORMAT.getKey()));
     }
 
+
+    public TemperatureFormat getTemperatureFormat() {
+        return get().getOption(TemperatureFormat.class, ClientConfigOption.TEMPERATURE_FORMAT.getKey());
+    }
+
     @Override
     public String getCopyrightText() {
         if (copyrightText == null) {


=====================================
client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
=====================================
--- a/client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
+++ b/client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
@@ -72,6 +72,7 @@ observe.config.speciesList.seine.objectSchoolEstimate=Species for object school 
 observe.config.speciesList.seine.schoolEstimate=Species for school esitmates
 observe.config.speciesList.seine.targetCatch=Species for target catches
 observe.config.swingSessionFile.description=Swing session file.
+observe.config.temperature.format=Default temperature format
 observe.config.ui.autoPopupNumberEditor=Flag sets to true when number editor show automaticly popup
 observe.config.ui.changeSynchroSrc=Flag sets to true if you can change local source in admin tasks
 observe.config.ui.focusBorderColor=Color of the focus container border


=====================================
client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
=====================================
--- a/client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
+++ b/client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
@@ -72,6 +72,7 @@ observe.config.speciesList.seine.objectSchoolEstimate=Especies para las estimaci
 observe.config.speciesList.seine.schoolEstimate=Especies para las estimaciones
 observe.config.speciesList.seine.targetCatch=Especies par las capturas objetivo
 observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. \#TODO
+observe.config.temperature.format=Default temperature format \#TODO
 observe.config.ui.autoPopupNumberEditor=Para mostrar automáticamente el editor numérico durante la edición de un número
 observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base
 observe.config.ui.focusBorderColor=Couleur de la bordure de la zone qui a le focus \#TODO


=====================================
client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
=====================================
--- a/client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
+++ b/client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
@@ -72,6 +72,7 @@ observe.config.speciesList.seine.objectSchoolEstimate=Espèces pour les estimati
 observe.config.speciesList.seine.schoolEstimate=Espèces pour les estimations
 observe.config.speciesList.seine.targetCatch=Espèces pour les captures cible
 observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI.
+observe.config.temperature.format=Unité de température
 observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre
 observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base
 observe.config.ui.focusBorderColor=Couleur de la bordure de la zone qui a le focus


=====================================
client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java
+++ b/client/src/main/java/fr/ird/observe/client/admin/validate/ValidationMessageTableRenderer.java
@@ -46,7 +46,7 @@ public class ValidationMessageTableRenderer extends DefaultTableCellRenderer {
 
     private static final long serialVersionUID = 1L;
 
-    private final ObserveI18nLabelsBuilder labelsBuilder = new ObserveI18nLabelsBuilder(null);
+    private final ObserveI18nLabelsBuilder labelsBuilder = ObserveI18nLabelsBuilder.fromNull();
 
     @Override
     public Component getTableCellRendererComponent(JTable table,


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss
@@ -55,6 +55,14 @@ ReferentialComboBoxBeanEditor {
   bean:{bean};
 }
 
+ReferentialDoubleListBeanEditor {
+  bean:{bean};
+}
+
+TemperatureBeanEditor {
+  bean:{bean};
+}
+
 NormalTextBeanEditor {
   model:{bean};
 }


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx
@@ -60,13 +60,8 @@
     static org.nuiton.i18n.I18n.n
   </import>
 
-  <!-- model -->
   <ActivitySeineUIModel id='model' title='observe.common.ActivitySeineDto.title'/>
-
-  <!-- edit bean -->
   <ActivitySeineDto id='bean'/>
-
-  <!-- validator -->
   <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.data.seine.ActivitySeineDto'
                  errorTableModel='{getErrorTableModel()}' context='create'>
 
@@ -77,198 +72,191 @@
 
   </BeanValidator>
 
-  <JPanel id="body">
-    <Table insets="0" fill="both" constraints='BorderLayout.CENTER'>
-      <row>
-        <cell anchor="north" weightx="1">
-          <JTabbedPane id='mainTabbedPane'>
-            <tab id='generalTab' computeI18n="">
-              <Table fill="both">
-                <!-- heure observation  -->
-                <row>
-                  <cell columns="2" weightx="1">
-                    <TimeBeanEditor id='time' styleClass="i18n"/>
-                  </cell>
-                </row>
-
-                <!--  position -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='coordinatesLabel'/>
-                  </cell>
-                  <cell anchor='east' fill="both">
-                    <CoordinatesBeanEditor id='coordinates'/>
-                  </cell>
-                </row>
+  <JPanel id="body" layout="{new BorderLayout()}">
+    <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'>
+      <tab id='generalTab' computeI18n="">
+        <Table fill="both">
+          <!-- heure observation  -->
+          <row>
+            <cell columns="2" weightx="1">
+              <TimeBeanEditor id='time' styleClass="i18n"/>
+            </cell>
+          </row>
 
-                <!-- activity vessel -->
-                <row>
-                  <cell anchor='west' columns="2">
-                    <JLabel id='vesselActivityInformation' styleClass="skipI18n"/>
-                  </cell>
-                </row>
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='vesselActivitySeineLabel'/>
-                  </cell>
-                  <cell anchor='east' weightx="1">
-                    <ReferentialComboBoxBeanEditor id='vesselActivitySeine' genericType='VesselActivitySeineReference'/>
-                  </cell>
-                </row>
+          <!--  position -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='coordinatesLabel'/>
+            </cell>
+            <cell anchor='east' fill="both">
+              <CoordinatesBeanEditor id='coordinates'/>
+            </cell>
+          </row>
 
-                <!--  activity environnante -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='surroundingActivityLabel'/>
-                  </cell>
-                  <cell anchor='east' weightx="1">
-                    <ReferentialComboBoxBeanEditor id='surroundingActivity' genericType='SurroundingActivityReference'/>
-                  </cell>
-                </row>
+          <!-- activity vessel -->
+          <row>
+            <cell anchor='west' columns="2">
+              <JLabel id='vesselActivityInformation' styleClass="skipI18n"/>
+            </cell>
+          </row>
+          <row>
+            <cell anchor='west'>
+              <JLabel id='vesselActivitySeineLabel'/>
+            </cell>
+            <cell anchor='east' weightx="1">
+              <ReferentialComboBoxBeanEditor id='vesselActivitySeine' genericType='VesselActivitySeineReference'/>
+            </cell>
+          </row>
 
-                <!--  previousFpaZone -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='previousFpaZoneLabel'/>
-                  </cell>
-                  <cell anchor='east' weightx="1">
-                    <ReferentialComboBoxBeanEditor id='previousFpaZone' genericType='FpaZoneReference'/>
-                  </cell>
-                </row>
+          <!--  activity environnante -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='surroundingActivityLabel'/>
+            </cell>
+            <cell anchor='east' weightx="1">
+              <ReferentialComboBoxBeanEditor id='surroundingActivity' genericType='SurroundingActivityReference'/>
+            </cell>
+          </row>
 
-                <!--  currentFpaZone -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='currentFpaZoneLabel'/>
-                  </cell>
-                  <cell anchor='east' weightx="1">
-                    <ReferentialComboBoxBeanEditor id='currentFpaZone' genericType='FpaZoneReference'/>
-                  </cell>
-                </row>
+          <!--  previousFpaZone -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='previousFpaZoneLabel'/>
+            </cell>
+            <cell anchor='east' weightx="1">
+              <ReferentialComboBoxBeanEditor id='previousFpaZone' genericType='FpaZoneReference'/>
+            </cell>
+          </row>
 
-                <!--  nextFpaZone -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='nextFpaZoneLabel'/>
-                  </cell>
-                  <cell anchor='east' weightx="1">
-                    <ReferentialComboBoxBeanEditor id='nextFpaZone' genericType='FpaZoneReference'/>
-                  </cell>
-                </row>
+          <!--  currentFpaZone -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='currentFpaZoneLabel'/>
+            </cell>
+            <cell anchor='east' weightx="1">
+              <ReferentialComboBoxBeanEditor id='currentFpaZone' genericType='FpaZoneReference'/>
+            </cell>
+          </row>
 
-                <!-- id ers  -->
-                <row>
+          <!--  nextFpaZone -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='nextFpaZoneLabel'/>
+            </cell>
+            <cell anchor='east' weightx="1">
+              <ReferentialComboBoxBeanEditor id='nextFpaZone' genericType='FpaZoneReference'/>
+            </cell>
+          </row>
 
-                  <cell anchor='west'>
-                    <JLabel id='ersIdLabel'/>
-                  </cell>
-                  <cell anchor='east' weightx="1" fill="both">
-                    <NormalTextBeanEditor id='ersId'/>
-                  </cell>
-                </row>
-              </Table>
-            </tab>
+          <!-- id ers  -->
+          <row>
 
-            <tab id='measurementsTab' computeI18n="">
-              <Table fill="both">
-                <!-- vitesse vessel -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='vesselSpeedLabel'/>
-                  </cell>
-                  <cell anchor='east' weightx="1" fill="both">
-                    <FloatBeanEditor id='vesselSpeed' styleClass="float2"/>
-                  </cell>
-                </row>
+            <cell anchor='west'>
+              <JLabel id='ersIdLabel'/>
+            </cell>
+            <cell anchor='east' weightx="1" fill="both">
+              <NormalTextBeanEditor id='ersId'/>
+            </cell>
+          </row>
+          <row>
+            <cell columns="2" weighty="1">
+              <JLabel styleClass="skipI18n"/>
+            </cell>
+          </row>
+        </Table>
+      </tab>
 
-                <!-- température de surface -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='seaSurfaceTemperatureLabel'/>
-                  </cell>
-                  <cell anchor='east' fill="both">
-                    <TemperatureBeanEditor id='seaSurfaceTemperature'/>
-                  </cell>
-                </row>
+      <tab id='measurementsTab' computeI18n="">
+        <Table fill="both">
+          <!-- vitesse vessel -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='vesselSpeedLabel'/>
+            </cell>
+            <cell anchor='east' weightx="1" fill="both">
+              <FloatBeanEditor id='vesselSpeed' styleClass="float2"/>
+            </cell>
+          </row>
 
-                <!--  vent beaufort -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='windLabel'/>
-                  </cell>
-                  <cell anchor='east'>
-                    <ReferentialComboBoxBeanEditor id='wind' genericType='WindReference'/>
-                  </cell>
-                </row>
+          <!-- température de surface -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='seaSurfaceTemperatureLabel'/>
+            </cell>
+            <cell anchor='east' fill="both">
+              <TemperatureBeanEditor id='seaSurfaceTemperature'/>
+            </cell>
+          </row>
 
-                <!--  mode de détection -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='detectionModeLabel'/>
-                  </cell>
-                  <cell anchor='east'>
-                    <ReferentialComboBoxBeanEditor id='detectionMode' genericType='DetectionModeReference'/>
-                  </cell>
-                </row>
+          <!--  vent beaufort -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='windLabel'/>
+            </cell>
+            <cell anchor='east'>
+              <ReferentialComboBoxBeanEditor id='wind' genericType='WindReference'/>
+            </cell>
+          </row>
 
-                <!-- cause non coups senne  -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='reasonForNoFishingLabel'/>
-                  </cell>
-                  <cell anchor='east'>
-                    <ReferentialComboBoxBeanEditor id='reasonForNoFishing' genericType='ReasonForNoFishingReference'/>
-                  </cell>
-                </row>
-                <row>
-                  <cell columns="2" weighty="1">
-                    <JLabel styleClass="skipI18n"/>
-                  </cell>
-                </row>
-              </Table>
-            </tab>
+          <!--  mode de détection -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='detectionModeLabel'/>
+            </cell>
+            <cell anchor='east'>
+              <ReferentialComboBoxBeanEditor id='detectionMode' genericType='DetectionModeReference'/>
+            </cell>
+          </row>
 
-            <tab id="observedSystemTab" computeI18n="">
-              <Table fill="both">
-                <!-- systeme observe -->
-                <row>
-                  <cell columns="2" fill="both" weighty="0.7">
-                    <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'>
-                      <ReferentialDoubleListBeanEditor id='observedSystem' genericType='ObservedSystemReference'/>
-                    </JScrollPane>
-                  </cell>
-                </row>
-                <!-- distance au système observe -->
-                <row>
-                  <cell anchor='west'>
-                    <JLabel id='observedSystemDistanceLabel'/>
-                  </cell>
-                  <cell weightx="1" fill="both">
-                    <FloatBeanEditor id='observedSystemDistance' styleClass="float2"/>
-                  </cell>
-                </row>
-              </Table>
-            </tab>
+          <!-- cause non coups senne  -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='reasonForNoFishingLabel'/>
+            </cell>
+            <cell anchor='east'>
+              <ReferentialComboBoxBeanEditor id='reasonForNoFishing' genericType='ReasonForNoFishingReference'/>
+            </cell>
+          </row>
+          <row>
+            <cell columns="2" weighty="1">
+              <JLabel styleClass="skipI18n"/>
+            </cell>
+          </row>
+        </Table>
+      </tab>
 
-          </JTabbedPane>
-        </cell>
-      </row>
-
-      <!--  comment -->
-      <row>
-        <cell columns='2' weighty="1">
-          <CommentBeanEditor id="comment"/>
-        </cell>
-      </row>
-    </Table>
+      <tab id="observedSystemTab" computeI18n="">
+        <Table fill="both">
+          <!-- systeme observe -->
+          <row>
+            <cell columns="2" fill="both" weighty="1">
+              <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'>
+                <ReferentialDoubleListBeanEditor id='observedSystem' genericType='ObservedSystemReference'/>
+              </JScrollPane>
+            </cell>
+          </row>
+          <!-- distance au système observe -->
+          <row>
+            <cell anchor='west'>
+              <JLabel id='observedSystemDistanceLabel'/>
+            </cell>
+            <cell weightx="1" fill="both">
+              <FloatBeanEditor id='observedSystemDistance' styleClass="float2"/>
+            </cell>
+          </row>
+        </Table>
+      </tab>
+    </JTabbedPane>
+    <CommentBeanEditor id="comment" constraints='BorderLayout.SOUTH'/>
   </JPanel>
+
   <Table id='extraActions' fill="both" weightx="1" insets='2'>
     <row>
       <cell weightx="0.5" fill="both">
-        <JButton id='addSet'/>
+        <JButton id='addSet' visible="true"/>
       </cell>
       <cell weightx="0.5" fill="both">
-        <JButton id='addDCP'/>
+        <JButton id='addDCP' visible="true"/>
       </cell>
     </row>
   </Table>


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java
@@ -127,14 +127,6 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, 
         ObserveFormHelper.getApplicationDataSourceContext(ui).setOpenSetSeineId(setSeineId);
     }
 
-    public boolean isSetOperation() {
-        return bean.isSetOperation();
-    }
-
-    public boolean isDcpOperation() {
-        return bean.isDcpOperation();
-    }
-
     public boolean isChangedZoneOperation() {
         return VesselActivitySeineHelper.isChangedZoneOperation(bean.getVesselActivitySeine());
     }
@@ -176,10 +168,6 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, 
     public <U extends OpenDataFormUI<ActivitySeineDto, ActivitySeineReference>> void installUI(U ui) {
         super.installUI(ui);
         ActivitySeineUI ui1 = (ActivitySeineUI) ui;
-        ui1.getAddSet().setVisible(bean.isSetOperation() && bean.getSetSeine() == null);
-        ui1.getAddDCP().setVisible(bean.isDcpOperation());
-        ui.getExtraActions().setVisible(isUpdatingMode());
-
         VesselActivitySeineReference fishingOperationActivity = getFishingOperationActivity();
         String activity6Label = ClientApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(VesselActivitySeineReference.class).toString(fishingOperationActivity);
 
@@ -202,12 +190,39 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, 
     @Override
     protected <U extends OpenDataFormUI<ActivitySeineDto, ActivitySeineReference>> void onModelPropertyChanged(U ui, String propertyName) {
         super.onModelPropertyChanged(ui, propertyName);
+        boolean updateAddDcp = false;
+        boolean updateAddSet = false;
+        boolean updateExtraActions = false;
         switch (propertyName) {
             case PROPERTY_MODIFIED:
+                updateAddDcp = true;
+                updateAddSet = true;
+                break;
             case PROPERTY_VALID:
-                boolean enabled = !isModified() && (isValid() || isHistoricalData());
-                ((ActivitySeineUI) ui).getAddSet().setEnabled(enabled);
-                ((ActivitySeineUI) ui).getAddDCP().setEnabled(enabled);
+                updateAddDcp = true;
+                updateAddSet = true;
+                break;
+            case PROPERTY_EDITING:
+                updateAddDcp = true;
+                updateAddSet = true;
+                break;
+            case PROPERTY_MODE:
+                updateAddDcp = true;
+                updateAddSet = true;
+                updateExtraActions = true;
+        }
+
+        ActivitySeineUI ui1 = (ActivitySeineUI) ui;
+        if (updateAddDcp) {
+            ui1.getAddDCP().setVisible(bean.isDcpOperation());
+            ui1.getAddDCP().setEnabled(ui1.getDelete().isEnabled());
+        }
+        if (updateAddSet) {
+            ui1.getAddSet().setVisible(bean.isSetOperation() && bean.getSetSeine() == null);
+            ui1.getAddSet().setEnabled(ui1.getDelete().isEnabled());
+        }
+        if (updateExtraActions) {
+            ui.getExtraActions().setVisible(isUpdatingMode());
         }
     }
 


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx
@@ -25,13 +25,9 @@
   <import>
     fr.ird.observe.dto.data.longline.ActivityLonglineObsDto
     fr.ird.observe.dto.data.longline.ActivityLonglineObsReference
-    org.nuiton.jaxx.widgets.select.BeanListHeader
   </import>
 
   <ActivityLonglineObsListUIModel id='model'/>
-  <JLabel id="emptyLabel" text='observe.common.ActivityLonglineObsDto.message.nonForTrip'/>
-  <BeanListHeader id='listHeader' labelText='observe.common.ActivityDto.list'/>
-
   <JButton id='showSelectedData'/>
   <JButton id='showOpenData'/>
   <JButton id='openData'/>


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java
@@ -56,6 +56,16 @@ public class ActivityLonglineObsListUIModel extends OpenDataListFormUIModel<Acti
     }
 
     @Override
+    public String getListEmptyLabel() {
+        return t("observe.common.ActivityLonglineObsDto.message.nonForTrip");
+    }
+
+    @Override
+    public String getListLabel() {
+        return t("observe.common.ActivityDto.list");
+    }
+
+    @Override
     public void computeReadMessages(FormUIValidationMessageManager validationManager) {
         if (isAnotherParentOpen()) {
             validationManager.addInfoMessage(n("observe.common.ActivityLonglineObsDto.message.active.found.for.other.trip"));


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx
@@ -19,19 +19,14 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI
-    superGenericType='TripLonglineDto, TripLonglineReference'>
+<fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI superGenericType='TripLonglineDto, TripLonglineReference'>
 
   <import>
     fr.ird.observe.dto.data.longline.TripLonglineDto
     fr.ird.observe.dto.data.longline.TripLonglineReference
-    org.nuiton.jaxx.widgets.select.BeanListHeader
   </import>
 
   <TripLonglineListUIModel id='model'/>
-  <JLabel id="emptyLabel" text='observe.common.TripDto.message.noneForTrip'/>
-  <BeanListHeader id='listHeader' labelText='observe.common.TripDto.list'/>
-
   <JButton id='showSelectedData'/>
   <JButton id='showOpenData'/>
   <JButton id='openData'/>


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java
@@ -54,6 +54,16 @@ public class TripLonglineListUIModel extends OpenDataListFormUIModel<TripLonglin
     }
 
     @Override
+    public String getListEmptyLabel() {
+        return t("observe.common.TripDto.message.noneForTrip");
+    }
+
+    @Override
+    public String getListLabel() {
+        return t("observe.common.TripDto.list");
+    }
+
+    @Override
     public void computeReadMessages(FormUIValidationMessageManager validationManager) {
         validationManager.addInfoMessage(n("observe.common.TripLonglineDto.message.active.found.for.other.program"));
     }


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx
@@ -25,12 +25,9 @@
   <import>
     fr.ird.observe.dto.data.seine.ActivitySeineDto
     fr.ird.observe.dto.data.seine.ActivitySeineReference
-    org.nuiton.jaxx.widgets.select.BeanListHeader
   </import>
 
   <ActivitySeineListUIModel id='model'/>
-  <JLabel id="emptyLabel" text='observe.common.ActivitySeineDto.message.noneForRoute'/>
-  <BeanListHeader id='listHeader' labelText='observe.common.ActivityDto.list'/>
   <JButton id='showSelectedData'/>
   <JButton id='showOpenData'/>
   <JButton id='openData'/>


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java
@@ -56,6 +56,16 @@ public class ActivitySeineListUIModel extends OpenDataListFormUIModel<ActivitySe
     }
 
     @Override
+    public String getListEmptyLabel() {
+        return t("observe.common.ActivitySeineDto.message.noneForRoute");
+    }
+
+    @Override
+    public String getListLabel() {
+        return t("observe.common.ActivityDto.list");
+    }
+
+    @Override
     public void computeReadMessages(FormUIValidationMessageManager validationManager) {
         if (!ObserveClientApplicationContext.applicationDataContext().isOpenRoute()) {
             validationManager.addInfoMessage(n("observe.common.RouteDto.message.no.active.found"));


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx
@@ -25,12 +25,9 @@
   <import>
     fr.ird.observe.dto.data.seine.RouteDto
     fr.ird.observe.dto.data.seine.RouteReference
-    org.nuiton.jaxx.widgets.select.BeanListHeader
   </import>
 
   <RouteListUIModel id='model'/>
-  <JLabel id="emptyLabel" text='observe.common.RouteDto.noneForTrip'/>
-  <BeanListHeader id='listHeader' labelText='observe.common.RouteDto.list'/>
   <JButton id='showSelectedData'/>
   <JButton id='showOpenData'/>
   <JButton id='openData'/>


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java
@@ -56,6 +56,16 @@ public class RouteListUIModel extends OpenDataListFormUIModel<RouteDto, RouteRef
     }
 
     @Override
+    public String getListEmptyLabel() {
+        return t("observe.common.RouteDto.noneForTrip");
+    }
+
+    @Override
+    public String getListLabel() {
+        return t("observe.common.RouteDto.list");
+    }
+
+    @Override
     public void computeReadMessages(FormUIValidationMessageManager validationManager) {
         if (isAnotherParentOpen()) {
             validationManager.addInfoMessage(n("observe.common.RouteDto.message.active.found.for.other.trip"));


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx
@@ -24,12 +24,9 @@
   <import>
     fr.ird.observe.dto.data.seine.TripSeineDto
     fr.ird.observe.dto.data.seine.TripSeineReference
-    org.nuiton.jaxx.widgets.select.BeanListHeader
   </import>
 
   <TripSeineListUIModel id='model'/>
-  <JLabel id="emptyLabel" text='observe.common.TripDto.message.noneForTrip'/>
-  <BeanListHeader id='listHeader' labelText='observe.common.TripDto.list'/>
   <JButton id='showSelectedData'/>
   <JButton id='showOpenData'/>
   <JButton id='openData'/>


=====================================
client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java
+++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java
@@ -54,6 +54,16 @@ public class TripSeineListUIModel extends OpenDataListFormUIModel<TripSeineDto, 
     }
 
     @Override
+    public String getListEmptyLabel() {
+        return t("observe.common.TripDto.message.noneForTrip");
+    }
+
+    @Override
+    public String getListLabel() {
+        return t("observe.common.TripDto.list");
+    }
+
+    @Override
     public void computeReadMessages(FormUIValidationMessageManager validationManager) {
         validationManager.addInfoMessage(n("observe.common.TripSeineDto.message.active.found.for.other.program"));
     }


=====================================
dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java
=====================================
--- a/dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java
+++ b/dto/src/test/java/fr/ird/observe/spi/dto/DtoModuleHelperTest.java
@@ -123,6 +123,11 @@ public class DtoModuleHelperTest {
         Class<R> referenceType = typeContext.toReferenceType();
         Assert.assertNotNull(referenceType);
 
+        Class<? extends ReferentialDto> aClass = DtoModuleHelper.toReferentialDtoType(referenceType);
+        Assert.assertNotNull(aClass);
+        Assert.assertEquals(dtoType, aClass);
+
+
         ReferentialDtoReferenceBinder<D, R> referenceBinder = typeContext.toReferenceBinder();
         Assert.assertNotNull(referenceBinder);
 
@@ -170,9 +175,12 @@ public class DtoModuleHelperTest {
             referenceCount.increment();
             expectedNull = false;
 
+            Class<? extends DataDto> aClass = DtoModuleHelper.toDataDtoType(referenceType);
+            Assert.assertNotNull(aClass);
+            Assert.assertEquals(dtoType, aClass);
+
         } else {
             expectedNull = true;
-
         }
 
         Assert.assertEquals(expectedNull, referenceBinder == null);
@@ -183,10 +191,8 @@ public class DtoModuleHelperTest {
             R r = typeContext.newReferenceInstance(ReferentialLocale.FR);
             Assert.assertNotNull(r);
         }
-
     }
 
-
     private <D extends DataDto> void fromDataForm(Class<D> dtoType, MutableInt formCount) {
 
         Optional<FormDefinition<D>> typeContext = DtoModuleHelper.fromDataForm(dtoType);
@@ -200,7 +206,6 @@ public class DtoModuleHelperTest {
 
             // check
         }
-
     }
 
     private void assertCommonModel(CommonDtoModelDefinition model) {



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

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

    

Tony CHEMIT

tags

participants (1)