Wilmer Ramones / CEAUBV

Download as
Browse Code »

Commit 6dcf11c2a236697483578a82cf5827561a71d248

Authored by Wilmer
1 parent ecef989b42
Exists in master

corregido errores al cargar documentos

Showing 2 changed files with 35 additions and 38 deletions   Show diff stats
app/Resources/views/cea/ascenso_mostar.html.twig
  Diff comments   View file @6dcf11c
... ... @@ -196,8 +196,8 @@
196 196  
197 197  
198 198 </div>
199   - {% endif %}
200   -
  199 + {% endif %}
  200 +
201 201 {% if antiguedad is not null %}
202 202 {% if antiguedad.idEstatus.id != 4 %}
203 203 <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 @@
225 225  
226 226 </div>
227 227 </div>
228   -
  228 + <form action="{{ path('cea_ascenso_actualizar', { 'id': ascenso.id, 'estatus' : 'false' }) }}" method="POST" name="rechazar">
229 229 <div class="col-md-5">
230 230 <h3>Documentos Consignados</h3>
231 231 <div class="widget-content">
... ... @@ -276,8 +276,33 @@
276 276  
277 277 </div>
278 278 </div>
279   -
280   -
  279 +
  280 + <div class="modal fade" id="motivo_rechazo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
  281 + <div class="modal-dialog" role="document">
  282 + <div class="modal-content">
  283 + <div class="modal-header">
  284 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  285 + <h4 class="modal-title" id="myModalLabel">Rechazo de Solicitud</h4>
  286 + </div>
  287 +
  288 + <div class="modal-body">
  289 +
  290 +
  291 + <div class="form-group">
  292 + <label for="message-text" class="control-label">Mensaje:</label>
  293 + <textarea class="form-control" id="message-text" name="message-text"></textarea>
  294 + </div>
  295 +
  296 + </div>
  297 + <div class="modal-footer">
  298 + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
  299 + <button type="submit" name="rechazar" id="rechazar" class="btn btn-primary">Enviar Rechazo</button>
  300 + </div>
  301 + </div>
  302 +
  303 + </div>
  304 + </div>
  305 + </form>
281 306  
282 307 </div>
283 308 <!-- MOSTRAR ACTIVIDAD PIDA DEL DOCENTE -->
... ... @@ -296,41 +321,15 @@
296 321 </ul>
297 322 </div>
298 323 {% endif %}
299   - <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>
  324 + <button class="btn btn-success btn-sm" type="submit" ><span class="fa fa-check" name="aprobar" id="aprobar"></span>&nbsp;Aprobar</button>
300 325 <a class="btn btn-danger btn-sm" data-toggle="modal" data-target="#motivo_rechazo" ><span class="fa fa-close"></span>&nbsp;Rechazar</a>
301 326  
302 327  
303 328 <!-- Modal -->
304   -<div class="modal fade" id="motivo_rechazo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
305   - <div class="modal-dialog" role="document">
306   - <form action="{{ path('cea_ascenso_actualizar', { 'id': ascenso.id, 'estatus' : 'false' }) }}" method="POST" name="rechazar">
307   - <div class="modal-content">
308   - <div class="modal-header">
309   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
310   - <h4 class="modal-title" id="myModalLabel">Rechazo de Solicitud</h4>
311   - </div>
312   -
313   - <div class="modal-body">
314   -
315   -
316   - <div class="form-group">
317   - <label for="message-text" class="control-label">Mensaje:</label>
318   - <textarea class="form-control" id="message-text" name="message-text"></textarea>
319   - </div>
320   -
321   - </div>
322   - <div class="modal-footer">
323   - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
324   - <button type="submit" class="btn btn-primary">Enviar Correo</button>
325   - </div>
326   - </div>
327   - </form>
328   - </div>
329   -</div>
  329 +
330 330 </div>
331 331  
332 332 </div>
333   -
334 333 {% endblock %}
335 334  
336 335  
... ...
src/AppBundle/Controller/AscensoController.php
  Diff comments   View file @6dcf11c
... ... @@ -265,10 +265,7 @@ class AscensoController extends Controller
265 265 $this->container->getParameter('ascenso_directory'),
266 266 $nombreCurriculo
267 267 );
268   - $constanciaCurriculo->move(
269   - $this->container->getParameter('ascenso_thumb_directory'),
270   - $nombreCurriculo
271   - );
  268 +
272 269 //thumbnail2($nombreCurriculo, $this->container->getParameter('ascenso_directory'), $this->container->getParameter('ascenso_thumb_directory'));
273 270 verificar_documentos2($this->getUser()->getIdRolInstitucion(),16,2,$em,$nombreCurriculo, $servicios);
274 271  
... ... @@ -794,7 +791,8 @@ function thumbnail2 ($filename, $fuente, $destino){
794 791 function verificar_documentos2($idRolInstitucion, $tipo, $estatus, $em, $ubicacion="", $servicio = 2){
795 792 $existe = $em->getRepository("AppBundle:DocumentosVerificados")->findOneBy(array(
796 793 'idRolInstitucion' => $idRolInstitucion,
797   - 'idTipoDocumentos' => $tipo
  794 + 'idTipoDocumentos' => $tipo,
  795 + 'idServicio' => $servicio
798 796 ));
799 797  
800 798 if(!$existe) {
... ...