Download as
Browse Code »

Commit d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd

Authored by Bruno Menezes
1 parent 610fb0d4
Exists in master and in 2 other branches 3,1, 3.1

correcao relatorio

Showing 3 changed files with 19 additions and 4 deletions   Show diff stats
Controller/PrinterController.php
  Diff comments   View file @d4656e0
@@ -95,6 +95,8 @@ class PrinterController extends Controller @@ -95,6 +95,8 @@ class PrinterController extends Controller
95 ini_set('memory_limit', '1024M'); 95 ini_set('memory_limit', '1024M');
96 gc_enable(); 96 gc_enable();
97 97
  98 + $data = new \DateTime();
  99 +
98 $em = $this->getDoctrine()->getManager(); 100 $em = $this->getDoctrine()->getManager();
99 101
100 $form = $request->query->get('form'); 102 $form = $request->query->get('form');
@@ -102,9 +104,11 @@ class PrinterController extends Controller @@ -102,9 +104,11 @@ class PrinterController extends Controller
102 if($form) 104 if($form)
103 { 105 {
104 $start = new \DateTime($form['startDate']); 106 $start = new \DateTime($form['startDate']);
  107 + $startcsv = $start->format('d/m/Y');
105 $start = $start->format('U'); 108 $start = $start->format('U');
106 109
107 $end = new \DateTime($form['endDate']); 110 $end = new \DateTime($form['endDate']);
  111 + $endcsv = $end->format('d/m/Y');
108 $end = $end->format('U'); 112 $end = $end->format('U');
109 } 113 }
110 114
@@ -118,6 +122,7 @@ class PrinterController extends Controller @@ -118,6 +122,7 @@ class PrinterController extends Controller
118 122
119 // Create the workflow from the reader 123 // Create the workflow from the reader
120 $workflow = new Workflow($reader); 124 $workflow = new Workflow($reader);
  125 + $data = new \DateTime();
121 126
122 127
123 // As you can see, the first names are not capitalized correctly. Let's fix 128 // As you can see, the first names are not capitalized correctly. Let's fix
@@ -132,7 +137,11 @@ class PrinterController extends Controller @@ -132,7 +137,11 @@ class PrinterController extends Controller
132 $tmpfile = tempnam(sys_get_temp_dir(), 'impressoras'); 137 $tmpfile = tempnam(sys_get_temp_dir(), 'impressoras');
133 $file = new \SplFileObject($tmpfile, 'w'); 138 $file = new \SplFileObject($tmpfile, 'w');
134 $writer = new CsvWriter($file); 139 $writer = new CsvWriter($file);
135 - $writer->writeItem(array('Id', 'Nome','Host','Serie','Local','Impressões')); 140 + $writer->writeItem(array('','Relatório gerado em',$data->format('d/m/Y'),$data->format('H:i:s')));
  141 + $writer->writeItem(array('','Data Inicial:',$startcsv,'00:00:00'));
  142 + $writer->writeItem(array('','Data Final:',$endcsv,'23:59:59'));
  143 + $writer->writeItem(array(''));
  144 + $writer->writeItem(array('Id', 'Nome','Host','Serie','Local','Contador Inicial','Contador Final','Impressões'));
136 $workflow->addWriter($writer); 145 $workflow->addWriter($writer);
137 146
138 // Process the workflow 147 // Process the workflow
Entity/PrinterCounterRepository.php
  Diff comments   View file @d4656e0
@@ -70,6 +70,8 @@ class PrinterCounterRepository extends EntityRepository @@ -70,6 +70,8 @@ class PrinterCounterRepository extends EntityRepository
70 printer.host, 70 printer.host,
71 printer.serie, 71 printer.serie,
72 printer.local, 72 printer.local,
  73 + max(pc1.prints) as printsEnd,
  74 + min(pc2.prints) as printsStart,
73 (max(pc1.prints) - min(pc2.prints)) as totalPrints 75 (max(pc1.prints) - min(pc2.prints)) as totalPrints
74 FROM CocarBundle:Printer printer 76 FROM CocarBundle:Printer printer
75 LEFT JOIN CocarBundle:PrinterCounter pc1 WITH (pc1.printer = printer.id AND pc1.date BETWEEN :start AND :end) 77 LEFT JOIN CocarBundle:PrinterCounter pc1 WITH (pc1.printer = printer.id AND pc1.date BETWEEN :start AND :end)
Resources/views/Printer/index.html.twig
  Diff comments   View file @d4656e0
@@ -20,12 +20,12 @@ @@ -20,12 +20,12 @@
20 <div class="row-fluid"> 20 <div class="row-fluid">
21 <div class="span12 flat_box"> 21 <div class="span12 flat_box">
22 <div class="padding_20"> 22 <div class="padding_20">
23 - <p>{{ "Relatório de impressão gerado em"|trans }} {{ data|date }}</p> 23 + <p>{{ "Relatório gerado em"|trans }} {{ data|date }}</p>
24 <br> 24 <br>
25 <p> 25 <p>
26 <ul> 26 <ul>
27 - <li><b>{{ "Data Inicial"|trans }}</b>: {{ start|date("d/m/Y") }} {{ "00:00:00" }}</li>  
28 - <li><b>{{ "Data Final"|trans }}</b>: {{ end|date("d/m/Y") }} {{ "23:59:59" }}</li> 27 + <li><b>{{ "Data Inicial"|trans }}</b>: {{ start|date("d/m/Y") }} {{ "00:00" }}</li>
  28 + <li><b>{{ "Data Final"|trans }}</b>: {{ end|date("d/m/Y") }} {{ "23:59" }}</li>
29 </ul> 29 </ul>
30 </p> 30 </p>
31 </div> 31 </div>
@@ -39,6 +39,8 @@ @@ -39,6 +39,8 @@
39 <th>Host</th> 39 <th>Host</th>
40 <th>Serie</th> 40 <th>Serie</th>
41 <th>Local</th> 41 <th>Local</th>
  42 + <th>Contador Inicial</th>
  43 + <th>Contador Final</th>
42 <th>Impressões</th> 44 <th>Impressões</th>
43 <th>Ações</th> 45 <th>Ações</th>
44 </tr> 46 </tr>
@@ -51,6 +53,8 @@ @@ -51,6 +53,8 @@
51 <td>{{ entity.host }}</td> 53 <td>{{ entity.host }}</td>
52 <td>{{ entity.serie }}</td> 54 <td>{{ entity.serie }}</td>
53 <td>{{ entity.local }}</td> 55 <td>{{ entity.local }}</td>
  56 + <td>{{ entity.printsStart }}</td>
  57 + <td>{{ entity.printsEnd }}</td>
54 <td>{{ (entity.printsEnd - entity.printsStart) }}</td> 58 <td>{{ (entity.printsEnd - entity.printsStart) }}</td>
55 <td> 59 <td>
56 <ul> 60 <ul>