hqlParams.elevesEnseignant = elevesEnseignant
}
- if (criteres.dateDebut != null) {
- hqlFromPunition += ' and punition.date >= :dateDebut'
- hqlParams['dateDebut'] = criteres.dateDebut
- }
-
- if (criteres.dateFin != null) {
- hqlFromPunition += ' and punition.date <= :dateFin'
- hqlParams['dateFin'] = criteres.dateFin
- }
-
if ((criteres.classes != null) && (criteres.classes.size() > 0)) {
List<Personne> elevesClasse = scolariteService.findAllPersonneEleveForStructure(
securiteSession,
}
}
- if ((criteres.eleves != null) && (criteres.eleves.size() > 0)) {
- hqlFromPunition += ' and eleve in (:eleves)'
- hqlParams['eleves'] = criteres.eleves
- }
-
- if ((criteres.responsables != null) && (criteres.responsables.size() > 0)) {
- hqlFromPunition += ' and punition.censeur in (:responsables)'
- hqlParams['responsables'] = criteres.responsables
- }
-
- if ((criteres.typesPunition != null) && (criteres.typesPunition.size() > 0)) {
- hqlFromPunition += ' and punition.typePunition in (:typesPunition)'
- hqlParams['typesPunition'] = criteres.typesPunition
- }
-
- if (criteres.effectue != null) {
- hqlFromPunition += ' and punition.effectue = :effectue'
- hqlParams['effectue'] = criteres.effectue
- }
+ hqlFromPunition = ajouteFiltresParCriteresSimples(hqlFromPunition, hqlParams, criteres)
String hqlCount = hqlFromPunition
.replace(
return result
}
+ private String ajouteFiltresParCriteresSimples(String hqlFromPunition,
+ Map hqlParams,
+ Map criteres) {
+ if (criteres.dateDebut != null) {
+ hqlFromPunition += ' and punition.date >= :dateDebut'
+ hqlParams['dateDebut'] = criteres.dateDebut
+ }
+
+ if (criteres.dateFin != null) {
+ hqlFromPunition += ' and punition.date <= :dateFin'
+ hqlParams['dateFin'] = criteres.dateFin
+ }
+
+ if ((criteres.eleves != null) && (criteres.eleves.size() > 0)) {
+ hqlFromPunition += ' and eleve in (:eleves)'
+ hqlParams['eleves'] = criteres.eleves
+ }
+
+ if ((criteres.responsables != null) && (criteres.responsables.size() > 0)) {
+ hqlFromPunition += ' and punition.censeur in (:responsables)'
+ hqlParams['responsables'] = criteres.responsables
+ }
+
+ if ((criteres.typesPunition != null) && (criteres.typesPunition.size() > 0)) {
+ hqlFromPunition += ' and punition.typePunition in (:typesPunition)'
+ hqlParams['typesPunition'] = criteres.typesPunition
+ }
+
+ if (criteres.effectue != null) {
+ hqlFromPunition += ' and punition.effectue = :effectue'
+ hqlParams['effectue'] = criteres.effectue
+ }
+ hqlFromPunition
+ }
+
private String getNomCompletChampOrdre(String champOrdre) {
String champ
switch (champOrdre) {