import org.lilie.services.eliot.applications.scolarite.calendrier.JourFerieInfo
import org.lilie.services.eliot.absences.PreferencesEtablissementAbsences
+import org.lilie.services.eliot.temps.DateUtil
class CalendrierAbsencesService extends CalendrierService {
curseur.add(Calendar.DAY_OF_YEAR, 1)
}
- List<JourFerieInfo> jourFerieInfos = getJourFeriesInfoForPreferenceEtablissement(pref)
+ List<JourFerieInfo> jourFeries = findAllJourFeriesEntreDates(pref, debut, fin)
Calendar calUtil = Calendar.getInstance()
- jourFerieInfos.each {JourFerieInfo jourFerieInfo ->
+ jourFeries.each {JourFerieInfo jourFerieInfo ->
calUtil.clear()
calUtil.setTime(jourFerieInfo.date)
}
return result
}
+
+
+ private List<JourFerieInfo> findAllJourFeriesEntreDates(PreferencesEtablissementAbsences pref,
+ Date debut,
+ Date fin) {
+
+ List<JourFerieInfo> allJourFeries = getJourFeriesInfoForPreferenceEtablissement(pref)
+
+ debut = DateUtil.setDebutJour(debut)
+ fin = DateUtil.setFinJour(fin)
+
+ List<JourFerieInfo> jourFeries = allJourFeries.findAll{it.date.after(debut) && it.date.before(fin)}
+
+ return jourFeries
+ }
}
\ No newline at end of file