Commit 847424d39caee4fca4a5f7f71e3248303b72262c
Exists in
master
and in
2 other branches
Merge com a versão da origem
Showing
3 changed files
with
27 additions
and
4 deletions
Show diff stats
Controller/PrinterController.php
@@ -59,6 +59,7 @@ class PrinterController extends Controller | @@ -59,6 +59,7 @@ class PrinterController extends Controller | ||
59 | if($form) | 59 | if($form) |
60 | { | 60 | { |
61 | $start = new \DateTime($form['startDate']); | 61 | $start = new \DateTime($form['startDate']); |
62 | + | ||
62 | $start = $start->format('U'); | 63 | $start = $start->format('U'); |
63 | 64 | ||
64 | $end = new \DateTime($form['endDate']); | 65 | $end = new \DateTime($form['endDate']); |
@@ -68,12 +69,15 @@ class PrinterController extends Controller | @@ -68,12 +69,15 @@ class PrinterController extends Controller | ||
68 | $start = isset($start) ? $start : (time() - ((60*60*24)*30)); | 69 | $start = isset($start) ? $start : (time() - ((60*60*24)*30)); |
69 | $end = isset($end) ? $end : time(); | 70 | $end = isset($end) ? $end : time(); |
70 | 71 | ||
72 | + $data = new \DateTime(); | ||
73 | + | ||
71 | $printers = $em->getRepository('CocarBundle:PrinterCounter')->relatorioGeral($start, $end); | 74 | $printers = $em->getRepository('CocarBundle:PrinterCounter')->relatorioGeral($start, $end); |
72 | 75 | ||
73 | return array( | 76 | return array( |
74 | "printer" => $printers, | 77 | "printer" => $printers, |
75 | //"printerCounter" => $pCounter, | 78 | //"printerCounter" => $pCounter, |
76 | "form" => $this->createCalendarForm(0, new \DateTime(date("Y-m-d", $start)), new \DateTime(date("Y-m-d", $end)))->createView(), | 79 | "form" => $this->createCalendarForm(0, new \DateTime(date("Y-m-d", $start)), new \DateTime(date("Y-m-d", $end)))->createView(), |
80 | + "data" => $data, | ||
77 | "start" => $start, | 81 | "start" => $start, |
78 | "end" => $end | 82 | "end" => $end |
79 | ); | 83 | ); |
@@ -91,6 +95,8 @@ class PrinterController extends Controller | @@ -91,6 +95,8 @@ class PrinterController extends Controller | ||
91 | ini_set('memory_limit', '1024M'); | 95 | ini_set('memory_limit', '1024M'); |
92 | gc_enable(); | 96 | gc_enable(); |
93 | 97 | ||
98 | + $data = new \DateTime(); | ||
99 | + | ||
94 | $em = $this->getDoctrine()->getManager(); | 100 | $em = $this->getDoctrine()->getManager(); |
95 | 101 | ||
96 | $form = $request->query->get('form'); | 102 | $form = $request->query->get('form'); |
@@ -98,9 +104,11 @@ class PrinterController extends Controller | @@ -98,9 +104,11 @@ class PrinterController extends Controller | ||
98 | if($form) | 104 | if($form) |
99 | { | 105 | { |
100 | $start = new \DateTime($form['startDate']); | 106 | $start = new \DateTime($form['startDate']); |
107 | + $startcsv = $start->format('d/m/Y'); | ||
101 | $start = $start->format('U'); | 108 | $start = $start->format('U'); |
102 | 109 | ||
103 | $end = new \DateTime($form['endDate']); | 110 | $end = new \DateTime($form['endDate']); |
111 | + $endcsv = $end->format('d/m/Y'); | ||
104 | $end = $end->format('U'); | 112 | $end = $end->format('U'); |
105 | } | 113 | } |
106 | 114 | ||
@@ -114,6 +122,7 @@ class PrinterController extends Controller | @@ -114,6 +122,7 @@ class PrinterController extends Controller | ||
114 | 122 | ||
115 | // Create the workflow from the reader | 123 | // Create the workflow from the reader |
116 | $workflow = new Workflow($reader); | 124 | $workflow = new Workflow($reader); |
125 | + $data = new \DateTime(); | ||
117 | 126 | ||
118 | 127 | ||
119 | // 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 |
@@ -128,6 +137,11 @@ class PrinterController extends Controller | @@ -128,6 +137,11 @@ class PrinterController extends Controller | ||
128 | $tmpfile = tempnam(sys_get_temp_dir(), 'impressoras'); | 137 | $tmpfile = tempnam(sys_get_temp_dir(), 'impressoras'); |
129 | $file = new \SplFileObject($tmpfile, 'w'); | 138 | $file = new \SplFileObject($tmpfile, 'w'); |
130 | $writer = new CsvWriter($file); | 139 | $writer = new CsvWriter($file); |
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')); | ||
131 | $workflow->addWriter($writer); | 145 | $workflow->addWriter($writer); |
132 | 146 | ||
133 | // Process the workflow | 147 | // Process the workflow |
Entity/PrinterCounterRepository.php
@@ -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
@@ -20,13 +20,13 @@ | @@ -20,13 +20,13 @@ | ||
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"|trans }}</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 }}</li> | ||
28 | - <li><b>{{ "Data Final"|trans }}</b>: {{ end|date }}</li> | ||
29 | - </ul> | 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> | ||
30 | </p> | 30 | </p> |
31 | </div> | 31 | </div> |
32 | </div> | 32 | </div> |
@@ -39,6 +39,11 @@ | @@ -39,6 +39,11 @@ | ||
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 | +<<<<<<< HEAD | ||
43 | +======= | ||
44 | + <th>Contador Inicial</th> | ||
45 | + <th>Contador Final</th> | ||
46 | +>>>>>>> d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd | ||
42 | <th>Impressões</th> | 47 | <th>Impressões</th> |
43 | <th>Ações</th> | 48 | <th>Ações</th> |
44 | </tr> | 49 | </tr> |
@@ -51,6 +56,8 @@ | @@ -51,6 +56,8 @@ | ||
51 | <td>{{ entity.host }}</td> | 56 | <td>{{ entity.host }}</td> |
52 | <td>{{ entity.serie }}</td> | 57 | <td>{{ entity.serie }}</td> |
53 | <td>{{ entity.local }}</td> | 58 | <td>{{ entity.local }}</td> |
59 | + <td>{{ entity.printsStart }}</td> | ||
60 | + <td>{{ entity.printsEnd }}</td> | ||
54 | <td>{{ (entity.printsEnd - entity.printsStart) }}</td> | 61 | <td>{{ (entity.printsEnd - entity.printsStart) }}</td> |
55 | <td> | 62 | <td> |
56 | <ul> | 63 | <ul> |