Author: tchemit Date: 2014-01-23 12:35:27 +0100 (Thu, 23 Jan 2014) New Revision: 1523 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1523 Log: fixes #4196: [TECH] Requ?\195?\170te d'acc?\195?\168s au r?\195?\169f?\195?\169rentiel Personne Modified: trunk/src/site/rst/referential.rst trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties Modified: trunk/src/site/rst/referential.rst =================================================================== --- trunk/src/site/rst/referential.rst 2014-01-23 11:01:50 UTC (rev 1522) +++ trunk/src/site/rst/referential.rst 2014-01-23 11:35:27 UTC (rev 1523) @@ -161,7 +161,6 @@ ------------------------------- :: - SELECT DISTINCT p.id, p.lastname, @@ -178,7 +177,7 @@ :projectMemberProfilId, :userProfilId ) - AND p.department.code LIKE 'PDG-%' + AND p.department.code LIKE concat(:departementPrefixCode , '%') Paramètres : @@ -187,6 +186,7 @@ - :userProfilId = *UserProfilId.USER* - :statusValidCode = *StatusCode.ENABLE* - :statusTemporaryCode = *StatusCode.TEMPORARY* +- :departementPrefixCode = *UserProfilId.DEPARTEMENT_PREFIX* *État:* Valide. Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2014-01-23 11:01:50 UTC (rev 1522) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2014-01-23 11:35:27 UTC (rev 1523) @@ -351,7 +351,9 @@ "allPersons", "observerProfilId", IntegerType.INSTANCE, enumeration.USER_PROFIL_ID_OBSERVER, "projectMemberProfilId", IntegerType.INSTANCE, enumeration.USER_PROFIL_ID_PROJECT_MEMBER, - "userProfilId", IntegerType.INSTANCE, enumeration.USER_PROFIL_ID_USER); + "userProfilId", IntegerType.INSTANCE, enumeration.USER_PROFIL_ID_USER, + "departementPrefixCode", StringType.INSTANCE, enumeration.USER_PROFIL_ID_DEPARTEMENT_PREFIX + ); List<Person> result = Lists.newArrayList(); while (list.hasNext()) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2014-01-23 11:01:50 UTC (rev 1522) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2014-01-23 11:35:27 UTC (rev 1523) @@ -119,6 +119,9 @@ @Value("${UserProfilId.USER}") public final Integer USER_PROFIL_ID_USER = null; + @Value("${UserProfilId.DEPARTEMENT_PREFIX}") + public final String USER_PROFIL_ID_DEPARTEMENT_PREFIX = null; + @Value("${VesselTypeId.SCIENTIFIC_RESEARCH_VESSEL}") public final Integer VESSEL_TYPE_ID_SCIENTIFIC = null; Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2014-01-23 11:01:50 UTC (rev 1522) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2014-01-23 11:35:27 UTC (rev 1523) @@ -851,13 +851,14 @@ :projectMemberProfilId, :userProfilId ) - AND p.department.code LIKE 'PDG-%' + AND p.department.code LIKE concat(:departementPrefixCode , '%') ]]> <query-param name="observerProfilId" type="java.lang.Integer"/> <query-param name="projectMemberProfilId" type="java.lang.Integer"/> <query-param name="userProfilId" type="java.lang.Integer"/> <query-param name="statusValidCode" type="java.lang.String"/> <query-param name="statusTemporaryCode" type="java.lang.String"/> + <query-param name="departementPrefixCode" type="java.lang.String"/> </query> <!-- [REF-04-1] Get one person --> Modified: trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2014-01-23 11:01:50 UTC (rev 1522) +++ trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2014-01-23 11:35:27 UTC (rev 1523) @@ -402,6 +402,8 @@ # (20=observateur volant, 95=Administrateur SIH) -> L'avantage du 20 est qu'il est inactif (=20), donc plus facilement detectable PersonId.UNKNOWN_RECORDER_PERSON=20 +UserProfilId.DEPARTEMENT_PREFIX=PDG- + # 181=PDG-RBE (à confirmer par Vincent) DepartmentId.UNKNOWN_RECORDER_DEPARTMENT=181