Download as
Browse Code »

Commit 77d40a3b142578f452d0bbaf17c3c682873f39f4

Authored by Bruno Noronha
1 parent 5feb4593
Exists in master and in 1 other branch 3.1

modulo mapaController

Showing 1 changed file with 7 additions and 11 deletions   Show diff stats
src/Cacic/WSBundle/Controller/MapaController.php
  Diff comments   View file @77d40a3
... ... @@ -30,7 +30,6 @@ class MapaController extends Controller {
30 30 $ip_computador = $request->getClientIp();
31 31 }
32 32  
33   -
34 33 $te_node_address = TagValueHelper::getValueFromTags( 'MACAddress', OldCacicHelper::deCrypt( $request, $request->get('NetworkAdapterConfiguration')));
35 34  
36 35 // Caso não tenha encontrado, tenta pegar a variável da requisição
... ... @@ -59,20 +58,18 @@ class MapaController extends Controller {
59 58 * Se o módulo estiver habilitado, verifica se existe coleta de patrimônio
60 59 */
61 60 if (!empty($patr)){
  61 + $em = $this->getDoctrine()->getManager();
62 62 $query = $em->createQuery(
63   - 'SELECT COUNT(cc) FROM CacicCommonBundle:ComputadorColeta cc INNER JOIN CacicCommonBundle:ClassProperty cp WHERE cp.idClass = 15 AND cc.computador = :id'
  63 + 'SELECT cc FROM CacicCommonBundle:ComputadorColeta cc INNER JOIN CacicCommonBundle:ClassProperty cp WITH cc.classProperty = cp.idClassProperty WHERE cp.idClass = 15 AND cc.computador = :id'
64 64 )->setParameter('id', $computador);
65 65  
66   - $result = $query->getSingleResult();
67   -
68   - $dadosPatrimonio = implode('',$result);
69   -
  66 + $result = $query->getResult();
70 67 }
71 68  
72   - if (empty($dadosPatrimonio))
73   - $modPatrimonio = "True";
  69 + if (empty($result))
  70 + $modPatrimonio = "true";
74 71 else
75   - $modPatrimonio = "False";
  72 + $modPatrimonio = "false";
76 73  
77 74 /**
78 75 * Mensagem a ser exibida na tela de Pop-Up do patrimônio
... ... @@ -86,11 +83,10 @@ class MapaController extends Controller {
86 83  
87 84 $response = new Response();
88 85 $response->headers->set('Content-Type', 'xml');
89   -
90 86 return $this->render('CacicWSBundle:Default:mapa.xml.twig', array(
91 87 'mensagem'=>$mensagem,
92 88 'modPatrimonio' => $modPatrimonio,
93 89 ), $response);
94 90  
95 91 }
96   -}
97 92 \ No newline at end of file
  93 +}
... ...