From 4ac6daf9d129b3bfef58f1e86d1ba8e7cc86aff0 Mon Sep 17 00:00:00 2001
From: Wilmer <wilmer.ramones@gmail.com>
Date: Wed, 31 May 2017 09:54:04 -0400
Subject: [PATCH] verifica que se le haya asignado caducidad al PIDA antes de
 poder finalizarlo

---
 app/Resources/views/solicitudes/pida.html.twig | 15 +++++++++++---
 src/AppBundle/Controller/AjaxController.php    | 27 ++++++++++++++++++--------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/app/Resources/views/solicitudes/pida.html.twig b/app/Resources/views/solicitudes/pida.html.twig
index 932fa4a..d947032 100644
--- a/app/Resources/views/solicitudes/pida.html.twig
+++ b/app/Resources/views/solicitudes/pida.html.twig
@@ -98,11 +98,15 @@
                         <h4 class="no-screen">PIDA del Docente: {{ app.user.idRolinstitucion.idRol.idPersona }}</h4>
                         <h4 class="no-print">Mi PIDA</h4><span class="small" style="float: right;"> Estatus: {{ servicio.idEstatus }}</span>
                     </div>
-                    <div class="panel-body">
 
+                    <div class="panel-body">
 
                         {% if not caduca %}
+                            <div class="row">
+                                <a class="alert alert-info">Es importante que le asigne duración al PIDA.</a>
+                            </div>
                             {% form_theme caducidadForm 'bootstrap_3_layout.html.twig' %}
+                            <br>
                                 {{ form_start(caducidadForm) }}
                             <div class="row">
                                 <div class="col-lg-5">
@@ -370,8 +374,13 @@
                     cache: false,
                     data: ({finalizar: $(this).attr('data-servicio')}),
                     success: function (data) {
-                        console.log(data);
-                        location.reload();
+                        if (data.response == "caducidad"){
+                            alert("No se puede finalizar un PIDA sin antes asignarle Caducidad");
+                            $(".btn").button('reset');
+                        }else {
+                            console.log(data);
+                            location.reload();
+                        }
                     },
                     error: function (XMLHttpRequest, textStatus, errorThrown) {
                         console.log(errorThrown);
diff --git a/src/AppBundle/Controller/AjaxController.php b/src/AppBundle/Controller/AjaxController.php
index 0dd109c..ede82f7 100644
--- a/src/AppBundle/Controller/AjaxController.php
+++ b/src/AppBundle/Controller/AjaxController.php
@@ -373,18 +373,29 @@ class AjaxController extends Controller {
 
             $em = $this->getDoctrine()->getManager();
             $servicio = $em->getRepository("AppBundle:DocenteServicio")->findOneById($id);
-            $servicio->setIdEstatus($this->getDoctrine()->getRepository("AppBundle:Estatus")->findOneById(4));
-            $em->persist($servicio);
-            $em->flush();
+            $caducidad = $em->getRepository("AppBundle:PidaCaducidad")->findOneByIdDocenteServicio($servicio);
+            if($caducidad) {
+                $servicio->setIdEstatus($this->getDoctrine()->getRepository("AppBundle:Estatus")->findOneById(4));
+                $em->persist($servicio);
+                $em->flush();
+                $response = new JsonResponse();
+                $response->setStatusCode(200);
+                $response->setData(array(
+                    'response' => 'success'
+                ));
+            }else{
+                $response = new JsonResponse();
+                $response->setStatusCode(200);
+                $response->setData(array(
+                    'response' => 'caducidad'
+                ));
+            }
+
+
 
 
 
 
-            $response = new JsonResponse();
-            $response->setStatusCode(200);
-            $response->setData(array(
-                'response' => 'success'
-            ));
 
             return $response;
 
-- 
2.0.0