Release 3.3.4a (#1073)

* fix: Timezone isn't used in chart (#1070) -> #1066 * fix: date for logs (#1074) -> #1061
Myddleware · Oct 3, 2023 · f2d7d37 · f2d7d37
1 parent 3ac8701
commit f2d7d37
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
@@ -2635,6 +2635,10 @@ public function graphJobHisto(): Response
         {
             $countTransferRule = [];
             $jobs = $this->jobRepository->findBy([], ['begin' => 'ASC'], 5);
+
+            $timeZone = $this->get('session')->get('_timezone', 'UTC'); 
+            $userTimeZone = new \DateTimeZone($timeZone);
+
             if (count($jobs)) {
                 $countTransferRule[] = [
                     'date',
@@ -2644,8 +2648,11 @@ public function graphJobHisto(): Response
                     $this->translator->trans('flux.gbl_status.close'),
                 ];
                 foreach ($jobs as $job) {
+                    $start = clone $job->getBegin();
+                    $start->setTimezone($userTimeZone);
+
                     $countTransferRule[] = [
-                        $job->getBegin()->format('d/m/Y H:i:s'),
+                        $start->format('d/m/Y H:i:s'),
                         (int) $job->getOpen(),
                         (int) $job->getError(),
                         (int) $job->getCancel(),

diff --git a/templates/Flux/view/view.html.twig b/templates/Flux/view/view.html.twig
@@ -340,7 +340,7 @@
 									<th>{{'list_flux.tab.name'|trans}}</th>
 									<th>{{'list_flux.tab.source_id'|trans}}</th>
 									<th>{{'list_flux.tab.target_id'|trans}}</th>
-									<th>{{'list_flux.tab.dateref'|trans}}</th>
+									<th>{{'llist_flux.tab.date_modified'|trans}}</th>
 									<th>{{'list_flux.tab.type'|trans}}</th>
 									<th>{{'list_flux.tab.statut'|trans}}</th>
 								</tr>
@@ -646,7 +646,7 @@
 													<a href="{{ path('task_view', {'id':log.getJob.id}) }}">{{ log.getJob.id }}</a>
 												{% endif %}
 											</td>
-											<td>{{ log.getDateCreated|date("d/m/Y H:i:s", timezone) }}</td>
+											<td>{{ log.getCreated|date("d/m/Y H:i:s", timezone) }}</td>
 											<td class="ctr">
 												<div class="log_{{ log.getType|lower }}">{{ log.getType }}
 													{% if log.getType|lower == 's' %}

diff --git a/templates/Task/view/view.html.twig b/templates/Task/view/view.html.twig
@@ -133,7 +133,7 @@
 								<a href="{{ path('flux_info', {'id': log.getDocument.id}) }}">{{ log.getDocument.id }}</a>
 							{% endif %}
 						</td>					     					     			     			     	
-						<td>{{ log.getDateCreated|date("d/m/Y H:i:s", timezone) }}</td>
+						<td>{{ log.getCreated|date("d/m/Y H:i:s", timezone) }}</td>
 						<td class="ctr">
 							<div class="log_{{ log.getType|lower }}">{{ log.getType }}
 							{% if log.getType|lower == 's' %}