Commit 3d93bda9 authored by PECQUOT's avatar PECQUOT

[fix] Fix bad code length validation (Mantis #44571)

[fix] Duplicate a grouped measurements row will copy analyst also (Mantis #45054)
[enh] Add a new control rule function: link between 2 qualitative pmfm. In a grouped measurements row, apply the qualitative value preconditions (Mantis #45044)        
[enh] Add a new control rule function: link between a qualitative pmfm and a numerical pmfm. In a grouped measurements row, apply the qualitative/numerical value preconditions (Mantis #45046)
[enh] Jaxx css file renamed to jcss to prevent real css file type detection. Some refactoring and bug fixes

git-svn-id: https://scmforge.ifremer.fr/authscm/lp1ee9d/svn/reefdb/trunk@2358 cd918a83-917d-4a2a-92d7-bc1d03929fc5
parent 89855427
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
# - AL 2.0
# - Affero General Public License (AGPL)
# - Apache 2.0
# - Apache License 2.0
# - Apache License, version 2.0
# - BSD License
# - BSD style
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Development and Distribution License
# - Eclipse Distribution License (EDL), Version 1.0
# - Eclipse Public License (EPL), Version 1.0
# - Eclipse Public License 1.0
# - GNU General Public License, Version 2 with the Classpath Exception
# - GNU Lesser General Public License, Version 2.1
# - HSQLDB License, a BSD open source license
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL)
# - Lesser General Public License (LGPL) v 3.0
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
# - MPL 1.1
# - MPL 2.0 or EPL 1.0
# - New BSD License
# - OTN license
# - Public Domain
# - Similar to Apache License but with the acknowledgment clause removed
# - The Apache Software License, Version 2.0
# - The New BSD License
# - WTFPL
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
#Fri Feb 09 17:30:26 CET 2018
com.oracle--ojdbc7--12.1.0.2.0=OTN license
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
org.hibernate--hibernate-spatial--4.3-20140213=Lesser General Public License (LGPL)
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
# - AL 2.0
# - Affero General Public License (AGPL)
# - Apache 2.0
# - Apache License 2.0
# - Apache License, version 2.0
# - BSD License
# - BSD style
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Development and Distribution License
# - Eclipse Distribution License (EDL), Version 1.0
# - Eclipse Public License (EPL), Version 1.0
# - Eclipse Public License 1.0
# - GNU General Public License, Version 2 with the Classpath Exception
# - GNU Lesser General Public License, Version 2.1
# - HSQLDB License, a BSD open source license
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL)
# - Lesser General Public License (LGPL) v 3.0
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
# - MPL 1.1
# - MPL 2.0 or EPL 1.0
# - New BSD License
# - OTN license
# - Public Domain
# - Similar to Apache License but with the acknowledgment clause removed
# - The Apache Software License, Version 2.0
# - The New BSD License
# - WTFPL
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
#Fri Feb 09 17:30:26 CET 2018
com.oracle--ojdbc7--12.1.0.2.0=OTN license
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
org.hibernate--hibernate-spatial--4.3-20140213=Lesser General Public License (LGPL)
......@@ -38,6 +38,7 @@ public interface ReefDbPmfmDao {
String ALL_PMFMS_CACHE = "all_pmfms";
String PMFM_BY_ID_CACHE = "pmfm_by_id";
String PMFMS_BY_IDS_CACHE = "pmfms_by_ids";
String PMFMS_BY_CRITERIA_CACHE = "pmfms_by_criteria";
/**
* <p>getAllPmfms.</p>
......@@ -69,15 +70,16 @@ public interface ReefDbPmfmDao {
/**
* <p>findPmfms.</p>
*
* @param parameterCode a {@link java.lang.String} object.
* @param methodId a {@link java.lang.Integer} object.
* @param fractionId a {@link java.lang.Integer} object.
* @param matrixId a {@link java.lang.Integer} object.
* @param pmfmName a {@link java.lang.String} object.
* @param statusCodes a {@link java.util.List} object.
* @param parameterCode a {@link String} object.
* @param matrixId a {@link Integer} object.
* @param fractionId a {@link Integer} object.
* @param methodId a {@link Integer} object.
* @param pmfmName a {@link String} object.
* @param statusCodes a {@link List} object.
* @return a {@link java.util.List} object.
*/
List<PmfmDTO> findPmfms(String parameterCode, Integer methodId, Integer fractionId, Integer matrixId, String pmfmName, List<String> statusCodes);
@Cacheable(value = PMFMS_BY_CRITERIA_CACHE)
List<PmfmDTO> findPmfms(String parameterCode, Integer matrixId, Integer fractionId, Integer methodId, String pmfmName, List<String> statusCodes);
/**
* <p>savePmfms.</p>
......
package fr.ifremer.reefdb.dao.referential.transcribing;
import fr.ifremer.quadrige3.core.dao.referential.transcribing.TranscribingItemDaoImpl;
import org.hibernate.SessionFactory;
import org.springframework.stereotype.Repository;
/**
* @author peck7 on 02/11/2017.
*/
@Repository("reefDbTranscribingItemDao")
public class ReefDbTranscribingItemDaoImpl extends TranscribingItemDaoImpl implements ReefDbTranscribingItemDao {
public ReefDbTranscribingItemDaoImpl(SessionFactory sessionFactory) {
super(sessionFactory);
}
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.