...
 
Commits (5)
## Sprint 89 - v3.9.7
- Pas de mise à jour de modèle
## Sprint 88 - v3.9.5 & v3.9.6 ## Sprint 88 - v3.9.5 & v3.9.6
- 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.7-SNAPSHOT</version> <version>3.9.8-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Reef DB</name> <name>Reef DB</name>
......
...@@ -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.7-SNAPSHOT</version> <version>3.9.8-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 :
# #
# #
#Fri Mar 06 16:15:32 CET 2020 #Mon Mar 23 12:33:10 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
......
...@@ -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.7-SNAPSHOT</version> <version>3.9.8-SNAPSHOT</version>
</parent> </parent>
<artifactId>reefdb-ui-swing</artifactId> <artifactId>reefdb-ui-swing</artifactId>
......
...@@ -226,7 +226,6 @@ public class OperationMeasurementsGroupedTableUIHandler ...@@ -226,7 +226,6 @@ public class OperationMeasurementsGroupedTableUIHandler
// remove measurement from old sampling // remove measurement from old sampling
if (oldValue != null) { if (oldValue != null) {
SamplingOperationDTO oldSamplingOperation = (SamplingOperationDTO) oldValue; SamplingOperationDTO oldSamplingOperation = (SamplingOperationDTO) oldValue;
// fixme: il rest edes mesures dans le operation !!!!!!!!!!!!!!
oldSamplingOperation.removeAllIndividualMeasurements(row.getIndividualMeasurements()); oldSamplingOperation.removeAllIndividualMeasurements(row.getIndividualMeasurements());
oldSamplingOperation.setDirty(true); oldSamplingOperation.setDirty(true);
......
package fr.ifremer.reefdb.ui.swing.util; package fr.ifremer.reefdb.ui.swing.util;
/*-
* #%L
* Reef DB :: UI
* $Id:$
* $HeadURL:$
* %%
* Copyright (C) 2014 - 2020 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero 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 Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.awt.Component; import java.awt.Component;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</properties> </properties>
<body> <body>
<release version="3.9.7" date="2020-03-19" description="Stable release"> <release version="3.9.7" date="2020-03-23" description="Stable release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51520"> <action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51520">
Rework the calculation of individual ids on grouped measurements, now use table sorting if possible Rework the calculation of individual ids on grouped measurements, now use table sorting if possible
</action> </action>
......
...@@ -108,26 +108,26 @@ Un déploiement sans modification des scripts de Tomcat est possible : ...@@ -108,26 +108,26 @@ Un déploiement sans modification des scripts de Tomcat est possible :
- Décommenté les parties XML suivantes, et renseigner les attributs XML : ``url``, ``username``, ``password``, ``value`` (``/path/to/config/file``) : - Décommenté les parties XML suivantes, et renseigner les attributs XML : ``url``, ``username``, ``password``, ``value`` (``/path/to/config/file``) :
> <Resource <Resource
> name="quadrige3-ds" name="quadrige3-ds"
> auth="Container" auth="Container"
> type="javax.sql.DataSource" type="javax.sql.DataSource"
> driverClassName="oracle.jdbc.driver.OracleDriver" driverClassName="oracle.jdbc.driver.OracleDriver"
> url="jdbc:oracle:thin:@HOST:1521:INSTANCE" url="jdbc:oracle:thin:@HOST:1521:INSTANCE"
> username="USER" username="USER"
> password="PWD" password="PWD"
> maxActive="20" maxActive="20"
> maxIdle="2" maxIdle="2"
> maxWait="-1" maxWait="-1"
> /> />
>
> <!-- Use to set the configuration file path (default path is: <WAR>/WEB-INF/classes/synchro-server.config) --> <!-- Use to set the configuration file path (default path is: <WAR>/WEB-INF/classes/synchro-server.config) -->
> <Environment <Environment
> name="synchro-server.config" name="synchro-server.config"
> type="java.lang.String" type="java.lang.String"
> value="/path/to/config/file" value="/path/to/config/file"
> override="false" override="false"
> /> />
- Reconstruire le fichier ``.war``, puis dployer sous Tomcat comme précédemment (sans modifier les scripts de lancement). - Reconstruire le fichier ``.war``, puis dployer sous Tomcat comme précédemment (sans modifier les scripts de lancement).
......