Commit b8951ec0fa05c760a565d2e13b2d445a969797ce
Exists in
master
and in
1 other branch
Merge branch 'master' of https://github.com/lightbase/cacic
Showing
1 changed file
with
2 additions
and
9 deletions
Show diff stats
src/Cacic/RelatorioBundle/Resources/views/Faturamento/faturamentoResultado.html.twig
@@ -24,17 +24,10 @@ | @@ -24,17 +24,10 @@ | ||
24 | <th width="20%" style="text-align: center">{{ "Endereço IP"|trans }}</th> | 24 | <th width="20%" style="text-align: center">{{ "Endereço IP"|trans }}</th> |
25 | <th width="20%" style="text-align: center">{{ "Estações"|trans }}</th> | 25 | <th width="20%" style="text-align: center">{{ "Estações"|trans }}</th> |
26 | <th style="text-align: center"> | 26 | <th style="text-align: center"> |
27 | - {% if logs|length > 0 %} | ||
28 | - {% cont++ %} | ||
29 | - <a class="btn btn-success" href="{{ path('cacic_faturamento_listar_csv') }}/ | ||
30 | - {% for log in logs %}{{logs[{% cont %}]['idRede']}}/{{data['dtAcaoInicio'] }}/{{ data['dtAcaoFim'] }}{% endfor %}" title="{{ "Relatório de coletas do software"|trans }}" target="_blank"> | ||
31 | - <i class="icon-download-alt"></i> | ||
32 | - </a> | ||
33 | - {% endif %} | 27 | + |
34 | </th> | 28 | </th> |
35 | </tr> | 29 | </tr> |
36 | </thead> | 30 | </thead> |
37 | - | ||
38 | <tbody> | 31 | <tbody> |
39 | {% for log in logs %} | 32 | {% for log in logs %} |
40 | 33 | ||
@@ -56,7 +49,7 @@ | @@ -56,7 +49,7 @@ | ||
56 | 49 | ||
57 | {% else %} | 50 | {% else %} |
58 | <tr> | 51 | <tr> |
59 | - <td style="text-align: center;" colspan="4"><b>{{ "NENHUM REGISTRO ENCONTRADO!"|trans }}</b></td> | 52 | + <td style="text-align: center;" colspan="6"><b>{{ "NENHUM REGISTRO ENCONTRADO!"|trans }}</b></td> |
60 | </tr> | 53 | </tr> |
61 | {% endfor %} | 54 | {% endfor %} |
62 | 55 |