Commit 0984331e authored by PECQUOT's avatar PECQUOT
Browse files

[fix] RulePrecondQualUIHandler: adjust preconditioned qualitative values...


[fix] RulePrecondQualUIHandler: adjust preconditioned qualitative values double list size (Mantis #51128)
[fix] Report of issue #50455 (Mantis #51101)
[enh] Change reefdb.transcribingItemType.label.pmfmExtraction default value to REEFDB-PMFM-EXTRACT.PMFM_NM (Mantis #51223)
[fix] Upgrade quadrige3-core to version 3.6.10 (Mantis #51224)
[fix] Extraction: use measurements REMOTE_ID instead of local id (Mantis #51233)
Signed-off-by: PECQUOT's avatarlp1ee9d <ludovic.pecquot@e-is.pro>
parent 5eefb382
## Sprint 87 - v3.9.4
- Pas de mise à jour de modèle
## Sprint 86 - v3.9.3 ## Sprint 86 - v3.9.3
- Pas de mise à jour de modèle - Pas de mise à jour de modèle
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<groupId>fr.ifremer.reefdb</groupId> <groupId>fr.ifremer.reefdb</groupId>
<artifactId>reefdb</artifactId> <artifactId>reefdb</artifactId>
<version>3.9.3-SNAPSHOT</version> <version>3.9.4-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Reef DB</name> <name>Reef DB</name>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<maven.compiler.debug>true</maven.compiler.debug> <maven.compiler.debug>true</maven.compiler.debug>
<!-- Quadrige3 Core version --> <!-- Quadrige3 Core version -->
<quadrige3-core.version>3.6.8</quadrige3-core.version> <quadrige3-core.version>3.6.10-SNAPSHOT</quadrige3-core.version>
<!-- Last ReefDb launcher version --> <!-- Last ReefDb launcher version -->
<launcherVersion>3.0.3</launcherVersion> <launcherVersion>3.0.3</launcherVersion>
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<repositories> <repositories>
<repository> <repository>
<id>reefdb-public-group</id> <id>reefdb-public-group</id>
<url>http://server.e-is.pro/nexus/content/groups/reefdb</url> <url>https://nexus.e-is.pro/nexus/content/groups/reefdb</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
<checksumPolicy>fail</checksumPolicy> <checksumPolicy>fail</checksumPolicy>
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>reefdb-public-group</id> <id>reefdb-public-group</id>
<url>http://server.e-is.pro/nexus/content/groups/reefdb</url> <url>https://nexus.e-is.pro/nexus/content/groups/reefdb</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
<checksumPolicy>fail</checksumPolicy> <checksumPolicy>fail</checksumPolicy>
...@@ -1131,10 +1131,10 @@ ...@@ -1131,10 +1131,10 @@
<distribution.site.repository>scpexe://${distribution.site.host}${distribution.site.path}</distribution.site.repository> <distribution.site.repository>scpexe://${distribution.site.host}${distribution.site.path}</distribution.site.repository>
<distribution.repository.id>eis-nexus-deploy</distribution.repository.id> <distribution.repository.id>eis-nexus-deploy</distribution.repository.id>
<distribution.repository.url>http://server.e-is.pro/nexus/content/repositories/reefdb-releases</distribution.repository.url> <distribution.repository.url>https://nexus.e-is.pro/nexus/content/repositories/reefdb-releases</distribution.repository.url>
<distribution.snapshotRepository.id>eis-nexus-deploy</distribution.snapshotRepository.id> <distribution.snapshotRepository.id>eis-nexus-deploy</distribution.snapshotRepository.id>
<distribution.snapshotRepository.url>http://server.e-is.pro/nexus/content/repositories/reefdb-snapshots</distribution.snapshotRepository.url> <distribution.snapshotRepository.url>https://nexus.e-is.pro/nexus/content/repositories/reefdb-snapshots</distribution.snapshotRepository.url>
<distribution.internet.url>${distribution.repository.url}</distribution.internet.url> <distribution.internet.url>${distribution.repository.url}</distribution.internet.url>
</properties> </properties>
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<repositories> <repositories>
<repository> <repository>
<id>reefdb-public-group</id> <id>reefdb-public-group</id>
<url>http://server.e-is.pro/nexus/content/groups/reefdb</url> <url>https://nexus.e-is.pro/nexus/content/groups/reefdb</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
<checksumPolicy>fail</checksumPolicy> <checksumPolicy>fail</checksumPolicy>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>reefdb-public-group</id> <id>reefdb-public-group</id>
<url>http://server.e-is.pro/nexus/content/groups/reefdb</url> <url>https://nexus.e-is.pro/nexus/content/groups/reefdb</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
<checksumPolicy>fail</checksumPolicy> <checksumPolicy>fail</checksumPolicy>
...@@ -242,12 +242,12 @@ ...@@ -242,12 +242,12 @@
<properties> <properties>
<distribution.repository.id>eis-nexus-deploy</distribution.repository.id> <distribution.repository.id>eis-nexus-deploy</distribution.repository.id>
<distribution.repository.url>http://server.e-is.pro/nexus/content/repositories/reefdb-releases</distribution.repository.url> <distribution.repository.url>https://nexus.e-is.pro/nexus/content/repositories/reefdb-releases</distribution.repository.url>
<distribution.snapshotRepository.id>eis-nexus-deploy</distribution.snapshotRepository.id> <distribution.snapshotRepository.id>eis-nexus-deploy</distribution.snapshotRepository.id>
<distribution.snapshotRepository.url>http://server.e-is.pro/nexus/content/repositories/reefdb-snapshots</distribution.snapshotRepository.url> <distribution.snapshotRepository.url>https://nexus.e-is.pro/nexus/content/repositories/reefdb-snapshots</distribution.snapshotRepository.url>
<distribution.internet.url>http://server.e-is.pro/nexus/content/groups/public</distribution.internet.url> <distribution.internet.url>https://nexus.e-is.pro/nexus/content/groups/public</distribution.internet.url>
</properties> </properties>
</profile> </profile>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>fr.ifremer.reefdb</groupId> <groupId>fr.ifremer.reefdb</groupId>
<artifactId>reefdb</artifactId> <artifactId>reefdb</artifactId>
<version>3.9.3-SNAPSHOT</version> <version>3.9.4-SNAPSHOT</version>
</parent> </parent>
<artifactId>reefdb-core</artifactId> <artifactId>reefdb-core</artifactId>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
# Please fill the missing licenses for dependencies : # Please fill the missing licenses for dependencies :
# #
# #
#Thu Feb 06 14:30:54 CET 2020 #Fri Feb 14 18:32:36 CET 2020
com.oracle--ojdbc7--12.1.0.2.0=OTN license com.oracle--ojdbc7--12.1.0.2.0=OTN license
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License dom4j--dom4j--1.6.1=BSD License
......
...@@ -43,7 +43,7 @@ pmfmId.PIT_ORIGIN=2326 ...@@ -43,7 +43,7 @@ pmfmId.PIT_ORIGIN=2326
UnitId.NO_UNIT=99 UnitId.NO_UNIT=99
TranscribingItemTypeLb.REEFDB_PMFM_NM=REEFDB-PMFM.PMFM_NM TranscribingItemTypeLb.REEFDB_PMFM_NM=REEFDB-PMFM.PMFM_NM
TranscribingItemTypeLb.REEFDB_PMFM_EXTRACTION=REEFDB-PMFM-EXTRACTION.PMFM_NM TranscribingItemTypeLb.REEFDB_PMFM_EXTRACTION=REEFDB-PMFM-EXTRACT.PMFM_NM
############################################ ############################################
# Alternative Taxon Code # # Alternative Taxon Code #
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<where> <where>
<notin field="REF_TAXON_ID"><![CDATA[&taxonNameIds]]></notin> <notin field="REF_TAXON_ID"><![CDATA[&taxonNameIds]]></notin>
</where> </where>
<where operator="AND" group="simple,complete,sinp"> <where operator="OR" group="simple,complete,sinp">
<notin field="TAXON_NAME_ID"><![CDATA[&taxonNameIds]]></notin> <notin field="TAXON_NAME_ID"><![CDATA[&taxonNameIds]]></notin>
</where> </where>
</where> </where>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<!-- BASE SELECT + SURVEY MEASUREMENTS--> <!-- BASE SELECT + SURVEY MEASUREMENTS-->
<select alias="SURVEY_ID" type="number">BASE.SURVEY_ID</select> <select alias="SURVEY_ID" type="number">BASE.SURVEY_ID</select>
<select alias="SAMPLING_OPER_ID" type="number">NULL</select> <select alias="SAMPLING_OPER_ID" type="number">NULL</select>
<select alias="MEAS_ID" type="number">SM.MEAS_ID</select> <select alias="MEAS_ID" type="number">SM.REMOTE_ID</select>
<select alias="TAXON_MEAS_ID" type="number">NULL</select> <select alias="TAXON_MEAS_ID" type="number">NULL</select>
<select alias="IS_SURVEY_MEAS" type="number">1</select> <select alias="IS_SURVEY_MEAS" type="number">1</select>
<select alias="MEAS_INDIV_ID" type="number">SM.MEAS_INDIV_ID</select> <select alias="MEAS_INDIV_ID" type="number">SM.MEAS_INDIV_ID</select>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<subselect alias="SURVEY_ID" type="number">BASE.SURVEY_ID</subselect> <subselect alias="SURVEY_ID" type="number">BASE.SURVEY_ID</subselect>
<subselect alias="SAMPLING_OPER_ID" type="number">NULL</subselect> <subselect alias="SAMPLING_OPER_ID" type="number">NULL</subselect>
<subselect alias="MEAS_ID" type="number">NULL</subselect> <subselect alias="MEAS_ID" type="number">NULL</subselect>
<subselect alias="TAXON_MEAS_ID" type="number">STM.TAXON_MEAS_ID</subselect> <subselect alias="TAXON_MEAS_ID" type="number">STM.REMOTE_ID</subselect>
<subselect alias="IS_SURVEY_MEAS" type="number">1</subselect> <subselect alias="IS_SURVEY_MEAS" type="number">1</subselect>
<subselect alias="MEAS_INDIV_ID" type="number">STM.TAXON_MEAS_INDIV_ID</subselect> <subselect alias="MEAS_INDIV_ID" type="number">STM.TAXON_MEAS_INDIV_ID</subselect>
<subselect alias="REF_TAXON_ID" type="number">TN.TAXON_NAME_ID</subselect> <subselect alias="REF_TAXON_ID" type="number">TN.TAXON_NAME_ID</subselect>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<subquery> <subquery>
<subselect alias="SURVEY_ID" type="number">BASE.SURVEY_ID</subselect> <subselect alias="SURVEY_ID" type="number">BASE.SURVEY_ID</subselect>
<subselect alias="SAMPLING_OPER_ID" type="number">BASE.SAMPLING_OPER_ID</subselect> <subselect alias="SAMPLING_OPER_ID" type="number">BASE.SAMPLING_OPER_ID</subselect>
<subselect alias="MEAS_ID" type="number">SOM.MEAS_ID</subselect> <subselect alias="MEAS_ID" type="number">SOM.REMOTE_ID</subselect>
<subselect alias="TAXON_MEAS_ID" type="number">NULL</subselect> <subselect alias="TAXON_MEAS_ID" type="number">NULL</subselect>
<subselect alias="IS_SURVEY_MEAS" type="number">0</subselect> <subselect alias="IS_SURVEY_MEAS" type="number">0</subselect>
<subselect alias="MEAS_INDIV_ID" type="number">SOM.MEAS_INDIV_ID</subselect> <subselect alias="MEAS_INDIV_ID" type="number">SOM.MEAS_INDIV_ID</subselect>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<subselect alias="SURVEY_ID" type="number">BASE.SURVEY_ID</subselect> <subselect alias="SURVEY_ID" type="number">BASE.SURVEY_ID</subselect>
<subselect alias="SAMPLING_OPER_ID" type="number">BASE.SAMPLING_OPER_ID</subselect> <subselect alias="SAMPLING_OPER_ID" type="number">BASE.SAMPLING_OPER_ID</subselect>
<subselect alias="MEAS_ID" type="number">NULL</subselect> <subselect alias="MEAS_ID" type="number">NULL</subselect>
<subselect alias="TAXON_MEAS_ID" type="number">SOTM.TAXON_MEAS_ID</subselect> <subselect alias="TAXON_MEAS_ID" type="number">SOTM.REMOTE_ID</subselect>
<subselect alias="IS_SURVEY_MEAS" type="number">0</subselect> <subselect alias="IS_SURVEY_MEAS" type="number">0</subselect>
<subselect alias="MEAS_INDIV_ID" type="number">SOTM.TAXON_MEAS_INDIV_ID</subselect> <subselect alias="MEAS_INDIV_ID" type="number">SOTM.TAXON_MEAS_INDIV_ID</subselect>
<subselect alias="REF_TAXON_ID" type="number">TN.TAXON_NAME_ID</subselect> <subselect alias="REF_TAXON_ID" type="number">TN.TAXON_NAME_ID</subselect>
......
...@@ -54,7 +54,7 @@ reefdb.persistence.checkConstants.enable=true ...@@ -54,7 +54,7 @@ reefdb.persistence.checkConstants.enable=true
#quadrige3.persistence.jdbc.batch-size=10000 #quadrige3.persistence.jdbc.batch-size=10000
#quadrige3.persistence.hibernate.showSql=true #quadrige3.persistence.hibernate.showSql=true
synchro.import.jdbc.url=jdbc:oracle:thin:@192.168.0.6:1521:ORCL synchro.import.jdbc.url=jdbc:oracle:thin:@EIS-FIXE2:1521:ORCL
#synchro.import.jdbc.url=jdbc:oracle:thin:@server.e-is.pro:1521:xe #synchro.import.jdbc.url=jdbc:oracle:thin:@server.e-is.pro:1521:xe
synchro.import.jdbc.username=Q2_TU synchro.import.jdbc.username=Q2_TU
synchro.import.jdbc.password=${synchro.import.jdbc.username} synchro.import.jdbc.password=${synchro.import.jdbc.username}
......
...@@ -59,7 +59,7 @@ quadrige3.core.test.dataset.additional=datas-hsqldb-pendings.xml ...@@ -59,7 +59,7 @@ quadrige3.core.test.dataset.additional=datas-hsqldb-pendings.xml
#quadrige3.persistence.jdbc.batch-size=10000 #quadrige3.persistence.jdbc.batch-size=10000
#quadrige3.persistence.hibernate.showSql=true #quadrige3.persistence.hibernate.showSql=true
synchro.import.jdbc.url=jdbc:oracle:thin:@192.168.0.6:1521:ORCL synchro.import.jdbc.url=jdbc:oracle:thin:@EIS-FIXE2:1521:ORCL
#synchro.import.jdbc.url=jdbc:oracle:thin:@server.e-is.pro:1521:xe #synchro.import.jdbc.url=jdbc:oracle:thin:@server.e-is.pro:1521:xe
synchro.import.jdbc.username=Q2_TU synchro.import.jdbc.username=Q2_TU
synchro.import.jdbc.password=${synchro.import.jdbc.username} synchro.import.jdbc.password=${synchro.import.jdbc.username}
......
...@@ -225,12 +225,12 @@ ...@@ -225,12 +225,12 @@
<properties> <properties>
<distribution.repository.id>eis-nexus-deploy</distribution.repository.id> <distribution.repository.id>eis-nexus-deploy</distribution.repository.id>
<distribution.repository.url>http://server.e-is.pro/nexus/content/repositories/reefdb-releases</distribution.repository.url> <distribution.repository.url>https://nexus.e-is.pro/nexus/content/repositories/reefdb-releases</distribution.repository.url>
<distribution.snapshotRepository.id>eis-nexus-deploy</distribution.snapshotRepository.id> <distribution.snapshotRepository.id>eis-nexus-deploy</distribution.snapshotRepository.id>
<distribution.snapshotRepository.url>http://server.e-is.pro/nexus/content/repositories/reefdb-snapshots</distribution.snapshotRepository.url> <distribution.snapshotRepository.url>https://nexus.e-is.pro/nexus/content/repositories/reefdb-snapshots</distribution.snapshotRepository.url>
<distribution.internet.url>http://server.e-is.pro/nexus/content/groups/public</distribution.internet.url> <distribution.internet.url>https://nexus.e-is.pro/nexus/content/groups/public</distribution.internet.url>
</properties> </properties>
</profile> </profile>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>fr.ifremer.reefdb</groupId> <groupId>fr.ifremer.reefdb</groupId>
<artifactId>reefdb</artifactId> <artifactId>reefdb</artifactId>
<version>3.9.3-SNAPSHOT</version> <version>3.9.4-SNAPSHOT</version>
</parent> </parent>
<artifactId>reefdb-ui-swing</artifactId> <artifactId>reefdb-ui-swing</artifactId>
......
...@@ -277,7 +277,8 @@ public class ExportSynchroAction extends AbstractReloadCurrentScreenAction { ...@@ -277,7 +277,8 @@ public class ExportSynchroAction extends AbstractReloadCurrentScreenAction {
catch (SynchroException se) { catch (SynchroException se) {
serverJobRunning = false; serverJobRunning = false;
serverFailed = true; serverFailed = true;
throw se; throw se; // TODO Dont throw here because the result file has to be downloaded from server
// needDownloadResultAndFinish = true;
} }
} else { } else {
needDownloadResultAndFinish = true; needDownloadResultAndFinish = true;
......
...@@ -61,7 +61,8 @@ public class RulePrecondQualUIHandler ...@@ -61,7 +61,8 @@ public class RulePrecondQualUIHandler
initTable(); initTable();
initBeanList(rulePrecondQualUI.getUsedRuleQVDoubleList(), null, new ArrayList<>()); // adjust double list size (Mantis #51128)
initBeanList(rulePrecondQualUI.getUsedRuleQVDoubleList(), null, new ArrayList<>(), 100);
rulePrecondQualUI.getUsedRuleQVDoubleList().getHandler().addAdditionalControls(); rulePrecondQualUI.getUsedRuleQVDoubleList().getHandler().addAdditionalControls();
initListeners(); initListeners();
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
fr.ifremer.reefdb.ui.swing.content.ReefDbMainUI fr.ifremer.reefdb.ui.swing.content.ReefDbMainUI
fr.ifremer.quadrige3.ui.swing.ApplicationUI fr.ifremer.quadrige3.ui.swing.ApplicationUI
fr.ifremer.quadrige3.ui.swing.ApplicationUIUtil fr.ifremer.quadrige3.ui.swing.ApplicationUIUtil
fr.ifremer.quadrige3.ui.swing.plaf.WaitBlockingLayerUI fr.ifremer.quadrige3.ui.swing.plaf.ComponentBlockingLayerUI
fr.ifremer.reefdb.ui.swing.content.observation.survey.SurveyDetailsTabUI fr.ifremer.reefdb.ui.swing.content.observation.survey.SurveyDetailsTabUI
fr.ifremer.reefdb.ui.swing.content.observation.survey.measurement.SurveyMeasurementsTabUI fr.ifremer.reefdb.ui.swing.content.observation.survey.measurement.SurveyMeasurementsTabUI
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<ObservationUIModel id='model' initializer='getContextValue(ObservationUIModel.class)'/> <ObservationUIModel id='model' initializer='getContextValue(ObservationUIModel.class)'/>
<ReefDbHelpBroker id='broker' constructorParams='"reefdb.home.help"'/> <ReefDbHelpBroker id='broker' constructorParams='"reefdb.home.help"'/>
<WaitBlockingLayerUI id='surveyBlockLayer'/> <ComponentBlockingLayerUI id='surveyBlockLayer'/>
<script><![CDATA[ <script><![CDATA[
......
...@@ -31,6 +31,24 @@ ...@@ -31,6 +31,24 @@
</properties> </properties>
<body> <body>
<release version="3.9.4" date="2020-02-27" description="Stable release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51128">
RulePrecondQualUIHandler: adjust preconditioned qualitative values double list size
</action>
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51101">
Report of issue #50455
</action>
<action dev="ludovic.pecquot@e-is.pro" type="add" issue="51223">
Change reefdb.transcribingItemType.label.pmfmExtraction default value to REEFDB-PMFM-EXTRACT.PMFM_NM
</action>
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51224">
Upgrade quadrige3-core to version 3.6.10
</action>
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51233">
Extraction: use measurements REMOTE_ID instead of local id
</action>
</release>
<release version="3.9.3" date="2020-02-14" description="Stable release"> <release version="3.9.3" date="2020-02-14" description="Stable release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51015"> <action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51015">
Change reefdb.transcribingItemType.label.pmfmExtraction default value to REEFDB-PMFM-EXTRACTION.PMFM_NM Change reefdb.transcribingItemType.label.pmfmExtraction default value to REEFDB-PMFM-EXTRACTION.PMFM_NM
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment