- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-5.x] Problème potentiel dans la gestion du fuseau horaire, pour l'affichage des dates…
by Tony CHEMIT 12 Jun '17

12 Jun '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: ecc6002a by Tony CHEMIT at 2017-06-12T11:32:09+02:00 Problème potentiel dans la gestion du fuseau horaire, pour l'affichage des dates selon le calendrier grégorien (See #769) - - - - - 1 changed file: - entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java Changes: ===================================== entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java ===================================== --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java @@ -47,6 +47,7 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { hibernateExtraConfiguration.put("hibernate.hikari.maximumPoolSize", "10"); hibernateExtraConfiguration.put("hibernate.hikari.autoCommit", "false"); hibernateExtraConfiguration.put("hibernate.hikari.registerMbeans", "true"); + hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.CONNECTION_PROVIDER, "org.hibernate.c3p0.internal.C3P0ConnectionProvider"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_SIZE, "500"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ecc6002a1f44db6082a4421d2b8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ecc6002a1f44db6082a4421d2b8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Sur les opérations (synchro, ...) on ne récupère plus les informations de sécuri…
by Tony CHEMIT 11 Jun '17

11 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 24bd9754 by Tony CHEMIT at 2017-06-11T23:37:44+02:00 Sur les opérations (synchro, ...) on ne récupère plus les informations de sécurité de la base locale (See #781) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java @@ -37,14 +37,14 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.beans.PropertyChangeListener; import java.io.File; import java.util.EnumSet; import java.util.Objects; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import static fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL; import static fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE; @@ -463,7 +463,7 @@ public class ConfigModel extends AdminActionModel { } } - protected void startIncomingSourceModel(AdminUI ui) { + protected void startIncomingSourceModel(AdminUI ui, final ObserveDataSourceInformation previousSourceInfo) { AdminUIModel uiModel = ui.getModel(); @@ -476,7 +476,6 @@ public class ConfigModel extends AdminActionModel { ObserveSwingDataSource previousSource = getPreviousSource(); ObserveDataSourceConfiguration previousSourceConfig = null; - ObserveDataSourceInformation previousSourceInfo = null; EnumSet<DbMode> authorizedModes = uiModel.getIncomingDataSourceMode(); EnumSet<DbMode> modes = EnumSet.noneOf(DbMode.class); @@ -508,7 +507,7 @@ public class ConfigModel extends AdminActionModel { try { previousSourceConfig = previousSource.getConfiguration().clone(); - previousSourceInfo = previousSource.getInformation(); +// previousSourceInfo = previousSource.getInformation(); } catch (CloneNotSupportedException e) { if (log.isErrorEnabled()) { log.error("con not clone previous data configuration", e); @@ -602,15 +601,17 @@ public class ConfigModel extends AdminActionModel { // avant le demarrage du wizard, on ferme toujours la source // en cours d'utilisation + ObserveDataSourceInformation previousSourceInformation = null; if (previousSource != null && previousSource.isOpen()) { + previousSourceInformation = previousSource.getInformation(); if (log.isDebugEnabled()) { log.debug("Close previous source " + previousSource.getLabel()); } doCloseSource(previousSource); } - startIncomingSourceModel(ui); + startIncomingSourceModel(ui, previousSourceInformation); startCentralSourceModel(ui); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/24bd975455e51257d7efc749b69… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/24bd975455e51257d7efc749b69… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Correction script de migration (See #577)
by Tony CHEMIT 11 Jun '17

11 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48dc3db4 by Tony CHEMIT at 2017-06-11T23:19:58+02:00 Correction script de migration (See #577) - - - - - 1 changed file: - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql Changes: ===================================== persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql +++ b/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql @@ -64,7 +64,5 @@ UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHE ALTER TABLE observe_seine.floatingObject ALTER COLUMN objectOperation2 RENAME TO objectOperation; -ALTER TABLE observe_seine.floatingObject RENAME objectOperation2 TO objectOperation; - ALTER TABLE observe_seine.floatingObject ADD CONSTRAINT fk_floatingobject_objectOperation FOREIGN KEY (objectOperation) REFERENCES observe_seine.objectOperation(topiaid); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/48dc3db45192227569115a47fe4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/48dc3db45192227569115a47fe4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/i18n
by Tony CHEMIT 11 Jun '17

11 Jun '17

Tony CHEMIT pushed new branch feature/i18n at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/feature/i18n You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] problème caractères accentués, encodage changé ? (See #729)
by Tony CHEMIT 11 Jun '17

11 Jun '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 42fcc279 by Tony CHEMIT at 2017-06-11T22:27:12+02:00 problème caractères accentués, encodage changé ? (See #729) - - - - - 1 changed file: - topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java Changes: ===================================== topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java ===================================== --- a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java +++ b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/ReplicateTablesAction.java @@ -278,9 +278,10 @@ public class ReplicateTablesAction extends AbstractTablesAction<ReplicateTablesR if (columnValue instanceof String) { String stringValue = (String) columnValue; stringValue = "'" + stringValue.replaceAll("'", "''") + "'"; - if (h2) { - stringValue = "stringencode(" + stringValue + ")"; - } + // Nope this does not work (See # +// if (h2) { +// stringValue = "stringencode(" + stringValue + ")"; +// } statement += ", " + stringValue; continue; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/42fcc279a71e79c5f17cf0aa053… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/42fcc279a71e79c5f17cf0aa053… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve migration script (use common scripts when possible)
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3ce89258 by Tony CHEMIT at 2017-06-09T17:12:49+02:00 improve migration script (use common scripts when possible) - - - - - 30 changed files: - persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql - − persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql - persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql → persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-common.sql - − persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql - persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql → persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-common.sql - − persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql - persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql → persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-common.sql - − persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql - persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql → persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-common.sql - − persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql - persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql → persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-common.sql - − persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql - persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql → persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-common.sql - − persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql - persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql → persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-common.sql - − persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql - persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql → persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-common.sql - − persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql - persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql → persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-common.sql - − persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql - persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql → persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-common.sql - persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql - − persistence/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql - persistence/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql → persistence/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-common.sql - − persistence/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql - persistence/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql → persistence/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-common.sql - − persistence/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql - persistence/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql → persistence/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-common.sql - − persistence/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql - persistence/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql → persistence/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3ce892585591077e79220cb2f10… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3ce892585591077e79220cb2f10… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fix merge from develop-7.x
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4efa256e by Tony CHEMIT at 2017-06-09T16:58:55+02:00 fix merge from develop-7.x - - - - - 27ddfc10 by Tony CHEMIT at 2017-06-09T17:00:13+02:00 Synchro avancée référentiel/marées, écran inutile (See #773) - - - - - 2 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java Changes: ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -151,6 +151,8 @@ observe.type.nonTargetSamples=Muestreos de fauna accesoria observe.type.objectFate=Futuro del objeto observe.type.objectFates=Futuros del objeto observe.type.objectMaterial=Objet flottant Matériel \#TODO +observe.type.objectMaterialHierarchies=Hiérarchies de matériel d'objet flottant \#TODO +observe.type.objectMaterialHierarchy=Hiérarchie de matériel d'objet flottant \#TODO observe.type.objectMaterials=Objet flottant matériaux \#TODO observe.type.objectObservedSpecies=Fauna observada observe.type.objectOperation=Operación sobre el objeto ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java @@ -28,22 +28,28 @@ import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; +import fr.ird.observe.application.swing.ui.admin.consolidate.ConsolidateUI; +import fr.ird.observe.application.swing.ui.admin.export.ExportUI; import fr.ird.observe.application.swing.ui.admin.resume.ShowResumeUI; import fr.ird.observe.application.swing.ui.admin.save.SaveLocalUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; +import fr.ird.observe.application.swing.ui.admin.validate.ValidateUI; +import java.awt.Component; +import java.util.Arrays; +import java.util.Date; +import javax.swing.Icon; +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.border.TitledBorder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUtil; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import javax.swing.Icon; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.border.TitledBorder; -import java.awt.Component; -import java.util.Arrays; -import java.util.Date; import static org.nuiton.i18n.I18n.t; @@ -225,11 +231,74 @@ public class AdminUIHandler implements UIHandler<AdminUI> { } + if (oldStep != null && oldStep.ordinal() < AdminStep.REFERENTIAL_SYNCHRONIZE.ordinal() && newStep == AdminStep.REFERENTIAL_SYNCHRONIZE) { + + if (ui.getModel().getStepState(AdminStep.REFERENTIAL_SYNCHRONIZE) == WizardState.PENDING) { + ReferentialSynchroUI tabUI = (ReferentialSynchroUI) ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.DATA_SYNCHRONIZE.ordinal() && newStep == AdminStep.DATA_SYNCHRONIZE) { + + if (ui.getModel().getStepState(AdminStep.DATA_SYNCHRONIZE) == WizardState.PENDING) { + DataSynchroUI tabUI = (DataSynchroUI) ui.getStepUI(AdminStep.DATA_SYNCHRONIZE); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.CONSOLIDATE.ordinal() && newStep == AdminStep.CONSOLIDATE) { + + if (ui.getModel().getStepState(AdminStep.CONSOLIDATE) == WizardState.PENDING) { + ConsolidateUI tabUI = (ConsolidateUI) ui.getStepUI(AdminStep.CONSOLIDATE); + tabUI.getStartButton().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.SYNCHRONIZE.ordinal() && newStep == AdminStep.SYNCHRONIZE) { + + if (ui.getModel().getStepState(AdminStep.SYNCHRONIZE) == WizardState.PENDING) { + SynchronizeUI tabUI = (SynchronizeUI) ui.getStepUI(AdminStep.SYNCHRONIZE); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.VALIDATE.ordinal() && newStep == AdminStep.VALIDATE) { + + if (ui.getModel().getStepState(AdminStep.VALIDATE) == WizardState.PENDING) { + ValidateUI tabUI = (ValidateUI) ui.getStepUI(AdminStep.VALIDATE); + tabUI.getStartButton().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.SAVE_LOCAL.ordinal() && newStep == AdminStep.SAVE_LOCAL) { + + if (ui.getModel().getStepState(AdminStep.SAVE_LOCAL) == WizardState.PENDING) { + SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.EXPORT_DATA.ordinal() && newStep == AdminStep.EXPORT_DATA) { + + if (ui.getModel().getStepState(AdminStep.EXPORT_DATA) == WizardState.PENDING) { + ExportUI tabUI = (ExportUI) ui.getStepUI(AdminStep.EXPORT_DATA); + tabUI.getPrepareAction().doClick(); + } + + } + if (c != null && c.getStep() == AdminStep.SAVE_LOCAL) { // on met a jour le descriptif - SaveLocalUI saveUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); - saveUI.getHandler().updateText(); + SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); + tabUI.getHandler().updateText(); } if (c != null && c.getStep() == AdminStep.SHOW_RESUME) { @@ -259,7 +328,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { /** * Call back lorsque l'état du modèle a changé. - * + * <p> * Ici, on va rendre accessible (ou pas) les onglets selon l'état du modèle. * * @param newState le nouvel état. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/04e1611642041865902d1fa1c4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/04e1611642041865902d1fa1c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch master-7.x
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT deleted branch master-7.x at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch develop-7.x
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT deleted branch develop-7.x at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: prepare version 7.0 init dev states
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf7af55d by Tony CHEMIT at 2017-06-09T13:24:32+02:00 prepare version 7.0 init dev states - - - - - 7bec2b33 by Tony CHEMIT at 2017-06-09T13:24:32+02:00 transformation de ObjectOperation et suppression de ObjectFate - - - - - 95c465a4 by Tony CHEMIT at 2017-06-09T13:24:32+02:00 Fix migrate dbs - - - - - 24a8ad38 by Tony CHEMIT at 2017-06-09T13:24:32+02:00 Add ObjectMaterial referential (See #577) - - - - - 3c7bdbbf by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add FloatingObjectPart data (See #577) - - - - - a3fcb665 by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add FloatingObjectPart ui (See #577) - - - - - d956dca7 by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Remove dcp fields (See #711) - - - - - ff689c2e by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add SpeciesGroupRelease referentials (See #612) - - - - - 84b2f01e by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add NonTargetCatchReleased data (See #612) - - - - - 03d529b6 by Tony CHEMIT at 2017-06-09T13:27:25+02:00 Add NonTargetCatchReleased ui (See #612) - - - - - 76c69f07 by Tony CHEMIT at 2017-06-09T13:27:25+02:00 Fix migration scripts for pg (See #612) - - - - - 04e16116 by Tony CHEMIT at 2017-06-09T13:30:24+02:00 realign pom to develop git branch - - - - - 30 changed files: - .gitlab-ci.yml - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - + application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchReleasedDecorator.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/pom.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9efd24a096e9df575774ff7890… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9efd24a096e9df575774ff7890… You're receiving this email because of your account on gitlab.com.

1 0