From 3cc425e0be6d671434d9567449aef02baa891632 Mon Sep 17 00:00:00 2001 From: Gedeson Wasley Date: Thu, 27 Mar 2014 09:44:02 -0300 Subject: [PATCH] Correção de Relatórios --- src/Cacic/RelatorioBundle/Controller/FaturamentoController.php | 32 +++++++++++++++++++++++++++----- src/Cacic/RelatorioBundle/Controller/SoftwareController.php | 2 +- src/Cacic/RelatorioBundle/Resources/config/routing.yml | 16 ++++++++++++++++ src/Cacic/RelatorioBundle/Resources/views/Faturamento/acessoResultado.html.twig | 12 +++++++++++- src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativos.html.twig | 7 +------ src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativosResultado.html.twig | 11 +++++++++++ src/Cacic/RelatorioBundle/Resources/views/Faturamento/index.html.twig | 7 +------ src/Cacic/RelatorioBundle/Resources/views/Software/rel_inventariados.html.twig | 2 ++ src/Cacic/RelatorioBundle/Resources/views/Software/rel_software_lista.html.twig | 2 ++ src/Cacic/RelatorioBundle/Resources/views/Software/rel_tipo.html.twig | 2 +- 10 files changed, 73 insertions(+), 20 deletions(-) diff --git a/src/Cacic/RelatorioBundle/Controller/FaturamentoController.php b/src/Cacic/RelatorioBundle/Controller/FaturamentoController.php index 55b0cba..53a12ff 100755 --- a/src/Cacic/RelatorioBundle/Controller/FaturamentoController.php +++ b/src/Cacic/RelatorioBundle/Controller/FaturamentoController.php @@ -18,7 +18,17 @@ $form = $this->createForm( new LogPesquisaType() ); + return $this->render( 'CacicRelatorioBundle:Faturamento:index.html.twig', + array( + 'locale'=> $locale, + 'form' => $form->createView() + ) + ); + } + public function faturamentoRelatorioAction(Request $request){ + $locale = $request->getLocale(); + $form = $this->createForm( new LogPesquisaType() ); if ( $request->isMethod('POST') ) { $form->bind( $request ); @@ -31,12 +41,11 @@ $logs = $this->getDoctrine()->getRepository( 'CacicCommonBundle:LogAcesso') ->pesquisar( $data['dtAcaoInicio'], $data['dtAcaoFim'], $filtroLocais); - } - return $this->render( 'CacicRelatorioBundle:Faturamento:index.html.twig', + return $this->render( 'CacicRelatorioBundle:Faturamento:acessoResultado.html.twig', array( - 'locale'=> $locale, + 'idioma'=> $locale, 'form' => $form->createView(), 'data' =>$data, 'logs' => ( isset( $logs ) ? $logs : null ) @@ -72,6 +81,19 @@ $form = $this->createForm( new LogPesquisaType() ); + return $this->render( 'CacicRelatorioBundle:Faturamento:inativos.html.twig', + array( + 'locale'=> $locale, + 'form' => $form->createView() + ) + ); + } + + public function inativosRelatorioAction(Request $request){ + $locale = $request->getLocale(); + + $form = $this->createForm( new LogPesquisaType() ); + if ( $request->isMethod('POST') ) { @@ -88,9 +110,9 @@ } - return $this->render( 'CacicRelatorioBundle:Faturamento:inativos.html.twig', + return $this->render( 'CacicRelatorioBundle:Faturamento:inativosResultado.html.twig', array( - 'locale'=> $locale, + 'idioma'=> $locale, 'form' => $form->createView(), 'data' =>$data, 'logs' => ( isset( $logs ) ? $logs : null ) diff --git a/src/Cacic/RelatorioBundle/Controller/SoftwareController.php b/src/Cacic/RelatorioBundle/Controller/SoftwareController.php index c8f19f3..cda59ee 100644 --- a/src/Cacic/RelatorioBundle/Controller/SoftwareController.php +++ b/src/Cacic/RelatorioBundle/Controller/SoftwareController.php @@ -157,7 +157,7 @@ class SoftwareController extends Controller $dados = $this->getDoctrine() ->getRepository('CacicCommonBundle:Software') ->gerarRelatorioSoftwaresPorOrgao( $request->get('form') ); - + return $this->render( 'CacicRelatorioBundle:Software:rel_orgao.html.twig', array( diff --git a/src/Cacic/RelatorioBundle/Resources/config/routing.yml b/src/Cacic/RelatorioBundle/Resources/config/routing.yml index 72a6089..2e84b5a 100644 --- a/src/Cacic/RelatorioBundle/Resources/config/routing.yml +++ b/src/Cacic/RelatorioBundle/Resources/config/routing.yml @@ -5,6 +5,14 @@ cacic_relatorio_autorizacoes: cacic_relatorio_faturamento: pattern: /faturamento defaults: { _controller: CacicRelatorioBundle:Faturamento:index } + requirements: + _method: GET + +cacic_relatorio_resultado: + pattern: /faturamento + defaults: { _controller: CacicRelatorioBundle:Faturamento:faturamentoRelatorio } + requirements: + _method: POST cacic_relatorio_faturamento_listar: pattern: /software/faturamento/{idRede}/{dtAcaoInicio}/{dtAcaoFim} @@ -121,6 +129,14 @@ cacic_relatorio_hardware_wmi_detalhe: cacic_relatorio_inativos: pattern: /inativos defaults: { _controller: CacicRelatorioBundle:Faturamento:inativos } + requirements: + _method: GET + +cacic_relatorio_inativos_rel: + pattern: /inativos + defaults: { _controller: CacicRelatorioBundle:Faturamento:inativosRelatorio } + requirements: + _method: POST cacic_relatorio_inativos_listar: pattern: /inativos/{idRede}/{dtAcaoInicio}/{dtAcaoFim} diff --git a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/acessoResultado.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/acessoResultado.html.twig index 3d7cfcf..d1327d6 100755 --- a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/acessoResultado.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/acessoResultado.html.twig @@ -1,9 +1,17 @@ +{% extends 'CacicRelatorioBundle::base.html.twig' %} + +{% block body %} +

{{'Resultado do Faturamento' |trans }}

+

{{ 'Relatório de Faturamento'|trans }}

+
{{ 'Relatório gerado em'|trans }} {% if idioma == 'pt_BR' %}{{ "now"|date("d/m/Y H\\hi") }}{% else %}{{ "now"|date("m/d/Y H\\hi") }}{% endif %}
+ +
@@ -55,4 +63,6 @@
-
\ No newline at end of file + + +{% endblock %} \ No newline at end of file diff --git a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativos.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativos.html.twig index 7c033bd..3abe526 100755 --- a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativos.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativos.html.twig @@ -17,7 +17,7 @@

{{ "Período para verificação de computadores inativos"|trans }}


- +
@@ -81,11 +81,6 @@
- {% if logs is not null %} - {% include 'CacicRelatorioBundle:Faturamento:inativosResultado.html.twig' %} - - {% endif %} - {% endblock %} {% block javascripts %} diff --git a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativosResultado.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativosResultado.html.twig index 7b616aa..5e9c3c2 100755 --- a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativosResultado.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/inativosResultado.html.twig @@ -1,9 +1,18 @@ +{% extends 'CacicRelatorioBundle::base.html.twig' %} + +{% block body %} +

{{'Total de estações inativas' |trans }}

+

{{ 'Relatório sem Coletas'|trans }}

+
{{ 'Relatório gerado em'|trans }} {% if idioma == 'pt_BR' %}{{ "now"|date("d/m/Y H\\hi") }}{% else %}{{ "now"|date("m/d/Y H\\hi") }}{% endif %}
+ +
+ @@ -56,3 +65,5 @@
+ +{% endblock %} \ No newline at end of file diff --git a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/index.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/index.html.twig index 15adb76..32a214c 100755 --- a/src/Cacic/RelatorioBundle/Resources/views/Faturamento/index.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Faturamento/index.html.twig @@ -17,7 +17,7 @@

{{ "Filtros para faturamento mensal"|trans }}


- +
@@ -81,11 +81,6 @@
- {% if logs is not null %} - {% include 'CacicRelatorioBundle:Faturamento:acessoResultado.html.twig' %} - - {% endif %} - {% endblock %} {% block javascripts %} diff --git a/src/Cacic/RelatorioBundle/Resources/views/Software/rel_inventariados.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Software/rel_inventariados.html.twig index 18d3a70..961a158 100644 --- a/src/Cacic/RelatorioBundle/Resources/views/Software/rel_inventariados.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Software/rel_inventariados.html.twig @@ -10,6 +10,7 @@ + @@ -21,6 +22,7 @@ {% for reg in dados %} + diff --git a/src/Cacic/RelatorioBundle/Resources/views/Software/rel_software_lista.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Software/rel_software_lista.html.twig index d68cf0c..6624063 100755 --- a/src/Cacic/RelatorioBundle/Resources/views/Software/rel_software_lista.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Software/rel_software_lista.html.twig @@ -10,6 +10,7 @@
{{ "Software"|trans }} {{ "Local"|trans }} {{ "Máquinas"|trans }}
{{ loop.index }} {{ reg['nmSoftware'] }} {{ reg['nmLocal'] }} {{ reg['numComp'] }}
+ @@ -23,6 +24,7 @@ {% for reg in dados %} + diff --git a/src/Cacic/RelatorioBundle/Resources/views/Software/rel_tipo.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Software/rel_tipo.html.twig index 2b1525b..52e6c5d 100644 --- a/src/Cacic/RelatorioBundle/Resources/views/Software/rel_tipo.html.twig +++ b/src/Cacic/RelatorioBundle/Resources/views/Software/rel_tipo.html.twig @@ -21,7 +21,7 @@ - {% else %} -- libgit2 0.21.2
{{ "Computador"|trans }} {{ "MAC Address"|trans }} {{ "Endereço IP"|trans }}
{{ loop.index }} {{ reg.nmComputador }}
{{ reg.teDescricaoTipoSoftware }} {{ reg.nmSoftware }} + {{ reg.numComp }}