añadido modificar el estatus de las tareas del pida

Wilmer
1 parent 759689c686
Showing 4 changed files with 148 additions and 8 deletions Show diff stats
app/Resources/views/solicitudes/pida.html.twig
src/AppBundle/Controller/AdscripcionController.php
src/AppBundle/Controller/AjaxController.php
src/AppBundle/Entity/PidaEstatus.php
@@ -68,12 +68,17 @@
                             <th>Tarea Específica</th>
                             <th>Plazo</th>
                             <th>Estatus</th>
-                        {% for pid in pida %}
+                        {% for pid in pida | sort %}
                             <tr>
-                        <td rowspan="{{ pid.pidaTareaEspecifico | length }}">{{ pid.idPlanHistoricoNacionalEstrategico.nombre }}</td>
-                        <td rowspan="{{ pid.pidaTareaEspecifico | length }}">{{ pid.idActividadDocente.nombre }}</td>
-
-                        {% for tarea in pid.pidaTareaEspecifico %}
+                        <td rowspan="{{ pid.pidaTareaEspecifico | length }}">
+                            {{ pid.idPlanHistoricoNacionalEstrategico.nombre }}
+                            <a data-id="{{ pid.id }}"  id="delete{{ pid.id }}" class="btn btn-xs btn-danger">-</a>
+                        </td>
+                        <td rowspan="{{ pid.pidaTareaEspecifico | length }}">
+                            {{ pid.idActividadDocente.nombre }}
+                        </td>
+
+                        {% for tarea in pid.pidaTareaEspecifico | sort %}
                                 <td>{{ tarea.pidaTareaEspecifico }}
                                     {% if loop.index == loop.length %}
                                         <a data-id="{{ pid.id }}"  id="add_actividad{{ pid.id }}" data-toggle="modal" data-target="#nueva_actividad" class="btn btn-xs btn-warning">+</a>
@@ -82,7 +87,10 @@
                                     {% endif %}
                                 </td>
                                 <td>{{ tarea.idPidaPlazo }}</td>
-                                <td>{{ tarea.idPidaEstatus }}</td>
+                                <td>
+                                    {{ tarea.idPidaEstatus }}
+                                    <a data-id="{{ tarea.id }}"  id="estatus{{ tarea.id }}" data-toggle="modal" data-target="#nuevo_estatus" class="btn btn-xs btn-default">.</a>
+                                </td>
                             </tr>
                         {% endfor %}
@@ -130,6 +138,37 @@
         </div>
     </div>
+
+    <div class="modal fade" id="nuevo_estatus" 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">Nueva Actividad</h4>
+                </div>
+
+                <div class="modal-body">
+                    {% form_theme estatusForm 'bootstrap_3_layout.html.twig' %}
+                    {{ form_start(estatusForm) }}
+                    {{ form_widget(estatusForm) }}
+
+                    <input type="hidden" id="id_estatus" name="id_estatus" value="" >
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                    <button type="submit" class="btn btn-success" name="rechazar" id="rechazar">Añadir Actividad
+
+                    </button>
+                </div>
+                {{ form_end(editForm) }}
+            </div>
+
+        </div>
+    </div>
+
+
 {% endblock %}
@@ -226,6 +265,34 @@
         });
+        $('[id^="delete"]').click(function() {
+            var x = confirm("eliminar Labor completa: " + $(this).attr('data-id'));
+            if(x) {
+                $.ajax({
+                    method: "POST",
+                    url: "{{ url('ajax_eliminar_labor') }}",
+                    async: true,
+                    cache: false,
+                    data: ({eliminar: $(this).attr('data-id')}),
+                    success: function (data) {
+                        console.log(data);
+                        location.reload();
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        console.log(errorThrown);
+
+                    }
+
+                });
+            }
+        });
+
+        $('[id^="estatus"]').click(function() {
+            alert("presionado: " + $(this).attr('data-id'))
+            $("#id_estatus").val($(this).attr('data-id'));
+        });
+
+
@@ -9,8 +9,10 @@
 namespace AppBundle\Controller;
 use AppBundle\Entity\DocumentosVerificados;
+use AppBundle\Entity\PidaEstatus;
 use AppBundle\Entity\PidaTareaEspecifico;
 use AppBundle\Form\PidaTareaEspecificoType;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -471,6 +473,16 @@ class AdscripcionController extends Controller
         $editForm = $this->createForm('AppBundle\Form\PidaTareaEspecificoType', $tarea);
         $editForm->handleRequest($request);
+
+        $estatusPida = new PidaEstatus();
+        $Estatusform = $this->createFormBuilder($estatusPida)
+            ->add('nombre', EntityType::class, array(
+                'class' => 'AppBundle\Entity\PidaEstatus'
+            ))
+            ->getForm();
+
+        $Estatusform->handleRequest($request);
+
         $em = $this->getDoctrine()->getManager();
         if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
@@ -520,11 +532,29 @@ class AdscripcionController extends Controller
         }
+        if ($Estatusform->isSubmitted() && $Estatusform->isValid()) {
+            $id = filter_input(INPUT_POST, 'id_estatus',  FILTER_SANITIZE_SPECIAL_CHARS);
+            //var_dump($estatusPida->getNombre()->getNombre()); die;
+            if($id) {
+                $estatus = $this->getDoctrine()->getRepository("AppBundle:PidaEstatus")->findOneByNombre($estatusPida->getNombre()->getNombre());
+                $tarea = $this->getDoctrine()->getRepository("AppBundle:PidaTareaEspecifico")->findOneById($id);
+                $tarea->setIdPidaEstatus($estatus);
+                $em->persist($tarea);
+
+                $em->flush();
+
+                return $this->redirectToRoute('solicitud_pida');
+            }
+
+        }
+
+
         return $this->render('solicitudes/pida.html.twig', array(
             'form' => $form->createView(),
             'pida'  => $pid,
             'servicio' => $serv,
-            'editForm'  => $editForm->createView()
+            'editForm'  => $editForm->createView(),
+            'estatusForm' => $Estatusform->createView()
         ));
@@ -239,7 +239,7 @@ class AjaxController extends Controller {
     /**
-     * @Route("/ajax/add/tarea", name="ajax_eliminar_tarea")
+     * @Route("/ajax/eliminar/tarea", name="ajax_eliminar_tarea")
      * @Method({"POST"})
      */
     public function eliminarTareaAction(Request $request){
@@ -274,6 +274,43 @@ class AjaxController extends Controller {
     }
+
+    /**
+     * @Route("/ajax/eliminar/labor", name="ajax_eliminar_labor")
+     * @Method({"POST"})
+     */
+    public function eliminarLaborAction(Request $request){
+
+        if($request->isXmlHttpRequest()){
+            $encoders = array(new JsonEncoder());
+            $normalizers = array(new ObjectNormalizer());
+
+            $serializer = new Serializer($normalizers, $encoders);
+
+            $id = filter_input(INPUT_POST, 'eliminar',  FILTER_SANITIZE_SPECIAL_CHARS);
+
+
+            $em = $this->getDoctrine()->getManager();
+            $pida = $em->getRepository("AppBundle:AdscripcionPida")->findOneById($id);
+            $em->remove($pida);
+            $em->flush();
+
+
+
+
+            $response = new JsonResponse();
+            $response->setStatusCode(200);
+            $response->setData(array(
+                'response' => 'success'
+            ));
+
+            return $response;
+
+
+        }
+
+    }
+
     /**
@@ -100,6 +100,12 @@ class PidaEstatus
     {
         return $this->id;
     }
+
+    /**
+     * Get nombre
+     *
+     * @return string
+     */
     public function __toString() {
         return $this->getNombre();
	@@ -68,12 +68,17 @@		@@ -68,12 +68,17 @@
68	<th>Tarea Específica</th>	68	<th>Tarea Específica</th>
69	<th>Plazo</th>	69	<th>Plazo</th>
70	<th>Estatus</th>	70	<th>Estatus</th>
71	- {% for pid in pida %}	71	+ {% for pid in pida \| sort %}
72	<tr>	72	<tr>
73	- <td rowspan="{{ pid.pidaTareaEspecifico \| length }}">{{ pid.idPlanHistoricoNacionalEstrategico.nombre }}</td>
74	- <td rowspan="{{ pid.pidaTareaEspecifico \| length }}">{{ pid.idActividadDocente.nombre }}</td>
75	-
76	- {% for tarea in pid.pidaTareaEspecifico %}	73	+ <td rowspan="{{ pid.pidaTareaEspecifico \| length }}">
		74	+ {{ pid.idPlanHistoricoNacionalEstrategico.nombre }}
		75	+ <a data-id="{{ pid.id }}" id="delete{{ pid.id }}" class="btn btn-xs btn-danger">-</a>
		76	+ </td>
		77	+ <td rowspan="{{ pid.pidaTareaEspecifico \| length }}">
		78	+ {{ pid.idActividadDocente.nombre }}
		79	+ </td>
		80	+
		81	+ {% for tarea in pid.pidaTareaEspecifico \| sort %}
77	<td>{{ tarea.pidaTareaEspecifico }}	82	<td>{{ tarea.pidaTareaEspecifico }}
78	{% if loop.index == loop.length %}	83	{% if loop.index == loop.length %}
79	<a data-id="{{ pid.id }}" id="add_actividad{{ pid.id }}" data-toggle="modal" data-target="#nueva_actividad" class="btn btn-xs btn-warning">+</a>	84	<a data-id="{{ pid.id }}" id="add_actividad{{ pid.id }}" data-toggle="modal" data-target="#nueva_actividad" class="btn btn-xs btn-warning">+</a>
	@@ -82,7 +87,10 @@		@@ -82,7 +87,10 @@
82	{% endif %}	87	{% endif %}
83	</td>	88	</td>
84	<td>{{ tarea.idPidaPlazo }}</td>	89	<td>{{ tarea.idPidaPlazo }}</td>
85	- <td>{{ tarea.idPidaEstatus }}</td>	90	+ <td>
		91	+ {{ tarea.idPidaEstatus }}
		92	+ <a data-id="{{ tarea.id }}" id="estatus{{ tarea.id }}" data-toggle="modal" data-target="#nuevo_estatus" class="btn btn-xs btn-default">.</a>
		93	+ </td>
86		94
87	</tr>	95	</tr>
88	{% endfor %}	96	{% endfor %}
	@@ -130,6 +138,37 @@		@@ -130,6 +138,37 @@
130	</div>	138	</div>
131	</div>	139	</div>
132		140
		141	+
		142	+ <div class="modal fade" id="nuevo_estatus" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
		143	+ <div class="modal-dialog" role="document">
		144	+
		145	+ <div class="modal-content">
		146	+ <div class="modal-header">
		147	+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
		148	+ aria-hidden="true">×</span></button>
		149	+ <h4 class="modal-title" id="myModalLabel">Nueva Actividad</h4>
		150	+ </div>
		151	+
		152	+ <div class="modal-body">
		153	+ {% form_theme estatusForm 'bootstrap_3_layout.html.twig' %}
		154	+ {{ form_start(estatusForm) }}
		155	+ {{ form_widget(estatusForm) }}
		156	+
		157	+ <input type="hidden" id="id_estatus" name="id_estatus" value="" >
		158	+ </div>
		159	+ <div class="modal-footer">
		160	+ <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
		161	+ <button type="submit" class="btn btn-success" name="rechazar" id="rechazar">Añadir Actividad
		162	+
		163	+ </button>
		164	+ </div>
		165	+ {{ form_end(editForm) }}
		166	+ </div>
		167	+
		168	+ </div>
		169	+ </div>
		170	+
		171	+
133	{% endblock %}	172	{% endblock %}
134		173
135		174
	@@ -226,6 +265,34 @@		@@ -226,6 +265,34 @@
226	});	265	});
227		266
228		267
		268	+ $('[id^="delete"]').click(function() {
		269	+ var x = confirm("eliminar Labor completa: " + $(this).attr('data-id'));
		270	+ if(x) {
		271	+ $.ajax({
		272	+ method: "POST",
		273	+ url: "{{ url('ajax_eliminar_labor') }}",
		274	+ async: true,
		275	+ cache: false,
		276	+ data: ({eliminar: $(this).attr('data-id')}),
		277	+ success: function (data) {
		278	+ console.log(data);
		279	+ location.reload();
		280	+ },
		281	+ error: function (XMLHttpRequest, textStatus, errorThrown) {
		282	+ console.log(errorThrown);
		283	+
		284	+ }
		285	+
		286	+ });
		287	+ }
		288	+ });
		289	+
		290	+ $('[id^="estatus"]').click(function() {
		291	+ alert("presionado: " + $(this).attr('data-id'))
		292	+ $("#id_estatus").val($(this).attr('data-id'));
		293	+ });
		294	+
		295	+
229		296
230		297
231		298
	@@ -9,8 +9,10 @@		@@ -9,8 +9,10 @@
9	namespace AppBundle\Controller;	9	namespace AppBundle\Controller;
10		10
11	use AppBundle\Entity\DocumentosVerificados;	11	use AppBundle\Entity\DocumentosVerificados;
		12	+use AppBundle\Entity\PidaEstatus;
12	use AppBundle\Entity\PidaTareaEspecifico;	13	use AppBundle\Entity\PidaTareaEspecifico;
13	use AppBundle\Form\PidaTareaEspecificoType;	14	use AppBundle\Form\PidaTareaEspecificoType;
		15	+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
14	use Symfony\Component\Form\FormError;	16	use Symfony\Component\Form\FormError;
15	use Symfony\Component\HttpFoundation\File\UploadedFile;	17	use Symfony\Component\HttpFoundation\File\UploadedFile;
16	use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;	18	use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
	@@ -471,6 +473,16 @@ class AdscripcionController extends Controller		@@ -471,6 +473,16 @@ class AdscripcionController extends Controller
471		473
472	$editForm = $this->createForm('AppBundle\Form\PidaTareaEspecificoType', $tarea);	474	$editForm = $this->createForm('AppBundle\Form\PidaTareaEspecificoType', $tarea);
473	$editForm->handleRequest($request);	475	$editForm->handleRequest($request);
		476	+
		477	+ $estatusPida = new PidaEstatus();
		478	+ $Estatusform = $this->createFormBuilder($estatusPida)
		479	+ ->add('nombre', EntityType::class, array(
		480	+ 'class' => 'AppBundle\Entity\PidaEstatus'
		481	+ ))
		482	+ ->getForm();
		483	+
		484	+ $Estatusform->handleRequest($request);
		485	+
474	$em = $this->getDoctrine()->getManager();	486	$em = $this->getDoctrine()->getManager();
475	if ($form->isSubmitted() && $form->isValid()) {	487	if ($form->isSubmitted() && $form->isValid()) {
476	$em = $this->getDoctrine()->getManager();	488	$em = $this->getDoctrine()->getManager();
	@@ -520,11 +532,29 @@ class AdscripcionController extends Controller		@@ -520,11 +532,29 @@ class AdscripcionController extends Controller
520	}	532	}
521		533
522		534
		535	+ if ($Estatusform->isSubmitted() && $Estatusform->isValid()) {
		536	+ $id = filter_input(INPUT_POST, 'id_estatus', FILTER_SANITIZE_SPECIAL_CHARS);
		537	+ //var_dump($estatusPida->getNombre()->getNombre()); die;
		538	+ if($id) {
		539	+ $estatus = $this->getDoctrine()->getRepository("AppBundle:PidaEstatus")->findOneByNombre($estatusPida->getNombre()->getNombre());
		540	+ $tarea = $this->getDoctrine()->getRepository("AppBundle:PidaTareaEspecifico")->findOneById($id);
		541	+ $tarea->setIdPidaEstatus($estatus);
		542	+ $em->persist($tarea);
		543	+
		544	+ $em->flush();
		545	+
		546	+ return $this->redirectToRoute('solicitud_pida');
		547	+ }
		548	+
		549	+ }
		550	+
		551	+
523	return $this->render('solicitudes/pida.html.twig', array(	552	return $this->render('solicitudes/pida.html.twig', array(
524	'form' => $form->createView(),	553	'form' => $form->createView(),
525	'pida' => $pid,	554	'pida' => $pid,
526	'servicio' => $serv,	555	'servicio' => $serv,
527	- 'editForm' => $editForm->createView()	556	+ 'editForm' => $editForm->createView(),
		557	+ 'estatusForm' => $Estatusform->createView()
528	));	558	));
529		559
530		560
	@@ -239,7 +239,7 @@ class AjaxController extends Controller {		@@ -239,7 +239,7 @@ class AjaxController extends Controller {
239		239
240		240
241	/**	241	/**
242	- * @Route("/ajax/add/tarea", name="ajax_eliminar_tarea")	242	+ * @Route("/ajax/eliminar/tarea", name="ajax_eliminar_tarea")
243	* @Method({"POST"})	243	* @Method({"POST"})
244	*/	244	*/
245	public function eliminarTareaAction(Request $request){	245	public function eliminarTareaAction(Request $request){
	@@ -274,6 +274,43 @@ class AjaxController extends Controller {		@@ -274,6 +274,43 @@ class AjaxController extends Controller {
274		274
275	}	275	}
276		276
		277	+
		278	+ /**
		279	+ * @Route("/ajax/eliminar/labor", name="ajax_eliminar_labor")
		280	+ * @Method({"POST"})
		281	+ */
		282	+ public function eliminarLaborAction(Request $request){
		283	+
		284	+ if($request->isXmlHttpRequest()){
		285	+ $encoders = array(new JsonEncoder());
		286	+ $normalizers = array(new ObjectNormalizer());
		287	+
		288	+ $serializer = new Serializer($normalizers, $encoders);
		289	+
		290	+ $id = filter_input(INPUT_POST, 'eliminar', FILTER_SANITIZE_SPECIAL_CHARS);
		291	+
		292	+
		293	+ $em = $this->getDoctrine()->getManager();
		294	+ $pida = $em->getRepository("AppBundle:AdscripcionPida")->findOneById($id);
		295	+ $em->remove($pida);
		296	+ $em->flush();
		297	+
		298	+
		299	+
		300	+
		301	+ $response = new JsonResponse();
		302	+ $response->setStatusCode(200);
		303	+ $response->setData(array(
		304	+ 'response' => 'success'
		305	+ ));
		306	+
		307	+ return $response;
		308	+
		309	+
		310	+ }
		311	+
		312	+ }
		313	+
277		314
278		315
279	/**	316	/**
	@@ -100,6 +100,12 @@ class PidaEstatus		@@ -100,6 +100,12 @@ class PidaEstatus
100	{	100	{
101	return $this->id;	101	return $this->id;
102	}	102	}
		103	+
		104	+ /**
		105	+ * Get nombre
		106	+ *
		107	+ * @return string
		108	+ */
103		109
104	public function __toString() {	110	public function __toString() {
105	return $this->getNombre();	111	return $this->getNombre();