Commit d2b8565238c7956dbdb22523e2c39c2c5bae30ef
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
6 additions
and
0 deletions
Show diff stats
src/Cacic/CommonBundle/Entity/SoftwareRepository.php
| @@ -215,6 +215,7 @@ class SoftwareRepository extends EntityRepository | @@ -215,6 +215,7 @@ class SoftwareRepository extends EntityRepository | ||
| 215 | // Monta a Consulta básica... | 215 | // Monta a Consulta básica... |
| 216 | $qb = $this->createQueryBuilder('sw'); | 216 | $qb = $this->createQueryBuilder('sw'); |
| 217 | $qb->select('sw', 'tpsw', 'se') | 217 | $qb->select('sw', 'tpsw', 'se') |
| 218 | + ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'sw.idSoftware = prop.software') | ||
| 218 | ->leftJoin('sw.idTipoSoftware', 'tpsw') | 219 | ->leftJoin('sw.idTipoSoftware', 'tpsw') |
| 219 | ->leftJoin('sw.estacoes', 'se') | 220 | ->leftJoin('sw.estacoes', 'se') |
| 220 | ->groupBy('sw', 'tpsw.idTipoSoftware', 'tpsw.teDescricaoTipoSoftware', 'se') | 221 | ->groupBy('sw', 'tpsw.idTipoSoftware', 'tpsw.teDescricaoTipoSoftware', 'se') |
src/Cacic/RelatorioBundle/Resources/views/Software/rel_naovinculados.html.twig
| @@ -39,4 +39,9 @@ | @@ -39,4 +39,9 @@ | ||
| 39 | </tbody> | 39 | </tbody> |
| 40 | </table> | 40 | </table> |
| 41 | 41 | ||
| 42 | +{# display navigation #} | ||
| 43 | +<div class="navigation"> | ||
| 44 | + {{ knp_pagination_render(dados) }} | ||
| 45 | +</div> | ||
| 46 | + | ||
| 42 | {% endblock %} | 47 | {% endblock %} |
| 43 | \ No newline at end of file | 48 | \ No newline at end of file |