Effiana fix migrations

Effiana · Jan 11, 2019 · 0c4952d · 0c4952d
1 parent bff4b65
commit 0c4952d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/Controller/Admin/DefaultController.php b/Controller/Admin/DefaultController.php
@@ -40,6 +40,30 @@ public function index()
             ->createQueryBuilder('cronJob')
             ->orderBy('cronJob.id', 'ASC')
             ->getQuery()->getArrayResult();
+
+        $scheduledCommandIds = array_map(function($item) {
+            return $item['id'];
+        }, $scheduledCommands);
+
+        $lastScheduledCommands = $em->getRepository('EffianaCronBundle:CronReport')
+            ->createQueryBuilder('cronReport', 'cronReport.jobId')
+            ->select('cronReport.jobId, MAX(cronReport.runAt) as runAt')
+            ->andWhere('cronReport.jobId IN(:scheduledCommandIds)')
+            ->groupBy('cronReport.jobId')
+            ->setParameters([
+                'scheduledCommandIds' => $scheduledCommandIds
+            ])
+            ->getQuery()->getArrayResult();
+
+        $scheduledCommands = array_map(function($item) use($lastScheduledCommands) {
+            $runAt = null;
+            if(isset($lastScheduledCommands[$item['id']]['runAt'])) {
+                $runAt = $lastScheduledCommands[$item['id']]['runAt'];
+            }
+            $item['runAt'] = $runAt;
+            return $item;
+        }, $scheduledCommands);
+
         return $this->render('@EffianaCron/Admin/index.html.twig', [
             'scheduledCommands' => $scheduledCommands
         ]);

diff --git a/Entity/CronReport.php b/Entity/CronReport.php
@@ -44,12 +44,18 @@ class CronReport
     protected $output;
 
     /**
-     * @ORM\ManyToOne(targetEntity="CronJob", inversedBy="reports")
+     * @ORM\ManyToOne(targetEntity="Effiana\CronBundle\Entity\CronJob", inversedBy="reports")
      * @ORM\JoinColumn(name="job_id", referencedColumnName="id", onDelete="CASCADE")
      * @var CronJob
      */
     protected $job;
 
+    /**
+     * @ORM\Column(type="integer", name="job_id")
+     * @var integer
+     */
+    protected $jobId;
+
     /**
      * @return int
      */

diff --git a/Resources/views/Admin/index.html.twig b/Resources/views/Admin/index.html.twig
@@ -24,6 +24,7 @@
                                     <th>{{ "detail.name"|trans }}</th>
                                     <th>{{ "detail.command"|trans }}</th>
                                     <th>{{ "detail.cronExpression"|trans }}</th>
+                                    <th>{{ "detail.lastExecution"|trans }}</th>
                                     <th>{{ "detail.actions"|trans }}</th>
                                 </tr>
                                 </thead>
@@ -49,6 +50,9 @@
                                         <td>
                                             {{ command.schedule }}
                                         </td>
+                                        <td>
+                                            {{ command.runAt }}
+                                        </td>
                                         <td style="min-width: 90px;">
                                             <a href="{{ path('effiana_cron_bundle_edit', {id: command.id}) }}" >
                                                 <span class="text-info glyphicon glyphicon-pencil"></span> <span class="sr-only">{{ "action.edit"|trans }}</span>