GitLab

at 2023-07-24T17:32:39+02:00

Ajout via la migration

Mise à jour des fixtures

Ajout dans l'api de méthodes pour lire et écrire une caractéristique de type date

Adaptation des ui pour rendre et éditer des caractéristiques de type date

Merge branch 'feature/issue_2763' into develop
Rajouter un type Date (simple et sans time zone) dans GearCharacteristicType
- Closes #2763

 import fr.ird.observe.dto.ProtectedIdsCommon;

 import fr.ird.observe.dto.referential.common.GearCharacteristicReference;

 import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference;

+import io.ultreia.java4all.i18n.I18n;

+import org.jdesktop.swingx.table.DatePickerCellEditor;

 import org.nuiton.jaxx.widgets.number.NumberCellEditor;

 

 import javax.swing.JTable;

 import javax.swing.event.CellEditorListener;

 import javax.swing.table.TableCellEditor;

 import java.awt.Component;

+import java.text.SimpleDateFormat;

 import java.util.EventObject;

+import java.util.Locale;

 import java.util.Map;

 import java.util.TreeMap;

 

             editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED, NumberCellEditor.newFloatColumnEditor(true));

             editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, JXTableUtil.newInteger4ColumnEditor(false));

             editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_UNSIGNED, NumberCellEditor.newFloatColumnEditor(false));

+            boolean french = I18n.getDefaultLocale().equals(Locale.FRANCE);

+            editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE, new DatePickerCellEditor(new SimpleDateFormat(french ? "dd/MM/yyyy" : "yyyy-MM-dd")));

         }

         return editorsByGearCharacteristicId;

     }

  * #L%

  */

 

+import fr.ird.observe.client.util.table.JXTableUtil;

 import fr.ird.observe.dto.ProtectedIdsCommon;

 import fr.ird.observe.dto.referential.common.GearCharacteristicReference;

 import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference;

         this.renderersByCharacteristicTypeId = new TreeMap<>();

         TableCellRenderer booleanRenderer = table.getDefaultRenderer(Boolean.class);

         renderersByCharacteristicTypeId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN, booleanRenderer);

+        renderersByCharacteristicTypeId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE, JXTableUtil.newDateTableCellRenderer());

     }

 

     @Override

 import javax.swing.JScrollPane;

 import java.util.ArrayList;

 import java.util.List;

+import java.util.Objects;

 

 /**

  * Created on 05/08/2021.

             return new ArrayList<>();

         }

         GearDto gearDto = gearsById.get(gearId);

-        return GearUseFeaturesMeasurementAware.getDefaultGearUseFeaturesMeasurement(gearDto, this::createNewRow);

+        return GearUseFeaturesMeasurementAware.getDefaultGearUseFeaturesMeasurement(Objects.requireNonNull(gearDto), this::createNewRow);

     }

 }

 
     String COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.4";

     String COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.2";

     String COMMON_GEAR_CHARACTERISTIC_TYPE_TEXT = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.1";

+    String COMMON_GEAR_CHARACTERISTIC_TYPE_DATE = "fr.ird.referential.common.GearCharacteristicType#1464000000000#0.7";

     String COMMON_OCEAN_ATLANTIC = "fr.ird.referential.common.Ocean#1239832686151#0.17595105505051245";

     String COMMON_OCEAN_INDIAN = "fr.ird.referential.common.Ocean#1239832686152#0.8325731048817705";

 }
 import io.ultreia.java4all.lang.Strings;

 

 import java.util.Comparator;

+import java.util.Date;

 import java.util.List;

 import java.util.Objects;

 import java.util.function.Supplier;

         if (aValue == null) {

             value = null;

         } else {

-            value = String.valueOf(aValue).trim();

+            if (measure.getGearCharacteristic().getGearCharacteristicType().isDate()) {

+                value = String.valueOf(((Date)aValue).getTime());

+            } else {

+                value = String.valueOf(aValue).trim();

+            }

             if (value.isBlank()) {

                 value = null;

             }

 import org.apache.logging.log4j.LogManager;

 import org.apache.logging.log4j.Logger;

 

+import java.time.Instant;

 import java.util.Arrays;

 import java.util.Collections;

+import java.util.Date;

 import java.util.LinkedHashSet;

 import java.util.Optional;

 import java.util.Set;

         return FLOAT_IDS.contains(getTopiaId());

     }

 

+    default boolean isDate() {

+        return ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE.equals(getTopiaId());

+    }

+

     default Object getTypeValue(Object value) {

         if (value != null && !value.toString().isEmpty()) {

             if (isBoolean()) {

                 value = Float.valueOf(value.toString()).intValue();

             } else if (isFloat()) {

                 value = Float.valueOf(value.toString());

+            } else if (isDate()) {

+                value = Date.from(Instant.ofEpochMilli(Long.parseLong(value.toString())));

             }

         }

         return value;

         executor.addScript("08", "issue-2497");

         // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2725

         executor.addScript("09", "issue-2725");

+        // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2763

+        if (withIds) {

+            executor.addScript("10", "issue-2763");

+            if (isForTck()) {

+                executor.addScript("10", "issue-2763-tck");

+            }

+        }

     }

 

     private void issue2714(MigrationVersionResourceExecutor executor) {

+---

+-- #%L

+-- ObServe Core :: Persistence :: Migration

+-- %%

+-- Copyright (C) 2008 - 2023 IRD, Ultreia.io

+-- %%

+-- This program is free software: you can redistribute it and/or modify

+-- it under the terms of the GNU General Public License as

+-- published by the Free Software Foundation, either version 3 of the

+-- License, or (at your option) any later version.

+--

+-- This program is distributed in the hope that it will be useful,

+-- but WITHOUT ANY WARRANTY; without even the implied warranty of

+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+-- GNU General Public License for more details.

+--

+-- You should have received a copy of the GNU General Public

+-- License along with this program.  If not, see

+-- <http://www.gnu.org/licenses/gpl-3.0.html>.

+-- #L%

+---

+INSERT INTO common.GearCharacteristicType (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, code, uri, homeid, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.common.GearCharacteristicType#${REFERENTIAL_PREFIX}0.7', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 'DATE', null, null, false, 1, 'Date', 'Date', 'Fecha', null, null, null, null, null);

+UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.GearCharacteristicType';
+---

+-- #%L

+-- ObServe Core :: Persistence :: Migration

+-- %%

+-- Copyright (C) 2008 - 2023 IRD, Ultreia.io

+-- %%

+-- This program is free software: you can redistribute it and/or modify

+-- it under the terms of the GNU General Public License as

+-- published by the Free Software Foundation, either version 3 of the

+-- License, or (at your option) any later version.

+--

+-- This program is distributed in the hope that it will be useful,

+-- but WITHOUT ANY WARRANTY; without even the implied warranty of

+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+-- GNU General Public License for more details.

+--

+-- You should have received a copy of the GNU General Public

+-- License along with this program.  If not, see

+-- <http://www.gnu.org/licenses/gpl-3.0.html>.

+-- #L%

+---

+INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}0.11', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '1', null, null, false, 1, 'create date', 'Date de création', 'fecha', null, null, null, null, null, null, 'fr.ird.referential.common.GearCharacteristicType#1464000000000#0.7');

+UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.GearCharacteristic';
 common.dataQuality=5

 common.fpaZone=45

 common.gear=28

-common.gearCharacteristic=26

-common.gearCharacteristicType=6

+common.gearCharacteristic=27

+common.gearCharacteristicType=7

 common.harbour=98

 common.lastUpdateDate=158

 common.lengthLengthParameter=1

 ENTITIES_LIMIT_SIZE=100

 # fr.ird.observe.services.service.referential.ReferentialService

 # fr.ird.observe.services.local.service.referential.DifferentialModelTest

-REFERENTIAL_COUNT=4104
+REFERENTIAL_COUNT=4106

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

Commits:

11 changed files:

Changes: