 }}){kind=logo}
CACIC }}){kind=logo}
COCAR
-
-
+
- CACIC / {% block breadcrumb %}
- Home diff --git a/app/bootstrap.php.cache b/app/bootstrap.php.cache index 8b4d45d..ca3b9ec 100644 --- a/app/bootstrap.php.cache +++ b/app/bootstrap.php.cache @@ -2170,11 +2170,11 @@ protected $booted; protected $name; protected $startTime; protected $loadClassCache; -const VERSION ='2.3.9'; -const VERSION_ID ='20309'; +const VERSION ='2.3.11'; +const VERSION_ID ='20311'; const MAJOR_VERSION ='2'; const MINOR_VERSION ='3'; -const RELEASE_VERSION ='9'; +const RELEASE_VERSION ='11'; const EXTRA_VERSION =''; public function __construct($environment, $debug) { diff --git a/app/config/config.yml b/app/config/config.yml index 3b5b2a5..45e6859 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -36,7 +36,7 @@ bc_bootstrap: assetic: debug: "%kernel.debug%" use_controller: false - bundles: [ CacicCommonBundle, CacicRelatorioBundle, FMElfinderBundle ] + bundles: [ CacicCommonBundle, CacicRelatorioBundle, FMElfinderBundle, CocarBundle ] java: /usr/bin/java filters: #closure: @@ -144,4 +144,4 @@ services: cacic_demo.command.demo_command: class: Cacic\CommonBundle\Command\DemoCommand tags: - - { name: console.command } \ No newline at end of file + - { name: console.command } diff --git a/app/config/routing.yml b/app/config/routing.yml index 60bed18..bf68112 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,3 +1,6 @@ +CocarBundle_cocar_annotation: + resource: "@CocarBundle/Resources/config/routing.yml" + prefix: /cocar/ cacic_ws: resource: "@CacicWSBundle/Resources/config/routing.yml" prefix: /ws/ @@ -13,6 +16,10 @@ cacic_common: elfinder: resource: "@FMElfinderBundle/Resources/config/routing.yml" +CocarBundle_cocar_annotation: + resource: "@CocarBundle/Resources/config/routing.yml" + prefix: /cocar + # Internal routing configuration to handle ESI # ****** WARNING ****** # This route should be enabled with caution as it can open a security vulnerability diff --git a/composer.json b/composer.json index 6ceb417..602590b 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,9 @@ "url": "http://code.jquery.com/jquery-1.9.1.js", "type": "file" } - } + }, + "type": "vcs", + "url": "https://github.com/lightbase/cocar.git" } ], "require": { @@ -45,7 +47,14 @@ "jquery/jquery": "1.9.*", "helios-ag/fm-elfinder-bundle": "1.x", "knplabs/knp-menu": "2.0.*@dev", - "knplabs/knp-menu-bundle":"dev-master" + "knplabs/knp-menu-bundle":"dev-master", + "jpgraph/jpgraph": "dev-master", + "symfony/class-loader": "2.2.*", + "friendsofsymfony/rest-bundle": "dev-master", + "jms/serializer": "0.14.*@dev", + "jms/serializer-bundle": "0.13.*@dev", + "lightbase/cocar": "dev-master", + "ddeboer/data-import-bundle": "dev-master" }, "scripts": { "post-install-cmd": [ diff --git a/src/Cacic/CommonBundle/Controller/AtesteController.php b/src/Cacic/CommonBundle/Controller/AtesteController.php new file mode 100755 index 0000000..5fd4956 --- /dev/null +++ b/src/Cacic/CommonBundle/Controller/AtesteController.php @@ -0,0 +1,105 @@ +getDoctrine()->getManager(); + $logger = $this->get('logger'); + $locale = $request->getLocale(); + + $form = $this->createForm( new LogPesquisaType() ); + + $ateste = $this->createForm (new AtesteType() ); + + if ( $request->isMethod('POST') ) + { + $data = $request->get('log_pesquisa'); + $ateste_data = $request->get('Ateste'); + $listaRedes = $request->get('redes'); + + $filtroLocais = array(); // Inicializa array com locais a pesquisar + foreach ( $data['idLocal'] as $locais ) { + array_push( $filtroLocais, $locais ); + } + + + // Só grava os dados se tiver lista de redes no formulário + if (!empty($listaRedes)) { + + // Pega usuário da requisição + $usuario = $request->getUser(); + + // Cria objeto do ateste + $ateste_obj = new Ateste(); + + // Pega valores do formulário + $ateste_obj->setData( new \DateTime()); + $ateste_obj->setUsuario($usuario); + $ateste_obj->setDescricao($ateste_data['descricao']); + $ateste_obj->setAtestado($ateste_data['atestado']); + $ateste_obj->setDetalhes($ateste_data['detalhes']); + $ateste_obj->setQualidadeServico($ateste_data['qualidade_servico']); + + // Grava dados no banco + $em->persist($ateste_obj); + $em->flush(); + + + // Agora relaciona redes + foreach ($listaRedes as $rede) { + // Pega número de computadores para a rede + $estacoes = $request->get("rede_$rede"); + + // Armazena relação entre ateste e redes + $ateste_rede = new AtesteRedes(); + $ateste_rede->setRede($em->getRepository('CacicCommonBundle:Rede')->find($rede)); + $ateste_rede->setAteste($ateste_obj); + $ateste_rede->setEstacoes($estacoes); + + $em->persist($ateste_rede); + } + + // COMMIT + $em->flush(); + + $this->get('session')->getFlashBag()->add('success', 'Ateste realizado com sucesso!'); + } + + $logs = $this->getDoctrine()->getRepository( 'CacicCommonBundle:LogAcesso') + ->pesquisar( $data['dtAcaoInicio'], $data['dtAcaoFim'], $filtroLocais); + + } + + return $this->render( 'CacicCommonBundle:Ateste:index.html.twig', + array( + 'locale'=> $locale, + 'form' => $form->createView(), + 'ateste' => $ateste->createView(), + 'logs' => ( isset( $logs ) ? $logs : null ) + ) + ); + } + +} \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Controller/DefaultController.php b/src/Cacic/CommonBundle/Controller/DefaultController.php index d1b79ee..7c22d80 100644 --- a/src/Cacic/CommonBundle/Controller/DefaultController.php +++ b/src/Cacic/CommonBundle/Controller/DefaultController.php @@ -16,7 +16,8 @@ class DefaultController extends Controller $estatisticas = array( 'totalCompMonitorados' => $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->countAll(), 'totalInsucessosInstalacao' => $this->getDoctrine()->getRepository('CacicCommonBundle:InsucessoInstalacao')->countAll(), - 'totalCompPorSO' => $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->countPorSO() + 'totalCompPorSO' => $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->countPorSO(), + 'totalComp' => $this->getDoctrine()->getRepository('CacicCommonBundle:LogAcesso')->countPorComputador() ); return $this->render( diff --git a/src/Cacic/CommonBundle/Controller/RedeController.php b/src/Cacic/CommonBundle/Controller/RedeController.php index 4bd3cd7..41e5474 100644 --- a/src/Cacic/CommonBundle/Controller/RedeController.php +++ b/src/Cacic/CommonBundle/Controller/RedeController.php @@ -32,7 +32,8 @@ class RedeController extends Controller { return $this->render( 'CacicCommonBundle:Rede:index.html.twig', - array( 'rede' => $this->getDoctrine()->getRepository( 'CacicCommonBundle:Rede' )->paginar( $this->get( 'knp_paginator' ), $page ) + array( 'rede' => $this->getDoctrine()->getRepository( 'CacicCommonBundle:Rede' )->paginar( $this->get( 'knp_paginator' ), $page ), + 'uorgs' => $this->getDoctrine()->getRepository( 'CacicCommonBundle:Uorg' )->vincular() )); } @@ -565,28 +566,33 @@ class RedeController extends Controller public function vincularAction(Request $request) { - $rede = new Rede(); - $form = $this->createForm( new RedeType(), $rede ); - if ( $request->isMethod('POST') ) - { - $form->bind( $request ); - if ( $form->isValid() ) - { - $this->getDoctrine()->getManager()->persist( $rede ); - $this->getDoctrine()->getManager()->flush(); //Persiste os dados do Usuário + if ( ! $request->isXmlHttpRequest() ) // Verifica se se trata de uma requisição AJAX + throw $this->createNotFoundException( 'Página não encontrada' ); - // Grava os dados da tabela rede versão módulo - $this->updateSubredes($rede); + foreach($request->get('uorg') as $idUorg){ +/* $uorgs = implode(',', $request->get('uorg')); - $this->get('session')->getFlashBag()->add('success', 'Dados salvos com sucesso!'); + // 1- pega rede + $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->find($request->get('id')); + // 2- Add uorg na rede + $rede ->addUorg( $this->getDoctrine()->getRepository('CacicCommonBundle:Uorg')->find($uorgs) );*/ - return $this->redirect( $this->generateUrl( 'cacic_subrede_index') ); - } + //1- Pego Uorg + $uorg = $this->getDoctrine()->getRepository('CacicCommonBundle:Uorg')->find($idUorg); + + //2- Add a rede na uorg + $uorg ->setRede( $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->find($request->get('id')) ); + + $em = $this->getDoctrine()->getManager(); + $em->persist( $uorg ); + $em->flush(); } + $response = new Response( json_encode( array('status' => 'ok') ) ); + $response->headers->set('Content-Type', 'application/json'); - return $this->render( 'CacicCommonBundle:Rede:cadastrar.html.twig', array( 'form' => $form->createView() ) ); - } + return $response; + } -} +} \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Controller/SoftwareController.php b/src/Cacic/CommonBundle/Controller/SoftwareController.php index 9d0e277..663c8eb 100644 --- a/src/Cacic/CommonBundle/Controller/SoftwareController.php +++ b/src/Cacic/CommonBundle/Controller/SoftwareController.php @@ -114,7 +114,7 @@ class SoftwareController extends Controller * Tela de classificação EM LOTE de Softwares * @param Symfony\Component\HttpFoundation\Request $request */ - public function naoClassificadosAction( Request $request ) + public function naoClassificadosAction($page, Request $request ) { if ( $request->isMethod('POST') ) { @@ -148,7 +148,7 @@ class SoftwareController extends Controller return $this->render( 'CacicCommonBundle:Software:naoclassificados.html.twig', array( - 'softwares' => $this->getDoctrine()->getRepository( 'CacicCommonBundle:Software' )->listarNaoClassificados(), + 'softwares' => $this->getDoctrine()->getRepository( 'CacicCommonBundle:Software' )->listarNaoClassificados( $this->get( 'knp_paginator' ), $page ), 'tipos' => $this->getDoctrine()->getRepository( 'CacicCommonBundle:TipoSoftware' )->findAll() ) ); diff --git a/src/Cacic/CommonBundle/Controller/UorgController.php b/src/Cacic/CommonBundle/Controller/UorgController.php index c536953..9fd0a16 100644 --- a/src/Cacic/CommonBundle/Controller/UorgController.php +++ b/src/Cacic/CommonBundle/Controller/UorgController.php @@ -39,14 +39,14 @@ class UorgController extends Controller throw $this->createNotFoundException( 'Página não encontrada' ); $uorgs = $this->getDoctrine()->getRepository( 'CacicCommonBundle:Uorg' )->getFolhasDoNo( $request->get( 'idUorgPai' ) ); - # Monta um array no formato suportado pelo plugin-in jqTree (JQuery) $_tree = array(); foreach ( $uorgs as $uorg ) { $_tree[] = array( - 'label' => $uorg[0]['nmUorg'], - 'id' => $uorg[0]['idUorg'], + 'label' => $uorg['nmUorg'], + 'filho' => $uorg['numFilhas'], + 'id' => $uorg['idUorg'], 'load_on_demand' => (bool) $uorg['numFilhas'] ); } @@ -179,5 +179,5 @@ class UorgController extends Controller return $response; } - + } \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Controller/UsuarioController.php b/src/Cacic/CommonBundle/Controller/UsuarioController.php index 9db1bd3..59d4a04 100644 --- a/src/Cacic/CommonBundle/Controller/UsuarioController.php +++ b/src/Cacic/CommonBundle/Controller/UsuarioController.php @@ -182,7 +182,7 @@ class UsuarioController extends Controller throw $this->createNotFoundException( 'Usuário não encontrado' ); if($csNivel[0]["cont"] == 1 && $nivelUser[0]["teGrupoUsuarios"] == "Administração"){ - $this->get('session')->getFlashBag()->add('error', 'Exclusão não permitida, deve haver ao menos um usuario Administrador'); + $this->get('session')->getFlashBag()->add('error', 'Exclusão não permitida, deve haver ao menos um usuário Administrador'); }else { $em = $this->getDoctrine()->getManager(); diff --git a/src/Cacic/CommonBundle/Entity/Ateste.php b/src/Cacic/CommonBundle/Entity/Ateste.php new file mode 100755 index 0000000..5807cae --- /dev/null +++ b/src/Cacic/CommonBundle/Entity/Ateste.php @@ -0,0 +1,296 @@ +idAteste; + } + + /** + * Set descricao + * + * @param string $descricao + * @return Ateste + */ + public function setDescricao($descricao) + { + $this->descricao = $descricao; + + return $this; + } + + /** + * Get descricao + * + * @return string + */ + public function getDescricao() + { + return $this->descricao; + } + + /** + * Set quantidade + * + * @param integer $quantidade + * @return Ateste + */ + public function setQuantidade($quantidade) + { + $this->quantidade = $quantidade; + + return $this; + } + + /** + * Get quantidade + * + * @return integer + */ + public function getQuantidade() + { + return $this->quantidade; + } + + /** + * Set detalhes + * + * @param string $detalhes + * @return Ateste + */ + public function setDetalhes($detalhes) + { + $this->detalhes = $detalhes; + + return $this; + } + + /** + * Get detalhes + * + * @return string + */ + public function getDetalhes() + { + return $this->detalhes; + } + + /** + * Set atestado + * + * @param boolean $atestado + * @return Ateste + */ + public function setAtestado($atestado) + { + $this->atestado = $atestado; + + return $this; + } + + /** + * Get atestado + * + * @return boolean + */ + public function getAtestado() + { + return $this->atestado; + } + + /** + * Set data + * + * @param \DateTime $data + * @return Ateste + */ + public function setData($data) + { + $this->data = $data; + + return $this; + } + + /** + * Get data + * + * @return \DateTime + */ + public function getData() + { + return $this->data; + } + + /** + * Set qualidadeServico + * + * @param string $qualidadeServico + * @return Ateste + */ + public function setQualidadeServico($qualidadeServico) + { + $this->qualidadeServico = $qualidadeServico; + + return $this; + } + + /** + * Get qualidadeServico + * + * @return string + */ + public function getQualidadeServico() + { + return $this->qualidadeServico; + } + /** + * @var \Cacic\CommonBundle\Entity\Usuario + */ + private $usuario; + + + /** + * Set usuario + * + * @param \Cacic\CommonBundle\Entity\Usuario $usuario + * @return Ateste + */ + public function setUsuario(\Cacic\CommonBundle\Entity\Usuario $usuario = null) + { + $this->usuario = $usuario; + + return $this; + } + + /** + * Get usuario + * + * @return \Cacic\CommonBundle\Entity\Usuario + */ + public function getUsuario() + { + return $this->usuario; + } + /** + * @var \Cacic\CommonBundle\Entity\Rede + */ + private $rede; + + + /** + * Set rede + * + * @param \Cacic\CommonBundle\Entity\Rede $rede + * @return Ateste + */ + public function setRede(\Cacic\CommonBundle\Entity\Rede $rede = null) + { + $this->rede = $rede; + + return $this; + } + + /** + * Get rede + * + * @return \Cacic\CommonBundle\Entity\Rede + */ + public function getRede() + { + return $this->rede; + } + /** + * @var \Doctrine\Common\Collections\Collection + */ + private $redes; + + /** + * Constructor + */ + public function __construct() + { + $this->redes = new \Doctrine\Common\Collections\ArrayCollection(); + } + + /** + * Add redes + * + * @param \Cacic\CommonBundle\Entity\Rede $redes + * @return Ateste + */ + public function addRede(\Cacic\CommonBundle\Entity\Rede $redes) + { + $this->redes[] = $redes; + + return $this; + } + + /** + * Remove redes + * + * @param \Cacic\CommonBundle\Entity\Rede $redes + */ + public function removeRede(\Cacic\CommonBundle\Entity\Rede $redes) + { + $this->redes->removeElement($redes); + } + + /** + * Get redes + * + * @return \Doctrine\Common\Collections\Collection + */ + public function getRedes() + { + return $this->redes; + } +} \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Entity/AtesteRedes.php b/src/Cacic/CommonBundle/Entity/AtesteRedes.php new file mode 100755 index 0000000..a8a1d61 --- /dev/null +++ b/src/Cacic/CommonBundle/Entity/AtesteRedes.php @@ -0,0 +1,96 @@ +estacoes = $estacoes; + + return $this; + } + + /** + * Get estacoes + * + * @return integer + */ + public function getEstacoes() + { + return $this->estacoes; + } + + /** + * Set rede + * + * @param \Cacic\CommonBundle\Entity\Rede $rede + * @return AtesteRedes + */ + public function setRede(\Cacic\CommonBundle\Entity\Rede $rede) + { + $this->rede = $rede; + + return $this; + } + + /** + * Get rede + * + * @return \Cacic\CommonBundle\Entity\Rede + */ + public function getRede() + { + return $this->rede; + } + + /** + * Set ateste + * + * @param \Cacic\CommonBundle\Entity\Ateste $ateste + * @return AtesteRedes + */ + public function setAteste(\Cacic\CommonBundle\Entity\Ateste $ateste) + { + $this->ateste = $ateste; + + return $this; + } + + /** + * Get ateste + * + * @return \Cacic\CommonBundle\Entity\Ateste + */ + public function getAteste() + { + return $this->ateste; + } +} \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Entity/AtesteRedesRepository.php b/src/Cacic/CommonBundle/Entity/AtesteRedesRepository.php new file mode 100755 index 0000000..0a4c64d --- /dev/null +++ b/src/Cacic/CommonBundle/Entity/AtesteRedesRepository.php @@ -0,0 +1,15 @@ +getQuery()->execute(); } - public function gerarRelatorioSoftware( $filtros, $software ) + public function gerarRelatorioSoftware( $filtros, $software, $local ) { $qb = $this->createQueryBuilder('coleta') - ->select('DISTINCT 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, hist.dtHrInclusao') + ->select('DISTINCT 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, comp.dtHrInclusao') ->innerJoin('CacicCommonBundle:ComputadorColetaHistorico','hist', 'WITH', 'coleta.idComputadorColeta = hist.computadorColeta') ->innerJoin('coleta.classProperty', 'property') ->innerJoin('property.idClass', 'classe') @@ -166,7 +167,10 @@ class ComputadorColetaRepository extends EntityRepository /** * Verifica os filtros */ - if ( array_key_exists('locais', $filtros) && !empty($filtros['locais']) ) + if (!empty($local)) + $qb->andWhere('local.nmLocal IN (:local)')->setParameter('local', $local); + + if ( array_key_exists('local', $filtros) && !empty($filtros['local']) ) $qb->andWhere('local.idLocal IN (:locais)')->setParameter('locais', explode( ',', $filtros['locais'] )); if ( array_key_exists('redes', $filtros) && !empty($filtros['redes']) ) diff --git a/src/Cacic/CommonBundle/Entity/ComputadorRepository.php b/src/Cacic/CommonBundle/Entity/ComputadorRepository.php index bcecbef..212418d 100644 --- a/src/Cacic/CommonBundle/Entity/ComputadorRepository.php +++ b/src/Cacic/CommonBundle/Entity/ComputadorRepository.php @@ -282,4 +282,81 @@ class ComputadorRepository extends EntityRepository return $computador; } -} \ No newline at end of file + /** + * Realiza pesquisa por LOGs de ACESSO para máquinas inativas + * @param date $dataInicio + * @param date $dataFim + * @param array $locais + */ + public function pesquisarInativos( $dataInicio, $dataFim, $locais ) + { + + // Monta a Consulta básica... + $query = $this->createQueryBuilder('comp') + ->select('rede.idRede', 'rede.nmRede', 'rede.teIpRede', 'loc.nmLocal', 'loc.sgLocal', 'COUNT(DISTINCT comp.idComputador) as numComp') + ->innerJoin('comp.idRede', 'rede') + ->innerJoin('rede.idLocal', 'loc'); + + /** + * Verifica os filtros que foram parametrizados + */ + + if (empty($dataInicio) && empty($dataFim)) { + // Aqui não preciso filtrar pela data + $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador'); + } else { + + $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador AND log.data >= :dtInicio AND log.data <= :dtFim') + ->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )) + ->setParameter('dtFim', ( $dataFim.' 00:00:00' )); + + } + + if ( count($locais) ) + $query->andWhere( 'loc.idLocal IN (:locais)' )->setParameter('locais', $locais); + + + // Filtro que mostra somente máquinas sem coleta + $query->andWhere('log.idComputador IS NULL'); + + // Agrupa todos os campos + $query->groupBy('rede', 'loc.nmLocal', 'loc.sgLocal'); + + return $query->getQuery()->execute(); + } + + public function gerarRelatorioRede( $filtros, $idRede,$dataInicio, $dataFim ) { + + // Monta a Consulta básica... + $query = $this->createQueryBuilder('comp') + ->select('rede.idRede', 'rede.nmRede', 'rede.teIpRede', 'loc.nmLocal', 'loc.sgLocal', 'comp.idComputador', 'comp.nmComputador', 'comp.teNodeAddress', 'comp.teIpComputador', 'so.idSo', 'so.inMswindows', 'so.sgSo') + ->innerJoin('comp.idSo', 'so') + ->innerJoin('comp.idRede', 'rede') + ->innerJoin('rede.idLocal', 'loc'); + + /** + * Verifica os filtros que foram parametrizados + */ + if (empty($dataInicio) && empty($dataFim)) { + // Aqui não preciso filtrar pela data + $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador'); + } else { + + $query->leftJoin('CacicCommonBundle:LogAcesso', 'log', 'WITH', 'comp.idComputador = log.idComputador AND log.data >= :dtInicio AND log.data <= :dtFim') + ->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )) + ->setParameter('dtFim', ( $dataFim.' 00:00:00' )); + } + + if ( $idRede ) + $query->andWhere( 'comp.idRede IN (:rede)' )->setParameter('rede', $idRede); + + // Filtro que mostra somente máquinas sem coleta + $query->andWhere('log.idComputador IS NULL'); + + $query->groupBy('rede.idRede', 'rede.nmRede', 'rede.teIpRede', 'loc.nmLocal', 'loc.sgLocal', 'comp.idComputador', 'comp.nmComputador', 'comp.teNodeAddress', 'comp.teIpComputador', 'so.idSo', 'so.inMswindows', 'so.sgSo'); + + + return $query->getQuery()->execute(); + } + +} diff --git a/src/Cacic/CommonBundle/Entity/LogAcesso.php b/src/Cacic/CommonBundle/Entity/LogAcesso.php new file mode 100755 index 0000000..64c2735 --- /dev/null +++ b/src/Cacic/CommonBundle/Entity/LogAcesso.php @@ -0,0 +1,91 @@ +idLogAcesso; + } + + /** + * Set data + * + * @param \DateTime $data + * @return LogAcesso + */ + public function setData($data) + { + $this->data = $data; + + return $this; + } + + /** + * Get data + * + * @return \DateTime + */ + public function getData() + { + return $this->data; + } + + /** + * Set idComputador + * + * @param \Cacic\CommonBundle\Entity\Computador $idComputador + * @return LogAcesso + */ + public function setIdComputador(\Cacic\CommonBundle\Entity\Computador $idComputador = null) + { + $this->idComputador = $idComputador; + + return $this; + } + + /** + * Get idComputador + * + * @return \Cacic\CommonBundle\Entity\Computador + */ + public function getIdComputador() + { + return $this->idComputador; + } + + /** + * @PrePersist + */ + public function onPrePersistSetRegistrationDate() + { + $this->data = new \DateTime(); + } +} diff --git a/src/Cacic/CommonBundle/Entity/LogAcessoRepository.php b/src/Cacic/CommonBundle/Entity/LogAcessoRepository.php new file mode 100755 index 0000000..676469e --- /dev/null +++ b/src/Cacic/CommonBundle/Entity/LogAcessoRepository.php @@ -0,0 +1,109 @@ +createQueryBuilder('acesso') + ->select('acesso') + ->where('acesso.idComputador = :computador') + ->orderBy('acesso.data', 'desc') + ->setMaxResults(1) + ->setParameter('computador', $computador ); + + return $qb->getQuery()->getOneOrNullResult(); + } + + + /** + * + * Realiza pesquisa por LOGs de ACESSO ou ATIVIDADES segundo parâmetros informados + * @param string|array $tipoPesquisa + * @param date $dataInicio + * @param date $dataFim + * @param array $locais + */ + public function pesquisar( $dataInicio, $dataFim, $locais ) + { + + // Monta a Consulta básica... + $query = $this->createQueryBuilder('log') + ->select('rede.idRede', 'rede.nmRede', 'rede.teIpRede', 'loc.nmLocal', 'loc.sgLocal', 'COUNT(DISTINCT log.idComputador) as numComp') + ->innerJoin('log.idComputador', 'comp') + ->innerJoin('comp.idRede', 'rede') + ->innerJoin('rede.idLocal', 'loc') + ->groupBy('rede', 'loc.nmLocal', 'loc.sgLocal'); + + /** + * Verifica os filtros que foram parametrizados + */ + if ( $dataInicio ) + $query->andWhere( 'log.data >= :dtInicio' )->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )); + + if ( $dataFim ) + $query->andWhere( 'log.data <= :dtFim' )->setParameter('dtFim', ( $dataFim.' 23:59:59' )); + + if ( count($locais) ) + $query->andWhere( 'loc.idLocal IN (:locais)' )->setParameter('locais', $locais); + + + return $query->getQuery()->execute(); + } + public function gerarRelatorioRede( $filtros, $idRede,$dataInicio, $dataFim ) + { + $query = $this->createQueryBuilder('log') + ->select('comp.idComputador', 'comp.nmComputador', 'comp.teNodeAddress','comp.teIpComputador', 'max(log.data) AS data', 'so.idSo', 'so.inMswindows', 'so.sgSo', 'rede.idRede', 'rede.nmRede', 'rede.teIpRede', 'local.nmLocal', 'local.idLocal') + ->innerJoin('log.idComputador','comp') + ->innerJoin('comp.idSo', 'so') + ->innerJoin('comp.idRede','rede') + ->innerJoin('rede.idLocal', 'local') + ->groupBy('comp.idComputador', 'comp.nmComputador', 'comp.teNodeAddress','comp.teIpComputador', 'so.idSo', 'so.inMswindows', 'so.sgSo', 'rede.idRede', 'rede.nmRede', 'rede.teIpRede', 'local.nmLocal', 'local.idLocal'); + + /** + * Verifica os filtros que foram parametrizados + */ + if ( $dataInicio ) + $query->andWhere( 'log.data >= :dtInicio' )->setParameter('dtInicio', ( $dataInicio.' 00:00:00' )); + + if ( $dataFim ) + $query->andWhere( 'log.data <= :dtFim' )->setParameter('dtFim', ( $dataFim.' 23:59:59' )); + + if ( ($idRede) ) + $query->andWhere( 'comp.idRede IN (:rede)' )->setParameter('rede', $idRede); + + return $query->getQuery()->execute(); + } + + /** + * + * Total de computadores monitorados nos últimos 30 dias + * + */ + + public function countPorComputador() { + + $query = $this->createQueryBuilder('log') + ->select('COUNT(DISTINCT comp.idComputador)') + ->innerJoin('CacicCommonBundle:Computador','comp', 'WITH', 'log.idComputador = comp.idComputador') + ->andWhere( 'log.data >= (current_date() - 30)' ); + + return $query->getQuery()->execute(); + + } + + +} diff --git a/src/Cacic/CommonBundle/Entity/PatrimonioConfigInterfaceRepository.php b/src/Cacic/CommonBundle/Entity/PatrimonioConfigInterfaceRepository.php index fc232c0..823addd 100644 --- a/src/Cacic/CommonBundle/Entity/PatrimonioConfigInterfaceRepository.php +++ b/src/Cacic/CommonBundle/Entity/PatrimonioConfigInterfaceRepository.php @@ -12,6 +12,17 @@ use Doctrine\ORM\EntityRepository; */ class PatrimonioConfigInterfaceRepository extends EntityRepository { +/* +* Método de listagem dos Patrimonio de conf de interface cadastrados e respectivas informações +*/ + public function listar() + { + $_dql = "SELECT pci.teEtiqueta, pci.idEtiqueta + FROM CacicCommonBundle:PatrimonioConfigInterface pci + ORDER BY pci.idEtiqueta ASC"; + + return $this->getEntityManager()->createQuery( $_dql )->getArrayResult(); + } /** * diff --git a/src/Cacic/CommonBundle/Entity/RedeRepository.php b/src/Cacic/CommonBundle/Entity/RedeRepository.php index c53b367..8c8cced 100644 --- a/src/Cacic/CommonBundle/Entity/RedeRepository.php +++ b/src/Cacic/CommonBundle/Entity/RedeRepository.php @@ -36,11 +36,13 @@ class RedeRepository extends EntityRepository public function paginar( \Knp\Component\Pager\Paginator $paginator, $page = 1 ) { $qb = $this->createQueryBuilder('r') - ->select('r.idRede','r.nmRede','r.teIpRede','r.teServCacic', 'r.teServUpdates', 'r.teMascaraRede', 'l.nmLocal', 'COUNT(comp.idComputador) AS numComp', 's.nmServidorAutenticacao') + ->select('r.idRede','r.nmRede','r.teIpRede','r.teServCacic', 'r.teServUpdates', + 'r.teMascaraRede', 'l.nmLocal', 'COUNT(comp.idComputador) AS numComp', 's.nmServidorAutenticacao','uorg.nmUorg') ->innerJoin('CacicCommonBundle:Local', 'l', 'WITH', 'l.idLocal = r.idLocal') ->leftJoin('CacicCommonBundle:ServidorAutenticacao', 's', 'WITH', 's.idServidorAutenticacao = r.idServidorAutenticacao') ->leftJoin('CacicCommonBundle:Computador', 'comp', 'WITH', 'comp.idRede = r.idRede') - ->groupBy('r.idRede, r.nmRede, r.teIpRede, r.teServCacic, r.teServUpdates, r.teMascaraRede, l.nmLocal, s.nmServidorAutenticacao') + ->leftJoin('CacicCommonBundle:Uorg', 'uorg', 'WITH', 'uorg.rede = r.idRede') + ->groupBy('r.idRede, r.nmRede, r.teIpRede, r.teServCacic, r.teServUpdates, r.teMascaraRede, l.nmLocal, s.nmServidorAutenticacao, uorg.nmUorg') ->orderBy('r.teIpRede, l.nmLocal'); return $paginator->paginate( @@ -176,4 +178,33 @@ class RedeRepository extends EntityRepository return $qb->getQuery()->getArrayResult(); } + + public function gerarRelatorioRede( $filtros, $idRede ) + { + $qb = $this->createQueryBuilder('rede') + ->select('DISTINCT (comp.idComputador)', 'comp.nmComputador', 'comp.teNodeAddress','comp.teIpComputador', 'comp.dtHrUltAcesso', 'so.idSo', 'so.inMswindows', 'so.sgSo', 'rede.idRede' + , 'rede.nmRede', 'rede.teIpRede', 'local.nmLocal', 'local.idLocal') + ->innerJoin('CacicCommonBundle:Computador', 'comp','WITH','rede.idRede = comp.idRede') + ->innerJoin('CacicCommonBundle:ComputadorColetaHistorico','hist', 'WITH', 'comp.idComputador = hist.computador') + ->innerJoin('comp.idSo', 'so') + ->innerJoin('rede.idLocal', 'local') + ->where('comp.idRede = :rede') + ->setParameter('rede', $idRede); + /** + * Verifica os filtros + */ + if ( array_key_exists('locais', $filtros) && !empty($filtros['locais']) ) + $qb->andWhere('local.idLocal IN (:locais)')->setParameter('locais', explode( ',', $filtros['locais'] )); + + + + if ( array_key_exists('so', $filtros) && !empty($filtros['so']) ) + $qb->andWhere('comp.idSo IN (:so)')->setParameter('so', explode( ',', $filtros['so'] )); + + if ( array_key_exists('conf', $filtros) && !empty($filtros['conf']) ) + $qb->andWhere('property.idClassProperty IN (:conf)')->setParameter('conf', explode( ',', $filtros['conf'] )); + + + return $qb->getQuery()->execute(); + } } \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Entity/SoftwareRepository.php b/src/Cacic/CommonBundle/Entity/SoftwareRepository.php index ac77ce6..f7ec67c 100644 --- a/src/Cacic/CommonBundle/Entity/SoftwareRepository.php +++ b/src/Cacic/CommonBundle/Entity/SoftwareRepository.php @@ -39,18 +39,38 @@ class SoftwareRepository extends EntityRepository return $this->getEntityManager()->createQuery( $_dql )->getArrayResult(); } + public function listarSoftware() + { + $qb = $this->createQueryBuilder('sw') + ->select('sw.nmSoftware','class.idClassProperty') + ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software') + ->innerJoin('CacicCommonBundle:ClassProperty', 'class','WITH', 'prop.classProperty = class.idClassProperty') + ->groupBy('sw.nmSoftware,class.idClassProperty, class.nmPropertyName') + ->orderBy(' sw.nmSoftware'); + + return $qb->getQuery()->execute(); + } + /** * * Método de listagem dos Softwares cadastrados que não foram classificados (sem Tipo de Software) */ - public function listarNaoClassificados() + public function listarNaoClassificados( \Knp\Component\Pager\Paginator $paginator, $page = 1) { - $_dql = "SELECT s - FROM CacicCommonBundle:Software s - WHERE s.idTipoSoftware IS NULL - ORDER BY s.nmSoftware ASC"; + $qb = $this->createQueryBuilder('sw') + ->select('sw.nmSoftware','sw.idSoftware') + ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software') + ->innerJoin('CacicCommonBundle:ClassProperty', 'class','WITH', 'prop.classProperty = class.idClassProperty') + ->where('sw.idTipoSoftware is null') + ->groupBy('sw.nmSoftware,sw.idSoftware') + ->orderBy('sw.nmSoftware'); + + return $paginator->paginate( + $qb->getQuery()->execute(), + $page, + 10 + ); - return $this->getEntityManager()->createQuery( $_dql )->getArrayResult(); } /** @@ -77,20 +97,21 @@ class SoftwareRepository extends EntityRepository { // Monta a Consulta básica... $qb = $this->createQueryBuilder('sw') - ->select('COALESCE(sw.nmSoftware, prop.displayName) as nmSoftware', 'l.nmLocal', 'r.nmRede', 'r.teIpRede', 'COUNT(DISTINCT col.computador) AS numComp') + ->select('COALESCE(sw.nmSoftware, prop.displayName) as nmSoftware', 'l.nmLocal','COUNT(DISTINCT col.computador) AS numComp') ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software') + ->innerJoin('CacicCommonBundle:ClassProperty', 'class','WITH', 'prop.classProperty = class.idClassProperty') ->innerJoin('CacicCommonBundle:ComputadorColeta', 'col', 'WITH', 'col.computador = prop.computador') ->innerJoin('CacicCommonBundle:Computador', 'comp', 'WITH', 'col.computador = comp.idComputador') - ->innerJoin('CacicCommonBundle:Rede', 'r', 'WITH', 'comp.idRede = r.idRede') + ->innerJoin('comp.idRede','r') ->leftJoin('r.idLocal', 'l') - ->groupBy('sw.nmSoftware, prop.displayName, l.nmLocal, r.nmRede, r.teIpRede') + ->groupBy('sw.nmSoftware, prop.displayName, l.nmLocal') ->orderBy('sw.nmSoftware, l.nmLocal'); /** * Verifica os filtros que foram parametrizados */ if ( array_key_exists('softwares', $filtros) && !empty($filtros['softwares']) ) - $qb->andWhere('sw.idSoftware IN (:softwares)')->setParameter('softwares', explode( ',', $filtros['softwares'] )); + $qb->andWhere('class.idClassProperty IN (:softwares)')->setParameter('softwares', explode( ',', $filtros['softwares'] )); if ( array_key_exists('locais', $filtros) && !empty($filtros['locais']) ) $qb->andWhere('l.idLocal IN (:locais)')->setParameter('locais', explode( ',', $filtros['locais'] )); @@ -163,13 +184,12 @@ class SoftwareRepository extends EntityRepository { // Monta a Consulta básica... $qb = $this->createQueryBuilder('sw') - ->select('COALESCE(sw.nmSoftware, prop.displayName) as nmSoftware', 'tipo.teDescricaoTipoSoftware', 'tipo.idTipoSoftware', 'COUNT(DISTINCT col.computador) AS numComp') + ->select('COALESCE( sw.nmSoftware) as nmSoftware', 'tipo.teDescricaoTipoSoftware', 'COUNT(DISTINCT col.computador) AS numComp') ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software') ->innerJoin('CacicCommonBundle:ComputadorColeta', 'col', 'WITH', 'col.computador = prop.computador') ->innerJoin('CacicCommonBundle:Computador', 'comp', 'WITH', 'col.computador = comp.idComputador') ->innerJoin('CacicCommonBundle:TipoSoftware', 'tipo', 'WITH', 'sw.idTipoSoftware = tipo.idTipoSoftware') - ->groupBy('sw.nmSoftware, prop.displayName, tipo.teDescricaoTipoSoftware, tipo.idTipoSoftware') - ->orderBy('sw.nmSoftware'); + ->groupBy('tipo.teDescricaoTipoSoftware, sw.nmSoftware, tipo.idTipoSoftware'); /** * Verifica os filtros que foram parametrizados @@ -202,14 +222,15 @@ class SoftwareRepository extends EntityRepository { // Monta a Consulta básica... $qb = $this->createQueryBuilder('sw') - ->select( 'comp.nmComputador', 'sw.nmSoftware', 'so.teSo', 'r.teIpRede', 'l.nmLocal') - ->innerJoin('sw.estacoes', 'se') - ->innerJoin('se.idComputador', 'comp') - ->leftJoin('comp.idSo', 'so') - ->leftJoin('comp.idRede', 'r') - ->leftJoin('r.idLocal', 'l') - ->groupBy('so.teSo','comp.nmComputador','l, sw', 'r.teIpRede', 'l.nmLocal') - ->orderBy('sw.nmSoftware, l.nmLocal'); + ->select( 'comp.nmComputador', 'sw.nmSoftware', 'so.sgSo', 'r.teIpRede', 'l.nmLocal', 'pci.teEtiqueta', 'pci.idEtiqueta','comp.idComputador','so.inMswindows') + ->innerJoin('CacicCommonBundle:SoftwareEstacao', 'se','WITH','sw.idSoftware = se.idSoftware') + ->innerJoin('CacicCommonBundle:Computador', 'comp','WITH','se.idComputador = comp.idComputador') + ->leftJoin('CacicCommonBundle:So', 'so','WITH','comp.idSo = so.idSo') + ->leftJoin('CacicCommonBundle:Rede', 'r','WITH', 'comp.idRede = r.idRede') + ->innerJoin('CacicCommonBundle:Local','l','WITH', 'r.idLocal = l.idLocal') + ->innerJoin('CacicCommonBundle:PatrimonioConfigInterface','pci','WITH','l.idLocal = pci.local') + ->groupBy('comp.nmComputador, sw.nmSoftware, so.sgSo, r.teIpRede, l.nmLocal, pci.teEtiqueta, pci.idEtiqueta,comp.idComputador,so.inMswindows') + ->orderBy('sw.nmSoftware, l.nmLocal, pci.idEtiqueta'); /* * Verifica os filtros que foram parametrizados @@ -224,9 +245,10 @@ class SoftwareRepository extends EntityRepository if ( array_key_exists('so', $filtros) && !empty($filtros['so']) ) $qb->andWhere('comp.idSo IN (:so)')->setParameter('so', explode( ',', $filtros['so'] )); + if ( array_key_exists('pci', $filtros) && !empty($filtros['pci']) ) + $qb->andWhere('pci.idEtiqueta IN (:pci)')->setParameter('pci', explode( ',', $filtros['pci'] )); + return $qb->getQuery()->execute(); } - - } \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Entity/UorgRepository.php b/src/Cacic/CommonBundle/Entity/UorgRepository.php index a71deff..cf118ee 100644 --- a/src/Cacic/CommonBundle/Entity/UorgRepository.php +++ b/src/Cacic/CommonBundle/Entity/UorgRepository.php @@ -12,7 +12,13 @@ use Doctrine\ORM\EntityRepository; */ class UorgRepository extends EntityRepository { - + public function listar() + { + $_dql = "SELECT uorg.idUorg, uorg.nmUorg + FROM CacicCommonBundle:Uorg uorg"; + + return $this->getEntityManager()->createQuery( $_dql )->getArrayResult(); + } /** * * Recupera as Unidades Organizacionais do primeiro nível @@ -36,12 +42,12 @@ class UorgRepository extends EntityRepository */ public function getFolhasDoNo( $idUorgPai ) { - $_dql = "SELECT uorg, COUNT(filhas.idUorg) AS numFilhas + $_dql = "SELECT uorg.idUorg, uorg.nmUorg, COUNT(filhas.idUorg) AS numFilhas FROM CacicCommonBundle:Uorg uorg INNER JOIN uorg.uorgPai pai LEFT JOIN uorg.uorgFilhas filhas WHERE pai.idUorg = :idUorgPai - GROUP BY uorg.idUorg"; + GROUP BY uorg.idUorg, uorg.nmUorg"; return $this->getEntityManager()->createQuery( $_dql ) ->setParameter('idUorgPai', $idUorgPai) @@ -67,5 +73,19 @@ class UorgRepository extends EntityRepository { } - + + public function vincular() + { + $_dql = "SELECT uorg.idUorg, r.idRede, uorg.nmUorg, COUNT(filhas.idUorg) AS numFilhas + FROM CacicCommonBundle:Uorg uorg + LEFT JOIN uorg.uorgFilhas filhas + LEFT JOIN uorg.rede r + WHERE uorg.uorgPai IS NULL + GROUP BY uorg.idUorg, uorg.nmUorg, r.idRede"; + + return $this->getEntityManager()->createQuery( $_dql )->getArrayResult(); + } + + + } diff --git a/src/Cacic/CommonBundle/Entity/UsuarioRepository.php b/src/Cacic/CommonBundle/Entity/UsuarioRepository.php index d80dfb9..4a0ae9e 100644 --- a/src/Cacic/CommonBundle/Entity/UsuarioRepository.php +++ b/src/Cacic/CommonBundle/Entity/UsuarioRepository.php @@ -15,12 +15,13 @@ class UsuarioRepository extends EntityRepository public function paginar( \Knp\Component\Pager\Paginator $paginator, $page = 1 ) { - $_dql = "SELECT u, l.nmLocal, g.teGrupoUsuarios, COUNT(ls.idLocal) as numLocSec + $_dql = "SELECT u, u.nmUsuarioCompleto, l.nmLocal, g.teGrupoUsuarios, COUNT(ls.idLocal) as numLocSec FROM CacicCommonBundle:Usuario u JOIN u.idLocal l JOIN u.idGrupoUsuario g LEFT JOIN u.locaisSecundarios ls - GROUP BY u, l.nmLocal, g.teGrupoUsuarios"; + GROUP BY u, l.nmLocal, g.teGrupoUsuarios + ORDER BY u.nmUsuarioCompleto, l.nmLocal ASC"; return $paginator->paginate( $this->getEntityManager()->createQuery( $_dql ), diff --git a/src/Cacic/CommonBundle/Form/Type/AquisicaoItemType.php b/src/Cacic/CommonBundle/Form/Type/AquisicaoItemType.php index e1fe326..d3dad4e 100644 --- a/src/Cacic/CommonBundle/Form/Type/AquisicaoItemType.php +++ b/src/Cacic/CommonBundle/Form/Type/AquisicaoItemType.php @@ -2,6 +2,7 @@ namespace Cacic\CommonBundle\Form\Type; +use Cacic\CommonBundle\Entity\SoftwareRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -31,9 +32,19 @@ class AquisicaoItemType extends AbstractType 'entity', array( 'class' => 'CacicCommonBundle:Software', - 'property' => 'nmSoftware', + 'query_builder' => function(SoftwareRepository $er) { + return $er->createQueryBuilder('sw') + ->select('sw') + ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software') + ->innerJoin('CacicCommonBundle:ClassProperty', 'class','WITH', 'prop.classProperty = class.idClassProperty') + ->groupBy('class.idClassProperty, class.nmPropertyName, sw') + ->orderBy('sw.nmSoftware'); + }, + 'property'=>'nmSoftware', 'empty_value' => 'Selecione', - 'label'=>'Software:', 'max_length'=>100 ) + 'label'=>'Software:', + 'max_length'=>100 + ) ); $builder->add( diff --git a/src/Cacic/CommonBundle/Form/Type/AquisicaoType.php b/src/Cacic/CommonBundle/Form/Type/AquisicaoType.php index d8008d4..3a2b00e 100644 --- a/src/Cacic/CommonBundle/Form/Type/AquisicaoType.php +++ b/src/Cacic/CommonBundle/Form/Type/AquisicaoType.php @@ -19,7 +19,7 @@ class AquisicaoType extends AbstractType $builder->add( 'nrProcesso', null, - array( 'label'=>'Processo de aquisicao:', 'max_length'=>11 ) + array( 'label'=>'Processo de aquisicao:', 'max_length'=>60 ) ); $builder->add( diff --git a/src/Cacic/CommonBundle/Form/Type/AtesteType.php b/src/Cacic/CommonBundle/Form/Type/AtesteType.php new file mode 100755 index 0000000..d9c3c52 --- /dev/null +++ b/src/Cacic/CommonBundle/Form/Type/AtesteType.php @@ -0,0 +1,72 @@ +add( + 'descricao', + 'text', + array( + 'label'=>'Descrição:', + 'disabled' => true, + 'attr' => array( + 'value' => 'Ateste' + ) + ) + ); + + $builder->add( + 'atestado', + 'checkbox', + array( + 'label' => 'Ateste', + 'required' => false + ) + ); + + $builder->add( + 'detalhes', + 'textarea', + array( + 'label' => 'Insira sua justificativa para discordância', + 'required' => false + ) + ); + + $builder->add( + 'qualidade_servico', + 'textarea', + array( + 'label' => 'Insira seus comentários sobre a qualidade do serviço' + ) + ); + + } + + /** + * Get Name + */ + + public function getName() { + return 'Ateste'; + } + +} \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Form/Type/GrupoUsuarioType.php b/src/Cacic/CommonBundle/Form/Type/GrupoUsuarioType.php index 4e94c69..91c85c8 100644 --- a/src/Cacic/CommonBundle/Form/Type/GrupoUsuarioType.php +++ b/src/Cacic/CommonBundle/Form/Type/GrupoUsuarioType.php @@ -36,7 +36,7 @@ class GrupoUsuarioType extends AbstractType 'label' => 'Acessos:' ) ); - $builder->add( 'csNivelAdministracao', 'text', + $builder->add( 'csNivelAdministracao', 'number', array( 'max_length' => 50, 'required'=>false, diff --git a/src/Cacic/CommonBundle/Form/Type/RedeType.php b/src/Cacic/CommonBundle/Form/Type/RedeType.php index ee15c72..9ea0123 100644 --- a/src/Cacic/CommonBundle/Form/Type/RedeType.php +++ b/src/Cacic/CommonBundle/Form/Type/RedeType.php @@ -22,6 +22,7 @@ class RedeType extends AbstractType 'empty_value' => 'Selecione o Local', 'class' => 'CacicCommonBundle:Local', 'property' => 'nmLocal', + 'required' =>true, 'label' => 'Local' ) ); diff --git a/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php b/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php index 52ca4c9..cd3e511 100644 --- a/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php +++ b/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php @@ -55,8 +55,7 @@ class ServidorAutenticacaoType extends AbstractType 'label'=>'Servidor Ativo:', 'required' => true, 'multiple'=> false, - 'expanded' => true, - 'data'=> 'S' + 'expanded' => true ) ); diff --git a/src/Cacic/CommonBundle/Resources/config/doctrine/Ateste.orm.yml b/src/Cacic/CommonBundle/Resources/config/doctrine/Ateste.orm.yml new file mode 100755 index 0000000..12e9b79 --- /dev/null +++ b/src/Cacic/CommonBundle/Resources/config/doctrine/Ateste.orm.yml @@ -0,0 +1,43 @@ +Cacic\CommonBundle\Entity\Ateste: + type: entity + table: ateste + repositoryClass: Cacic\CommonBundle\Entity\AtesteRepository + fields: + idAteste: + id: true + type: integer + unsigned: false + nullable: false + column: id_ateste + generator: + strategy: IDENTITY + descricao: + type: text + nullable: true + column: descricao_ateste + detalhes: + type: text + nullable: true + column: detalhes + atestado: + type: boolean + nullable: false + column: atestado + data: + type: datetime + nullable: false + column: data + qualidadeServico: + type: text + nullable: true + column: qualidade_servico + manyToOne: + usuario: + targetEntity: Usuario + cascade: { } + mappedBy: null + inversedBy: null + joinColumns: + id_usuario: + referencedColumnName: id_usuario + orphanRemoval: false \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Resources/config/doctrine/AtesteRedes.orm.yml b/src/Cacic/CommonBundle/Resources/config/doctrine/AtesteRedes.orm.yml new file mode 100755 index 0000000..eab69e4 --- /dev/null +++ b/src/Cacic/CommonBundle/Resources/config/doctrine/AtesteRedes.orm.yml @@ -0,0 +1,33 @@ +Cacic\CommonBundle\Entity\AtesteRedes: + type: entity + table: ateste_redes + repositoryClass: Cacic\CommonBundle\Entity\AtesteRedesRepository + id: + rede: + associationKey: true + ateste: + associationKey: true + fields: + estacoes: + type: integer + nullable: false + column: estacoes + manyToOne: + rede: + targetEntity: Rede + cascade: { } + mappedBy: null + inversedBy: null + joinColumns: + id_rede: + referencedColumnName: id_rede + orphanRemoval: false + ateste: + targetEntity: Ateste + cascade: { } + mappedBy: null + inversedBy: null + joinColumns: + id_ateste: + referencedColumnName: id_ateste + orphanRemoval: false \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Resources/config/doctrine/LogAcesso.orm.yml b/src/Cacic/CommonBundle/Resources/config/doctrine/LogAcesso.orm.yml new file mode 100755 index 0000000..3ff5543 --- /dev/null +++ b/src/Cacic/CommonBundle/Resources/config/doctrine/LogAcesso.orm.yml @@ -0,0 +1,27 @@ +Cacic\CommonBundle\Entity\LogAcesso: + type: entity + table: log_acesso + repositoryClass: Cacic\CommonBundle\Entity\LogAcessoRepository + fields: + idLogAcesso: + id: true + type: integer + unsigned: false + nullable: false + column: id_log_acesso + generator: + strategy: IDENTITY + data: + type: datetime + nullable: false + column: data + manyToOne: + idComputador: + targetEntity: Computador + cascade: { } + mappedBy: null + inversedBy: null + joinColumns: + id_computador: + referencedColumnName: id_computador + orphanRemoval: false \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Resources/config/routing.yml b/src/Cacic/CommonBundle/Resources/config/routing.yml index af21aa7..5492960 100644 --- a/src/Cacic/CommonBundle/Resources/config/routing.yml +++ b/src/Cacic/CommonBundle/Resources/config/routing.yml @@ -227,8 +227,10 @@ cacic_software_excluir: defaults: { _controller: CacicCommonBundle:Software:excluir} cacic_software_naoclassificados: - pattern: /software/naoclassificados - defaults: { _controller: CacicCommonBundle:Software:naoClassificados} + pattern: /software/naoclassificados/{page} + defaults: { _controller: CacicCommonBundle:Software:naoClassificados, page:1} + requirements: + page: \d+ cacic_software_naousados: pattern: /software/naousados @@ -507,4 +509,8 @@ cacic_grupo_usuario_editar: cacic_grupo_usuario_excluir: pattern: /grupousuario/excluir - defaults: { _controller: CacicCommonBundle:GrupoUsuario:excluir} \ No newline at end of file + defaults: { _controller: CacicCommonBundle:GrupoUsuario:excluir} + +cacic_ateste: + pattern: /ateste/ + defaults: { _controller: CacicCommonBundle:Ateste:index } \ No newline at end of file diff --git a/src/Cacic/CommonBundle/Resources/config/services.yml b/src/Cacic/CommonBundle/Resources/config/services.yml index 2623297..c676882 100644 --- a/src/Cacic/CommonBundle/Resources/config/services.yml +++ b/src/Cacic/CommonBundle/Resources/config/services.yml @@ -6,4 +6,9 @@ services: cacic.twig.siglas_extension: class: Cacic\CommonBundle\Twig\SiglasExtension tags: - - { name: twig.extension } \ No newline at end of file + - { name: twig.extension } + cacic.twig.bundles_extension: + class: Cacic\CommonBundle\Twig\BundlesExtension + arguments: [@service_container] + tags: + - { name: twig.extension } diff --git a/src/Cacic/CommonBundle/Resources/config/validation.yml b/src/Cacic/CommonBundle/Resources/config/validation.yml index c41e5bd..4cff108 100644 --- a/src/Cacic/CommonBundle/Resources/config/validation.yml +++ b/src/Cacic/CommonBundle/Resources/config/validation.yml @@ -207,7 +207,7 @@ Cacic\CommonBundle\Entity\Aquisicao: nrProcesso: - NotBlank: ~ - Length: - max: 11 + max: 40 nmEmpresa: - NotBlank: ~ - Length: diff --git a/src/Cacic/CommonBundle/Resources/views/Aplicativo/cadastrar.html.twig b/src/Cacic/CommonBundle/Resources/views/Aplicativo/cadastrar.html.twig index 470fcfc..9fd209e 100644 --- a/src/Cacic/CommonBundle/Resources/views/Aplicativo/cadastrar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Aplicativo/cadastrar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Aplicativo"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Aplicativo/index.html.twig b/src/Cacic/CommonBundle/Resources/views/Aplicativo/index.html.twig index cd05927..4931bef 100644 --- a/src/Cacic/CommonBundle/Resources/views/Aplicativo/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Aplicativo/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %} diff --git a/src/Cacic/CommonBundle/Resources/views/Aquisicao/cadastrar.html.twig b/src/Cacic/CommonBundle/Resources/views/Aquisicao/cadastrar.html.twig index bb2b062..c0d7612 100644 --- a/src/Cacic/CommonBundle/Resources/views/Aquisicao/cadastrar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Aquisicao/cadastrar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Aquisição"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Aquisicao/index.html.twig b/src/Cacic/CommonBundle/Resources/views/Aquisicao/index.html.twig index 7a61a5b..dc41a77 100644 --- a/src/Cacic/CommonBundle/Resources/views/Aquisicao/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Aquisicao/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %} diff --git a/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/cadastrar.html.twig b/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/cadastrar.html.twig index 147059d..28a13da 100755 --- a/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/cadastrar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/cadastrar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Aquisição de Item"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/index.html.twig b/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/index.html.twig index 1609e3e..290bf4a 100644 --- a/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/AquisicaoItem/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %} diff --git a/src/Cacic/CommonBundle/Resources/views/Ateste/acessoResultado.html.twig b/src/Cacic/CommonBundle/Resources/views/Ateste/acessoResultado.html.twig new file mode 100755 index 0000000..46c7566 --- /dev/null +++ b/src/Cacic/CommonBundle/Resources/views/Ateste/acessoResultado.html.twig @@ -0,0 +1,102 @@ +
- {{ 'Ateste'|trans }} +{% endblock %} + +{% block body %} + +
- {{ "Migração Cacic 2.6"|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Computador/buscar.html.twig b/src/Cacic/CommonBundle/Resources/views/Computador/buscar.html.twig index d1557fb..f3c2ffd 100644 --- a/src/Cacic/CommonBundle/Resources/views/Computador/buscar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Computador/buscar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Computadores das Subredes'|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Computador/consultar.html.twig b/src/Cacic/CommonBundle/Resources/views/Computador/consultar.html.twig index a735913..eacd67d 100755 --- a/src/Cacic/CommonBundle/Resources/views/Computador/consultar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Computador/consultar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Computadores das Subredes'|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig b/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig index 15e130a..5c74425 100644 --- a/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Computador/detalhar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Computadores"|trans }} / @@ -36,8 +36,10 @@
- {{ "Computadores"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Computador/navegar.html.twig b/src/Cacic/CommonBundle/Resources/views/Computador/navegar.html.twig index 1d0ea19..024f15c 100644 --- a/src/Cacic/CommonBundle/Resources/views/Computador/navegar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Computador/navegar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Computadores"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Configuracao/agente.html.twig b/src/Cacic/CommonBundle/Resources/views/Configuracao/agente.html.twig index 7c584a9..02feb52 100644 --- a/src/Cacic/CommonBundle/Resources/views/Configuracao/agente.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Configuracao/agente.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Configuração Local'|trans }} ({{ local.getSgLocal() }}) diff --git a/src/Cacic/CommonBundle/Resources/views/Configuracao/gerente.html.twig b/src/Cacic/CommonBundle/Resources/views/Configuracao/gerente.html.twig index 3d43a64..b819dce 100644 --- a/src/Cacic/CommonBundle/Resources/views/Configuracao/gerente.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Configuracao/gerente.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Configuração Gerente'|trans }} ({{ local.getSgLocal() }}) diff --git a/src/Cacic/CommonBundle/Resources/views/Configuracao/padrao.html.twig b/src/Cacic/CommonBundle/Resources/views/Configuracao/padrao.html.twig index 5532155..c79068f 100644 --- a/src/Cacic/CommonBundle/Resources/views/Configuracao/padrao.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Configuracao/padrao.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Configuração Padrão'|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Default/downloads.html.twig b/src/Cacic/CommonBundle/Resources/views/Default/downloads.html.twig index 3d2c357..cd173f2 100644 --- a/src/Cacic/CommonBundle/Resources/views/Default/downloads.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Default/downloads.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block body %} diff --git a/src/Cacic/CommonBundle/Resources/views/Default/index.html.twig b/src/Cacic/CommonBundle/Resources/views/Default/index.html.twig index ac90f7c..ecc1e9e 100644 --- a/src/Cacic/CommonBundle/Resources/views/Default/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Default/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block body %} @@ -11,7 +11,7 @@
- {{ estatisticas['totalCompMonitorados'] }}{{ 'Totais de computadores monitorados'|trans }} -
- 0 {{ 'Últimos acessos dos agentes'|trans }} +
- {{ estatisticas['totalComp'][0][1] }} {{ 'Acessos dos agentes nos últimos 30 dias'|trans }}
- {{ estatisticas['totalInsucessosInstalacao'] }} {{ 'Totais de tentativas de instalação malsucedidas'|trans }}
- {{ "Grupo de Usuários"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/GrupoUsuario/index.html.twig b/src/Cacic/CommonBundle/Resources/views/GrupoUsuario/index.html.twig index a77e838..e50b969 100644 --- a/src/Cacic/CommonBundle/Resources/views/GrupoUsuario/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/GrupoUsuario/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Grupos de Usuários"|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Local/cadastrar.html.twig b/src/Cacic/CommonBundle/Resources/views/Local/cadastrar.html.twig index 396bd1b..92e2024 100644 --- a/src/Cacic/CommonBundle/Resources/views/Local/cadastrar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Local/cadastrar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Locais"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Local/importarcsv.html.twig b/src/Cacic/CommonBundle/Resources/views/Local/importarcsv.html.twig index 5577728..311b2c2 100644 --- a/src/Cacic/CommonBundle/Resources/views/Local/importarcsv.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Local/importarcsv.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Locais"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Local/index.html.twig b/src/Cacic/CommonBundle/Resources/views/Local/index.html.twig index 5d08f0d..2706486 100644 --- a/src/Cacic/CommonBundle/Resources/views/Local/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Local/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Locais"|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Log/acesso.html.twig b/src/Cacic/CommonBundle/Resources/views/Log/acesso.html.twig index d5a4b74..6b05ad9 100644 --- a/src/Cacic/CommonBundle/Resources/views/Log/acesso.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Log/acesso.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Log de Acesso'|trans }} @@ -104,4 +104,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Cacic/CommonBundle/Resources/views/Log/atividade.html.twig b/src/Cacic/CommonBundle/Resources/views/Log/atividade.html.twig index bf02a9b..e943092 100644 --- a/src/Cacic/CommonBundle/Resources/views/Log/atividade.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Log/atividade.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Log de Atividades'|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Log/insucesso.html.twig b/src/Cacic/CommonBundle/Resources/views/Log/insucesso.html.twig index a35d9f9..ddc03c4 100644 --- a/src/Cacic/CommonBundle/Resources/views/Log/insucesso.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Log/insucesso.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Logs de Insucessos de Instalação'|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Log/suporte.html.twig b/src/Cacic/CommonBundle/Resources/views/Log/suporte.html.twig index 031e303..b3231fe 100644 --- a/src/Cacic/CommonBundle/Resources/views/Log/suporte.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Log/suporte.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ 'Log de Suporte Remoto'|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Modulo/editar.html.twig b/src/Cacic/CommonBundle/Resources/views/Modulo/editar.html.twig index 5926647..6bd695d 100644 --- a/src/Cacic/CommonBundle/Resources/views/Modulo/editar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Modulo/editar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Módulos"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Modulo/index.html.twig b/src/Cacic/CommonBundle/Resources/views/Modulo/index.html.twig index 745b4ed..5a82638 100644 --- a/src/Cacic/CommonBundle/Resources/views/Modulo/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Modulo/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Módulos"|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/PatrimonioConfigInterface/etiqueta1.html.twig b/src/Cacic/CommonBundle/Resources/views/PatrimonioConfigInterface/etiqueta1.html.twig index cc30832..0f116c5 100644 --- a/src/Cacic/CommonBundle/Resources/views/PatrimonioConfigInterface/etiqueta1.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/PatrimonioConfigInterface/etiqueta1.html.twig @@ -18,7 +18,7 @@
- {{ "Opções"|trans }} diff --git a/src/Cacic/CommonBundle/Resources/views/Rede/cadastrar.html.twig b/src/Cacic/CommonBundle/Resources/views/Rede/cadastrar.html.twig index 231f05e..705c45b 100644 --- a/src/Cacic/CommonBundle/Resources/views/Rede/cadastrar.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Rede/cadastrar.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "SubRedes"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Rede/importarcsv.html.twig b/src/Cacic/CommonBundle/Resources/views/Rede/importarcsv.html.twig index 4a24b67..94e642d 100644 --- a/src/Cacic/CommonBundle/Resources/views/Rede/importarcsv.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Rede/importarcsv.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Subredes"|trans }} / diff --git a/src/Cacic/CommonBundle/Resources/views/Rede/index.html.twig b/src/Cacic/CommonBundle/Resources/views/Rede/index.html.twig index 6b1ff2f..58048d4 100644 --- a/src/Cacic/CommonBundle/Resources/views/Rede/index.html.twig +++ b/src/Cacic/CommonBundle/Resources/views/Rede/index.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'CacicCommonBundle::base.html.twig' %} {% block breadcrumb %}
- {{ "Subredes"|trans }} @@ -86,22 +86,95 @@
+
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Resources/views/Ateste/index.html.twig b/src/Cacic/CommonBundle/Resources/views/Ateste/index.html.twig
new file mode 100755
index 0000000..fd0469a
--- /dev/null
+++ b/src/Cacic/CommonBundle/Resources/views/Ateste/index.html.twig
@@ -0,0 +1,115 @@
+{% extends 'CacicCommonBundle::base.html.twig' %}
+
+{% block breadcrumb %}
+
+
+
+
+ {{'Resultado da pesquisa' |trans }}
+
+
+
+
+
+
+
+
+
+ {% if logs is not null %}
+ {% include 'CacicCommonBundle:Ateste:acessoResultado.html.twig' %}
+ {% endif %}
+
+{% endblock %}
+
+{% block javascripts %}
+
+
+
+ {{ parent() }}
+ {% if locale == 'pt_BR' %}
+
+
+
+ {% else %}
+
+
+
+ {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Resources/views/Cacic26/migracao.html.twig b/src/Cacic/CommonBundle/Resources/views/Cacic26/migracao.html.twig
index b3b8782..a515b60 100644
--- a/src/Cacic/CommonBundle/Resources/views/Cacic26/migracao.html.twig
+++ b/src/Cacic/CommonBundle/Resources/views/Cacic26/migracao.html.twig
@@ -1,4 +1,4 @@
-{% extends '::base.html.twig' %}
+{% extends 'CacicCommonBundle::base.html.twig' %}
{% block breadcrumb %}
+
+
+
+
+
+ {{'Pesquisa por Logs de Acesso' |trans }}
+ +
+
+
+ + +
+ {{ "Filtros para consulta"|trans }}
+ + +
+
+
+
+
+
+ {{ "Informações Adicionais"|trans }}
+ +
+
+ + {{ "Ateste"|trans }}. +
++ {{ "O período é obrigatório"|trans }}. +
++ {{ "Não selecionar nenhum valor em determinado critério é o mesmo que selecionar todos"|trans }}. +
+{{ ' Exemplo "Selecione a Gerência de localização este equipamento" '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ ' Exemplo "Selecione a Linha de negócio de localização deste equipamento" '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ ' Exemplo "Selecione a divisão onde encontra-se este equipamento" '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ ' Exemplo "Informe o setor onde esta localizado o equipamento." '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
{{ 'Elemento origatório?'|trans }}
{{ 'Elemento obrigatório?'|trans }}
{{ ' O preenchimento do campo é obrigatório? '|trans }}
-
-
+
+ {{ knp_pagination_render(softwares) }}
+
-
+