diff --git a/src/Cacic/CommonBundle/Controller/ComputadorController.php b/src/Cacic/CommonBundle/Controller/ComputadorController.php index 7fc0c99..1c7db72 100644 --- a/src/Cacic/CommonBundle/Controller/ComputadorController.php +++ b/src/Cacic/CommonBundle/Controller/ComputadorController.php @@ -41,6 +41,7 @@ class ComputadorController extends Controller */ public function detalharAction( $idComputador ) { +// $logger = $this->container->get('logger'); //if ( ! $request->isXmlHttpRequest() ) // Verifica se é uma requisição AJAX // throw $this->createNotFoundException( 'Página não encontrada!' ); $d = $this->getDoctrine(); @@ -53,6 +54,9 @@ class ComputadorController extends Controller $coleta = $d->getRepository('CacicCommonBundle:ComputadorColeta')->getDadosColetaComputador( $computador ); + //$isNotebook = $computador->getIsNotebook(); + //$logger->debug("isNotebook%%%%%%%%%%% $isNotebook"); + $dadosColeta = array(); // Inicializa o array que agrupa os dados de coleta por Classe $software = array(); // Coloca a coleta de software num array separado $listaClasses = array(); diff --git a/src/Cacic/CommonBundle/Entity/Computador.php b/src/Cacic/CommonBundle/Entity/Computador.php index 4ed0f6b..72b4e6b 100644 --- a/src/Cacic/CommonBundle/Entity/Computador.php +++ b/src/Cacic/CommonBundle/Entity/Computador.php @@ -689,4 +689,33 @@ class Computador { return $this->software_coletado; } + + /** + * @var string + */ + private $isNotebook; + + + /** + * Set isNotebook + * + * @param string $isNotebook + * @return Computador + */ + public function setIsNotebook($isNotebook) + { + $this->isNotebook = $isNotebook; + + return $this; + } + + /** + * Get isNotebook + * + * @returnn string + */ + public function getIsNotebook() + { + return $this->isNotebook; + } } \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php b/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php index 39f4df7..7b7b4e5 100644 --- a/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php +++ b/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php @@ -121,7 +121,7 @@ class ComputadorColetaRepository extends EntityRepository public function gerarRelatorioWMIDetalhe( $filtros, $classe ) { $qb = $this->createQueryBuilder('coleta') - ->select('IDENTITY(coleta.computador), property.nmPropertyName, coleta.teClassPropertyValue, comp.nmComputador, comp.teNodeAddress, comp.teIpComputador, so.idSo, so.inMswindows, so.sgSo, rede.idRede, rede.nmRede, rede.teIpRede, local.nmLocal, local.idLocal') + ->select('IDENTITY(coleta.computador), property.nmPropertyName, coleta.teClassPropertyValue, comp.nmComputador, comp.isNotebook, comp.teNodeAddress, comp.teIpComputador, so.idSo, so.inMswindows, so.sgSo, rede.idRede, rede.nmRede, rede.teIpRede, local.nmLocal, local.idLocal') ->innerJoin('coleta.classProperty', 'property') ->innerJoin('property.idClass', 'classe') ->innerJoin('coleta.computador', 'comp') diff --git a/src/Cacic/CommonBundle/Resources/config/doctrine/Computador.orm.yml b/src/Cacic/CommonBundle/Resources/config/doctrine/Computador.orm.yml index 3b43b58..0a60513 100644 --- a/src/Cacic/CommonBundle/Resources/config/doctrine/Computador.orm.yml +++ b/src/Cacic/CommonBundle/Resources/config/doctrine/Computador.orm.yml @@ -85,6 +85,11 @@ Cacic\CommonBundle\Entity\Computador: fixed: true nullable: true column: dt_debug + isNotebook: + type: text + length: 3 + nullable: true + column: is_notebook oneToMany: softwares: targetEntity: SoftwareEstacao diff --git a/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig b/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig index 6455274..7527df7 100644 --- a/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig @@ -29,7 +29,9 @@