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 @@ {{ 'Nome do Computador'|trans }} - {{ computador.nmComputador }} + {{ computador.nmComputador }} + {{ 'Notebook'|trans }} + {{ computador.isNotebook }} {{ 'Sistema Operacional'|trans }} diff --git a/src/Cacic/RelatorioBundle/Resources/views/Hardware/rel_wmi_detalhe.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Hardware/rel_wmi_detalhe.html.twig index 297b98e..9ad0204 100755 --- a/src/Cacic/RelatorioBundle/Resources/views/Hardware/rel_wmi_detalhe.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Hardware/rel_wmi_detalhe.html.twig @@ -28,10 +28,11 @@ {{ "Local"|trans }} {{ "Subrede"|trans }} {{ "Propriedade"|trans }} + {{ "Notebook"|trans }} {{ "Valor"|trans }} - + {% for reg in dados %} @@ -44,7 +45,9 @@ {{ reg.nmLocal }} {{ reg.nmRede }} / {{ reg.teIpRede }} {{ reg.nmPropertyName }} + {{ reg.isNotebook }} {{ reg.teClassPropertyValue }} + {% else %} diff --git a/src/Cacic/WSBundle/Controller/ColetaController.php b/src/Cacic/WSBundle/Controller/ColetaController.php index 4588a49..e0c5468 100644 --- a/src/Cacic/WSBundle/Controller/ColetaController.php +++ b/src/Cacic/WSBundle/Controller/ColetaController.php @@ -105,17 +105,24 @@ class ColetaController extends Controller foreach( $request->request->all() as $strClassName => $strClassValues) { + // Descriptografando os valores da requisição + $strNewClassValues = OldCacicHelper::deCrypt($request, $strClassValues); + //$teste = OldCacicHelper::deCrypt($request, $strClassValues); //$logger->debug("444444444444444444444444444444444444444444444444444444444: $strClassName | \n $teste"); //$logger->debug("444444444444444444444444444444444444444444444444444444444: $strClassName"); - //error_log("444444444444444444444444444444444444444444444444444444: $strClassName"); + //error_log("44444444444444444444444444444444444444444444444444444: $strClassName"); + //Verifica se é notebook ou não o computador através da bateria + if ($strClassName == "isNotebook"){ + $computador->setIsNotebook($strNewClassValues); + $this->getDoctrine()->getManager()->persist($computador); + $this->getDoctrine()->getManager()->flush(); + } // Verifico se o atributo sendo verificado é uma classe de coleta. // Se for, insiro os dados da coleta no objeto if (in_array($strClassName, $arrClassesNames)) { - // Descriptografando os valores da requisição - $strNewClassValues = OldCacicHelper::deCrypt($request, $strClassValues); // A propriedade da coleta de software é multi valorada. Preciso tratar diferente if ($strClassName == "SoftwareList") { diff --git a/web/web b/web/web new file mode 120000 index 0000000..9f53450 --- /dev/null +++ b/web/web @@ -0,0 +1 @@ +/srv/cacic/web \ No newline at end of file -- libgit2 0.21.2