clone.dateDebut = this.dateDebut.clone()
clone.dateFin = this.dateFin.clone()
- clone.motifIds = new ArrayList(this.motifIds)
- clone.structIds = new ArrayList(this.structIds)
+ clone.motifIds = this.motifIds ? new ArrayList(this.motifIds) : null
+ clone.structIds = this.structIds ? new ArrayList(this.structIds) : null
clone.eleveIds = new ArrayList(this.eleveIds)
- clone.typesResponsables = new ArrayList(this.typesResponsables)
+ clone.typesResponsables = this.typesResponsables ? new ArrayList(this.typesResponsables) : null
clone.absencesValables = this.absencesValables
clone.absencesNonValables = this.absencesNonValables
clone.absencesPrevisionnelles = this.absencesPrevisionnelles
log.info "FindAllInfoForAbsences terminé"
}
-
eleveImpressionInfos = impressionRetardDepartService.findAllInfoRetardDepartEleve(
criteres,
eleveImpressionInfos,
return absencesImpression
}
- public PublipostageCriteresRecherche parseCriteriaRetards(AbsencesPublipostageParams parametresSelectionPublipostage) {
- PublipostageCriteresRecherche result = ParseCriteriaHelper.parseCriteriaCommuns(parametresSelectionPublipostage)
- result.setTousTypes(false)
- result.retards = true
- return result
- }
public PublipostageCriteresRecherche parseCriteriaAbsences(AbsencesPublipostageParams parametresSelectionPublipostage) {
PublipostageCriteresRecherche result = ParseCriteriaHelper.parseCriteriaCommuns(parametresSelectionPublipostage)
result.internat = false
result.retards = false
result.departsAnticipes = false
-
- if (!parametresSelectionPublipostage.typeAbsenceId && parametresSelectionPublipostage.tab == 'retard') {
- result.retards = true
- }
+ result.retards = false
return result
}
parametresSelectionPublipostage.adresseId
)
-
- PublipostageCriteresRecherche criteresAbsences =
- parseCriteriaAbsences(
- parametresSelectionPublipostage
- )
+ // critères pour les absences
+ PublipostageCriteresRecherche criteresAbsences = parseCriteriaAbsences(
+ parametresSelectionPublipostage
+ )
prepareCriteres(
etablissement,
parametresSelectionPublipostage,
typeResponsable)
- eleveImpressionInfos =
- findAllInfoAbsenceRetardDepartPunitionSanction(
- securiteSession,
- etablissement,
- criteresAbsences,
- typeResponsable,
- requetageSelection
- )
+ eleveImpressionInfos = findAllInfoAbsenceRetardDepartPunitionSanction(
+ securiteSession,
+ etablissement,
+ criteresAbsences,
+ typeResponsable,
+ requetageSelection
+ )
return eleveImpressionInfos
}
}
static public void setCriteresPublipostageRetardDepart(BasicCriteresRecherche criteres) {
- criteres?.absencesNonValables = false
- criteres?.absencesValables = false
- criteres?.absencesPrevisionnelles = false
- criteres?.demiPension = false
- criteres?.internat = false
+ criteres.setTousTypes(false)
criteres?.retards = true
criteres?.departsAnticipes = true
}