Merge com a versão da origem

Eduardo Santos
2 parents 50dd922b d4656e0e
Showing 3 changed files with 27 additions and 4 deletions Show diff stats
Controller/PrinterController.php
Entity/PrinterCounterRepository.php
Resources/views/Printer/index.html.twig
@@ -59,6 +59,7 @@ class PrinterController extends Controller
         if($form)
         {
             $start = new \DateTime($form['startDate']);
+
             $start = $start->format('U');
             $end = new \DateTime($form['endDate']);
@@ -68,12 +69,15 @@ class PrinterController extends Controller
         $start = isset($start) ? $start : (time() - ((60*60*24)*30));
         $end   = isset($end) ? $end : time();
+        $data = new \DateTime();
+
         $printers = $em->getRepository('CocarBundle:PrinterCounter')->relatorioGeral($start, $end);
         return array(
             "printer" => $printers,
             //"printerCounter" => $pCounter,
             "form" => $this->createCalendarForm(0, new \DateTime(date("Y-m-d", $start)), new \DateTime(date("Y-m-d", $end)))->createView(),
+            "data" => $data,
             "start" => $start,
             "end" => $end
         );
@@ -91,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');
@@ -98,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');
         }
@@ -114,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
@@ -128,6 +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('','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
@@ -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)
@@ -20,13 +20,13 @@
     <div class="row-fluid">
         <div class="span12 flat_box">
             <div class="padding_20">
-                <p>{{ "Relatório de impressão"|trans }}</p>
+                <p>{{ "Relatório gerado em"|trans }} {{ data|date }}</p>
                 <br>
                 <p>
                     <ul>
-                        <li><b>{{ "Data Inicial"|trans }}</b>: {{ start|date }}</li>
-                        <li><b>{{ "Data Final"|trans }}</b>: {{ end|date }}</li>
-                    </ul>
+                        <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>
         </div>
@@ -39,6 +39,11 @@
                 <th>Host</th>
                 <th>Serie</th>
                 <th>Local</th>
+<<<<<<< HEAD
+=======
+                <th>Contador Inicial</th>
+                <th>Contador Final</th>
+>>>>>>> d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd
                 <th>Impressões</th>
                 <th>Ações</th>
             </tr>
@@ -51,6 +56,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>