From 6dcf11c2a236697483578a82cf5827561a71d248 Mon Sep 17 00:00:00 2001
From: Wilmer <wilmer.ramones@gmail.com>
Date: Fri, 3 Mar 2017 08:33:16 -0400
Subject: [PATCH] corregido errores al cargar documentos

---
 app/Resources/views/cea/ascenso_mostar.html.twig | 65 ++++++++++++------------
 src/AppBundle/Controller/AscensoController.php   |  8 ++-
 2 files changed, 35 insertions(+), 38 deletions(-)

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 @@
                             
                             
                         </div>
-                        {% endif %} 
-                        
+                        {% endif %}
+
                         {% if antiguedad is not null %}
                             {% if antiguedad.idEstatus.id != 4 %}
                                 <button class="alert alert-info"> El docente tiene una solicitud de antiguedad en estatus {{ antiguedad.idEstatus.nombre }} que no ha formalizado Todavía</button>
@@ -225,7 +225,7 @@
 
                         </div>
                 </div>
-                             
+                <form action="{{ path('cea_ascenso_actualizar', { 'id': ascenso.id, 'estatus' : 'false' }) }}" method="POST" name="rechazar">
                 <div class="col-md-5">    
                      <h3>Documentos Consignados</h3>    
                      <div class="widget-content">
@@ -276,8 +276,33 @@
 
                     </div>
                 </div>
-                        
-                        
+
+                    <div class="modal fade" id="motivo_rechazo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+                        <div class="modal-dialog" role="document">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                    <h4 class="modal-title" id="myModalLabel">Rechazo de Solicitud</h4>
+                                </div>
+
+                                <div class="modal-body">
+
+
+                                    <div class="form-group">
+                                        <label for="message-text" class="control-label">Mensaje:</label>
+                                        <textarea class="form-control" id="message-text" name="message-text"></textarea>
+                                    </div>
+
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                                    <button type="submit" name="rechazar" id="rechazar" class="btn btn-primary">Enviar Rechazo</button>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                </form>
 
             </div>
                          <!-- MOSTRAR ACTIVIDAD PIDA DEL DOCENTE  -->
@@ -296,41 +321,15 @@
                             </ul>                            
                         </div>  
                         {% endif %}
-                        <a class="btn btn-success btn-sm" href="{{ path('cea_ascenso_actualizar', { 'id': ascenso.id, 'estatus' : 'true' }) }}"  ><span class="fa fa-check"></span>&nbsp;Aprobar</a>
+                        <button class="btn btn-success btn-sm" type="submit"  ><span class="fa fa-check" name="aprobar" id="aprobar"></span>&nbsp;Aprobar</button>
                          <a class="btn btn-danger btn-sm" data-toggle="modal" data-target="#motivo_rechazo"  ><span class="fa fa-close"></span>&nbsp;Rechazar</a>
                         
                         
                          <!-- Modal -->
-<div class="modal fade" id="motivo_rechazo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-  <div class="modal-dialog" role="document">
-      <form action="{{ path('cea_ascenso_actualizar', { 'id': ascenso.id, 'estatus' : 'false' }) }}" method="POST" name="rechazar">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">Rechazo de Solicitud</h4>
-      </div>
-        
-      <div class="modal-body">
-          
-          
-          <div class="form-group">
-            <label for="message-text" class="control-label">Mensaje:</label>
-            <textarea class="form-control" id="message-text" name="message-text"></textarea>
-          </div>
-       
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="submit" class="btn btn-primary">Enviar Correo</button>
-      </div>
-    </div>
-     </form>
-  </div>
-</div>
+
         </div>
         
     </div>
-    
 {% 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) {
-- 
2.0.0