From d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd Mon Sep 17 00:00:00 2001
From: Bruno Menezes <bruno.noronha@lightbase.com.br>
Date: Wed, 11 Jun 2014 17:54:27 -0300
Subject: [PATCH] correcao relatorio

---
 Controller/PrinterController.php        | 11 ++++++++++-
 Entity/PrinterCounterRepository.php     |  2 ++
 Resources/views/Printer/index.html.twig | 10 +++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Controller/PrinterController.php b/Controller/PrinterController.php
index e3922e6..99fa4e4 100755
--- a/Controller/PrinterController.php
+++ b/Controller/PrinterController.php
@@ -95,6 +95,8 @@ class PrinterController extends Controller
         ini_set('memory_limit', '1024M');
         gc_enable();
 
+        $data = new \DateTime();
+
         $em = $this->getDoctrine()->getManager();
 
         $form = $request->query->get('form');
@@ -102,9 +104,11 @@ class PrinterController extends Controller
         if($form)
         {
             $start = new \DateTime($form['startDate']);
+            $startcsv = $start->format('d/m/Y');
             $start = $start->format('U');
 
             $end = new \DateTime($form['endDate']);
+            $endcsv = $end->format('d/m/Y');
             $end = $end->format('U');
         }
 
@@ -118,6 +122,7 @@ class PrinterController extends Controller
 
         // Create the workflow from the reader
         $workflow = new Workflow($reader);
+        $data = new \DateTime();
 
 
         // As you can see, the first names are not capitalized correctly. Let's fix
@@ -132,7 +137,11 @@ class PrinterController extends Controller
         $tmpfile = tempnam(sys_get_temp_dir(), 'impressoras');
         $file = new \SplFileObject($tmpfile, 'w');
         $writer = new CsvWriter($file);
-        $writer->writeItem(array('Id', 'Nome','Host','Serie','Local','Impressões'));
+        $writer->writeItem(array('','Relatório gerado em',$data->format('d/m/Y'),$data->format('H:i:s')));
+        $writer->writeItem(array('','Data Inicial:',$startcsv,'00:00:00'));
+        $writer->writeItem(array('','Data Final:',$endcsv,'23:59:59'));
+        $writer->writeItem(array(''));
+        $writer->writeItem(array('Id', 'Nome','Host','Serie','Local','Contador Inicial','Contador Final','Impressões'));
         $workflow->addWriter($writer);
 
         // Process the workflow
diff --git a/Entity/PrinterCounterRepository.php b/Entity/PrinterCounterRepository.php
index f26cb3a..0d04456 100755
--- a/Entity/PrinterCounterRepository.php
+++ b/Entity/PrinterCounterRepository.php
@@ -70,6 +70,8 @@ class PrinterCounterRepository extends EntityRepository
                         printer.host,
                         printer.serie,
                         printer.local,
+                        max(pc1.prints) as printsEnd,
+                        min(pc2.prints) as printsStart,
                         (max(pc1.prints) - min(pc2.prints)) as totalPrints
                  FROM CocarBundle:Printer printer
                  LEFT JOIN CocarBundle:PrinterCounter pc1 WITH (pc1.printer = printer.id AND pc1.date BETWEEN :start AND :end)
diff --git a/Resources/views/Printer/index.html.twig b/Resources/views/Printer/index.html.twig
index 1bde8f7..7386fe6 100755
--- a/Resources/views/Printer/index.html.twig
+++ b/Resources/views/Printer/index.html.twig
@@ -20,12 +20,12 @@
     <div class="row-fluid">
         <div class="span12 flat_box">
             <div class="padding_20">
-                <p>{{ "Relatório de impressão gerado em"|trans }} {{ data|date }}</p>
+                <p>{{ "Relatório gerado em"|trans }} {{ data|date }}</p>
                 <br>
                 <p>
                     <ul>
-                        <li><b>{{ "Data Inicial"|trans }}</b>: {{ start|date("d/m/Y") }} {{ "00:00:00" }}</li>
-                        <li><b>{{ "Data Final"|trans }}</b>: {{ end|date("d/m/Y") }} {{ "23:59:59" }}</li>
+                        <li><b>{{ "Data Inicial"|trans }}</b>: {{ start|date("d/m/Y") }} {{ "00:00" }}</li>
+                        <li><b>{{ "Data Final"|trans }}</b>: {{ end|date("d/m/Y") }} {{ "23:59" }}</li>
                 </ul>
                 </p>
             </div>
@@ -39,6 +39,8 @@
                 <th>Host</th>
                 <th>Serie</th>
                 <th>Local</th>
+                <th>Contador Inicial</th>
+                <th>Contador Final</th>
                 <th>Impressões</th>
                 <th>Ações</th>
             </tr>
@@ -51,6 +53,8 @@
                 <td>{{ entity.host }}</td>
                 <td>{{ entity.serie }}</td>
                 <td>{{ entity.local }}</td>
+                <td>{{ entity.printsStart }}</td>
+                <td>{{ entity.printsEnd }}</td>
                 <td>{{ (entity.printsEnd - entity.printsStart) }}</td>
                 <td>
                 <ul>
--
libgit2 0.21.2