Merge branch 'master' into dist/eole/2.7.2/master

This commit is contained in:
2023-05-16 17:23:10 +02:00

View File

@@ -166,18 +166,19 @@ class ReportController extends AbstractController
$st=clone $breakday->getStart();
while($st<$breakday->getEnd()) {
$idday=$st->format("Ymd");
$tmp["events"][$idday]["allday"]=true;
$tmp["events"][$idday]["colorday"]="#6c7a89";
$tmp["events"][$idday]["descriptionday"]="Jour Férié";
$tmp["events"][$idday]["events"][-2000]["allday"]=true;
$tmp["events"][$idday]["events"][-2000]["colorday"]="#6c7a89";
$tmp["events"][$idday]["events"][-2000]["descriptionday"]="Jour Férié";
$st->add(new \DateInterval('P1D'));
}
}
array_push($tbevents,$tmp);
}
}
//dump($tbevents);
if($request->query->get('fgprint')) {
$render = $this->renderView('Report/synthese.html.twig',[
"useheader" => true,