branch develop updated (c4c7538 -> 58ee060)
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 c4c7538 [PS] La fonction de calcul semble ne plus calculer (termine #7286) Merge branch 'feature/7286' into develop new 316f320 Utilisation de la taille de la liste pour le réagencement des ids de la palangre et non pas de la taille du modèle de table (refs #7328) new f46781d On regénère les haulingId poru les opérations de pêche palangre quand c'est possible (refs #7328) new 58ee060 [ObServeLL] problème ID de virage négatif (termine #7328) Merge branch 'feature/7328' into develop The 3 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 58ee060e651aa74100371a1f9c7481c64177ac12 Merge: c4c7538 f46781d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 08:25:51 2015 +0200 [ObServeLL] problème ID de virage négatif (termine #7328) Merge branch 'feature/7328' into develop commit f46781d2228f77a52fe9b63928c0fdbdd5cf65ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 08:25:48 2015 +0200 On regénère les haulingId poru les opérations de pêche palangre quand c'est possible (refs #7328) commit 316f3204009d5c73a8d8b65c93d0523469f641e6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 07:54:08 2015 +0200 Utilisation de la taille de la liste pour le réagencement des ids de la palangre et non pas de la taille du modèle de table (refs #7328) Summary of changes: .../DataSourceMigrationForVersion_4_0_1.java | 54 ++++++++++++++++++++++ .../LonglineCompositionTableModelSupport.java | 21 ++++++++- 2 files changed, 73 insertions(+), 2 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 316f3204009d5c73a8d8b65c93d0523469f641e6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 07:54:08 2015 +0200 Utilisation de la taille de la liste pour le réagencement des ids de la palangre et non pas de la taille du modèle de table (refs #7328) --- .../LonglineCompositionTableModelSupport.java | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java index f248f57..5817a98 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java @@ -24,6 +24,8 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.entities.longline.LonglineCompositionEntity; import fr.ird.observe.ui.util.table.EditableTableModelSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; @@ -36,6 +38,9 @@ import java.util.List; */ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity & LonglineCompositionEntity> extends EditableTableModelSupport<E> { + /** Logger. */ + private static final Log log = LogFactory.getLog(LonglineCompositionTableModelSupport.class); + private static final long serialVersionUID = 1L; private final LonglineDetailCompositionUIModel model; @@ -74,12 +79,21 @@ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity boolean generateHaulingIds = isGenerateHaulingIds(); boolean haulingdirectionSameAsSettings = model.isHaulingdirectionSameAsSettings(); - int rowCount = getRowCount(); + int dataSize = data.size(); + + if (log.isInfoEnabled()) { + log.info("Will rearrange ids for " + dataSize + " data on " + this); + log.info("generateHaulingIds ? " + generateHaulingIds); + log.info("haulingdirectionSameAsSettings ? " + haulingdirectionSameAsSettings); + } int index = 1; for (E e : data) { + if (log.isInfoEnabled()) { + log.info("SettingIdentifier : " + index); + } e.setSettingIdentifier(index); if (generateHaulingIds) { @@ -89,9 +103,12 @@ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity if (haulingdirectionSameAsSettings) { haulingId = index; } else { - haulingId = rowCount - index + 1; + haulingId = dataSize - index + 1; } + if (log.isInfoEnabled()) { + log.info("HaulingIdentifier : " + haulingId); + } e.setHaulingIdentifier(haulingId); } -- 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 f46781d2228f77a52fe9b63928c0fdbdd5cf65ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 08:25:48 2015 +0200 On regénère les haulingId poru les opérations de pêche palangre quand c'est possible (refs #7328) --- .../DataSourceMigrationForVersion_4_0_1.java | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java index 0d582e2..f15ec4b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java @@ -40,7 +40,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; /** * Created on 6/8/15. @@ -72,6 +74,58 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv // See https://forge.codelutin.com/issues/7350 migrateGearUseFeaturesSeineMeasurementIds(tx, queries); + // See https://forge.codelutin.com/issues/7328 + recomputeLonglineHaulingIds(tx, queries); + + } + + protected void recomputeLonglineHaulingIds(TopiaContextImplementor tx, List<String> queries) { + + class SetData { + + String id; + + int totalSectionsCount; + + int basketsPerSectionCount; + + int branchlinesPerBasketCount; + + } + + // L'ensemble des opérations de pêche où l'on doit regénerer les générer les haulingIds + final Set<SetData> setIds = new LinkedHashSet<SetData>(); + tx.getHibernate().doWork(new Work() { + + @Override + public void execute(Connection connection) throws SQLException { + String sql = "SELECT topiaId, totalSectionsCount, basketsPerSectionCount, branchlinesPerBasketCount FROM OBSERVE_LONGLINE.SET WHERE HAULINGBREAKS = 0 AND haulingDirectionSameAsSetting IS FALSE;"; + PreparedStatement ps = connection.prepareStatement(sql); + try { + ResultSet set = ps.executeQuery(); + while (set.next()) { + SetData setData = new SetData(); + setData.id = set.getString(1); + setData.totalSectionsCount = set.getInt(2); + setData.basketsPerSectionCount = set.getInt(3); + setData.branchlinesPerBasketCount = set.getInt(4); + setIds.add(setData); + } + } catch (Exception e) { + throw new SQLException("Could not obtain SET data", e); + } finally { + ps.close(); + } + } + }); + + for (SetData setData : setIds) { + + queries.add(String.format("UPDATE OBSERVE_LONGLINE.SECTION SET haulingIdentifier = (%s - settingIdentifier + 1 ) WHERE set = '%s'", setData.totalSectionsCount, setData.id)); + queries.add(String.format("UPDATE OBSERVE_LONGLINE.BASKET SET haulingIdentifier = (%s - settingIdentifier + 1 ) WHERE section IN ( SELECT topiaid FROM OBSERVE_LONGLINE.SECTION WHERE set ='%s' )", setData.basketsPerSectionCount, setData.id)); + queries.add(String.format("UPDATE OBSERVE_LONGLINE.BRANCHLINE SET haulingIdentifier = (%s - settingIdentifier + 1 ) WHERE basket IN ( SELECT distinct b.topiaid FROM OBSERVE_LONGLINE.BASKET b, OBSERVE_LONGLINE.SECTION s WHERE b.section = s.topiaid AND s.set = '%s' )", setData.branchlinesPerBasketCount, setData.id)); + + } } protected void migrateGearUseFeaturesSeineMeasurementIds(TopiaContextImplementor tx, List<String> queries) { -- 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 58ee060e651aa74100371a1f9c7481c64177ac12 Merge: c4c7538 f46781d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 08:25:51 2015 +0200 [ObServeLL] problème ID de virage négatif (termine #7328) Merge branch 'feature/7328' into develop .../DataSourceMigrationForVersion_4_0_1.java | 54 ++++++++++++++++++++++ .../LonglineCompositionTableModelSupport.java | 21 ++++++++- 2 files changed, 73 insertions(+), 2 deletions(-) -- 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