branch develop updated (991ebd6 -> 3dfd23a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 991ebd6 fixes #6964: La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner Merge branch 'feature/6964' into develop new b0d853e passage sur topia en snapshot pour la generation des index new 4bcfa9b refs #6978 ajout icone pour l'action de consolidation des données new 81f61c8 fixes #6978: Menu Action / Calculer les données : ajouter une icône Merge branch 'feature/6978' into develop new c055b4d refs #6977 amélioration du layout new 89245f1 fixes #6977: [PS] Mise en page formulaire Calée / Mesure Merge branch 'feature/6977' into develop new bf27bf0 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne new 3dfd23a fixes #6983: [PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements Merge branch 'feature/6983' into develop The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3dfd23a65fcd785b4002960ab671de668d7a0d9d Merge: 89245f1 bf27bf0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:40:44 2015 +0200 fixes #6983: [PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements Merge branch 'feature/6983' into develop commit bf27bf05812c6ba5a37c3b0172a490c14d33dfe5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:35:58 2015 +0200 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne commit 89245f1410ba109db86e1d6de552423729e1af15 Merge: 81f61c8 c055b4d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:25:37 2015 +0200 fixes #6977: [PS] Mise en page formulaire Calée / Mesure Merge branch 'feature/6977' into develop commit c055b4d040139820fe4e1bb48c52a6c7ac1fa15f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:25:34 2015 +0200 refs #6977 amélioration du layout commit 81f61c882c9017d1000a269b47b223bdeb6c7529 Merge: b0d853e 4bcfa9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:13:03 2015 +0200 fixes #6978: Menu Action / Calculer les données : ajouter une icône Merge branch 'feature/6978' into develop commit 4bcfa9b357b59b085575531b88c641b6772d9c11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:13:00 2015 +0200 refs #6978 ajout icone pour l'action de consolidation des données commit b0d853e9e7c44591cd01b013ac872534bb2232b0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:07:31 2015 +0200 passage sur topia en snapshot pour la generation des index Summary of changes: .../DataSourceMigrationForVersion_4_0_RC3.java | 5 +- .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 1 + .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 1 + .../src/main/filters/observe-ui.properties | 1 + .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 72 ++++++++++++---------- pom.xml | 2 +- 6 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql create mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b0d853e9e7c44591cd01b013ac872534bb2232b0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:07:31 2015 +0200 passage sur topia en snapshot pour la generation des index --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c00c21f..097c281 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> - <topiaVersion>2.9.5.1</topiaVersion> + <topiaVersion>2.10-SNAPSHOT</topiaVersion> <jaxxVersion>2.23</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4bcfa9b357b59b085575531b88c641b6772d9c11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:13:00 2015 +0200 refs #6978 ajout icone pour l'action de consolidation des données --- observe-swing/src/main/filters/observe-ui.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-swing/src/main/filters/observe-ui.properties b/observe-swing/src/main/filters/observe-ui.properties index 3f20f51..c773355 100644 --- a/observe-swing/src/main/filters/observe-ui.properties +++ b/observe-swing/src/main/filters/observe-ui.properties @@ -92,6 +92,7 @@ icon.action.data-calcule=action-data-calcule.png icon.action.numbereditor-reset=action-numbereditor-reset.png icon.action.numbereditor-calculator=action-numbereditor-calculator.png icon.action.config=action-config.png +icon.action.consolidate=action-data-calcule.png icon.action.connected=action-connected.png icon.action.connect_creating=action-connect_creating.png icon.action.connect_untested=action-connect_untested.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 81f61c882c9017d1000a269b47b223bdeb6c7529 Merge: b0d853e 4bcfa9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:13:03 2015 +0200 fixes #6978: Menu Action / Calculer les données : ajouter une icône Merge branch 'feature/6978' into develop observe-swing/src/main/filters/observe-ui.properties | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit c055b4d040139820fe4e1bb48c52a6c7ac1fa15f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:25:34 2015 +0200 refs #6977 amélioration du layout --- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 72 ++++++++++++---------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx index 861fc8a..55d4b57 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx @@ -168,40 +168,46 @@ </row> <row> - <cell anchor='west'> - <JLabel id='currentSpeedLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentSpeed' constructorParams='this'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='currentDirectionLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentDirection' constructorParams='this'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='currentMeasureDepthLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentMeasureDepth' constructorParams='this'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='maxGearDepthLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='maxGearDepth' constructorParams='this'/> - </cell> - </row> - <row> <cell columns='2'> - <JCheckBox id='sonarUsed'/> + <Table> + <row> + <cell anchor='west'> + <JLabel id='currentSpeedLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentSpeed' constructorParams='this'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='currentDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentDirection' constructorParams='this'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='currentMeasureDepthLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentMeasureDepth' constructorParams='this'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='maxGearDepthLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='maxGearDepth' constructorParams='this'/> + </cell> + </row> + <row> + <cell columns='2' anchor="west"> + <JCheckBox id='sonarUsed'/> + </cell> + </row> + </Table> </cell> </row> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 89245f1410ba109db86e1d6de552423729e1af15 Merge: 81f61c8 c055b4d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:25:37 2015 +0200 fixes #6977: [PS] Mise en page formulaire Calée / Mesure Merge branch 'feature/6977' into develop .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 72 ++++++++++++---------- 1 file changed, 39 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bf27bf05812c6ba5a37c3b0172a490c14d33dfe5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:35:58 2015 +0200 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne --- .../migration/versions/DataSourceMigrationForVersion_4_0_RC3.java | 5 ++++- .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 1 + .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index e34b5b6..b8e7dec 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -42,8 +42,12 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse boolean showProgression) throws TopiaException { + // See https://forge.codelutin.com/issues/6964 addMissingForeignKeys(tx, queries); + // See https://forge.codelutin.com/issues/6983 + loadScript("update-senne-gear-usedInTrip"); + } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC3 { @@ -206,7 +210,6 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse "AND indisprimary = FALSE;"; PreparedStatement ps = connection.prepareStatement(sql); ps.setInt(1, oid); -// ps.setString(2, String.valueOf(attNum)); try { ResultSet set = ps.executeQuery(); diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql new file mode 100644 index 0000000..cbf6f71 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql @@ -0,0 +1 @@ +UPDATE observe_seine.gearusefeatures SET usedintrip = true WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql new file mode 100644 index 0000000..cbf6f71 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql @@ -0,0 +1 @@ +UPDATE observe_seine.gearusefeatures SET usedintrip = true WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3dfd23a65fcd785b4002960ab671de668d7a0d9d Merge: 89245f1 bf27bf0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:40:44 2015 +0200 fixes #6983: [PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements Merge branch 'feature/6983' into develop .../migration/versions/DataSourceMigrationForVersion_4_0_RC3.java | 5 ++++- .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 1 + .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm