diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/schedule-2.0/src/Controller/ReportController.php
index de13693..e5f8fc7 100755
--- a/src/schedule-2.0/src/Controller/ReportController.php
+++ b/src/schedule-2.0/src/Controller/ReportController.php
@@ -533,16 +533,16 @@ class ReportController extends AbstractController
->orderBy('event.start')
->getQuery()->getResult();
foreach($events as $event) {
- if(!isset($tbproject["before"][$event->getStart()->format("Ym")])) {
- $tbproject["before"][$event->getStart()->format("Ym")] = [
+ if(!isset($tbproject["before"][$event->getStart()->format("Y")][$event->getStart()->format("Ym")])) {
+ $tbproject["before"][$event->getStart()->format("Y")][$event->getStart()->format("Ym")] = [
"idmonth" => $event->getStart()->format("Ym"),
"monthlabel"=>$event->getStart()->format("m/Y"),
"duration" => 0,
];
- }
- $tbproject["before"][$event->getStart()->format("Ym")]["duration"]=$tbproject["before"][$event->getStart()->format("Ym")]["duration"]+$event->getDuration();
+ }
+ $tbproject["before"][$event->getStart()->format("Y")][$event->getStart()->format("Ym")]["duration"]=$tbproject["before"][$event->getStart()->format("Y")][$event->getStart()->format("Ym")]["duration"]+$event->getDuration();
}
-
+
// Somme astreinte validé avant la date
$end=new \Datetime('first day of this month');
$end->sub(new \DateInterval('P'.$nbmonth.'M'));
@@ -561,14 +561,14 @@ class ReportController extends AbstractController
->orderBy('penalty.start')
->getQuery()->getResult();
foreach($penaltys as $penalty) {
- if(!isset($tbproject["beforeastreinte"][$penalty->getStart()->format("Ym")])) {
- $tbproject["beforeastreinte"][$penalty->getStart()->format("Ym")] = [
+ if(!isset($tbproject["beforeastreinte"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("Ym")])) {
+ $tbproject["beforeastreinte"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("Ym")] = [
"idmonth" => $penalty->getStart()->format("Ym"),
"monthlabel"=>$penalty->getStart()->format("m/Y"),
"duration" => 0,
];
- }
- $tbproject["beforeastreinte"][$penalty->getStart()->format("Ym")]["duration"]=$tbproject["beforeastreinte"][$penalty->getStart()->format("Ym")]["duration"]+$penalty->getDuration();
+ }
+ $tbproject["beforeastreinte"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("Ym")]["duration"]=$tbproject["beforeastreinte"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("Ym")]["duration"]+$penalty->getDuration();
}
// Recap des Commandes
@@ -670,7 +670,6 @@ class ReportController extends AbstractController
}
$tbprojects[$project->getId()]=$tbproject;
}
-
// Formater les utilisateurs
$start=new \Datetime('first day of this month');
$start->sub(new \DateInterval('P'.$nbmonth.'M'));
diff --git a/src/schedule-2.0/templates/Report/report.html.twig b/src/schedule-2.0/templates/Report/report.html.twig
index d9a9cd3..55f5879 100644
--- a/src/schedule-2.0/templates/Report/report.html.twig
+++ b/src/schedule-2.0/templates/Report/report.html.twig
@@ -125,39 +125,65 @@
-
RAPPORT
+
RAPPORT
+
CONSOMMATION PASSEE
{% if project.hors!=0 %}
- consommé avant = {{ project.hors }}
+ Consommation précédente totale = {{ project.hors }}
{% endif %}
- {% set bycolonne = max(10,((project.before|length)/3)|round) %}
-
- {% set compteur = 0 %}
+
+ {% for year in project.before %}
+
+
+ Date
+ |
+ {% for month in year %}
+
+ {{ month.monthlabel }}
+ |
+ {% endfor %}
+
+
+
+ Consommé
+ |
+ {% for month in year %}
+
+ {{ month.duration }}
+ |
+ {% endfor %}
+
+ {% endfor %}
+
-
-
- {% for month in project.before %}
- {% set compteur = compteur + 1 %}
- {% if compteur > bycolonne %}
-
-
- {% set compteur = 1 %}
- {% endif %}
- consommé le {{ month.monthlabel }} = {{ month.duration }}
- {% endfor %}
-
-
-
{% if not project.beforeastreinte is empty %}
-
ASTREINTE
- {% set compteur = 0 %}
-
- {% for month in project.beforeastreinte %}
- consommé le {{ month.monthlabel }} = {{ month.duration }}
+
ASTREINTES
+
+ {% for year in project.before %}
+
+
+ Date
+ |
+ {% for month in year %}
+
+ {{ month.monthlabel }}
+ |
+ {% endfor %}
+
+
+
+ Consommé
+ |
+ {% for month in year %}
+
+ {{ month.duration }}
+ |
+ {% endfor %}
+
{% endfor %}
-
+
{% endif %}