diff --git a/app/Resources/views/cea/ascenso_mostar.html.twig b/app/Resources/views/cea/ascenso_mostar.html.twig index 3f6b324..e208fc1 100644 --- a/app/Resources/views/cea/ascenso_mostar.html.twig +++ b/app/Resources/views/cea/ascenso_mostar.html.twig @@ -196,8 +196,8 @@ - {% endif %} - + {% endif %} + {% if antiguedad is not null %} {% if antiguedad.idEstatus.id != 4 %} @@ -225,7 +225,7 @@ - +

Documentos Consignados

@@ -276,8 +276,33 @@
- - + + +
@@ -296,41 +321,15 @@ {% endif %} -  Aprobar +  Rechazar - + - {% endblock %} diff --git a/src/AppBundle/Controller/AscensoController.php b/src/AppBundle/Controller/AscensoController.php index 9cf11fb..1b69771 100644 --- a/src/AppBundle/Controller/AscensoController.php +++ b/src/AppBundle/Controller/AscensoController.php @@ -265,10 +265,7 @@ class AscensoController extends Controller $this->container->getParameter('ascenso_directory'), $nombreCurriculo ); - $constanciaCurriculo->move( - $this->container->getParameter('ascenso_thumb_directory'), - $nombreCurriculo - ); + //thumbnail2($nombreCurriculo, $this->container->getParameter('ascenso_directory'), $this->container->getParameter('ascenso_thumb_directory')); verificar_documentos2($this->getUser()->getIdRolInstitucion(),16,2,$em,$nombreCurriculo, $servicios); @@ -794,7 +791,8 @@ function thumbnail2 ($filename, $fuente, $destino){ function verificar_documentos2($idRolInstitucion, $tipo, $estatus, $em, $ubicacion="", $servicio = 2){ $existe = $em->getRepository("AppBundle:DocumentosVerificados")->findOneBy(array( 'idRolInstitucion' => $idRolInstitucion, - 'idTipoDocumentos' => $tipo + 'idTipoDocumentos' => $tipo, + 'idServicio' => $servicio )); if(!$existe) {