From 710fe7d4000e173533ef11b7909648b64ff7fa76 Mon Sep 17 00:00:00 2001
From: Wilmer Ramones <wramones@ubv.edu.ve>
Date: Mon, 14 Nov 2016 11:29:36 -0400
Subject: [PATCH] creada la solicitudes ajax para ver las solicitudes en espera
 y corregido el bug al solicitar ascenso daba error al no actualizar el
 estatus

---
 app/Resources/views/base_app.html.twig         | 51 +++++++++++++++++++++-
 src/AppBundle/Controller/AjaxController.php    | 60 ++++++++++++++++++++++++++
 src/AppBundle/Controller/AscensoController.php | 17 ++++----
 web/assets/vendor/AppBundle/main.css           | 15 +++++++
 4 files changed, 134 insertions(+), 9 deletions(-)
 create mode 100644 src/AppBundle/Controller/AjaxController.php

diff --git a/app/Resources/views/base_app.html.twig b/app/Resources/views/base_app.html.twig
index 2bf5796..f415212 100644
--- a/app/Resources/views/base_app.html.twig
+++ b/app/Resources/views/base_app.html.twig
@@ -110,7 +110,7 @@
                     
                                      
                   <li class="dropdown"><a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> 
-                          <i class="fa fa-group"></i><span>Solicitudes</span> <b class="caret"></b></a>
+                          <i class="fa fa-group"><span class="badge" id="contador_solicitudes"></span></i><span>Solicitudes</span> <b class="caret"></b></a>
                     <ul class="dropdown-menu">
                         <li> <a data-toggle="modal" data-target="#buscarServicios">Buscar Servicios</a></li> 
                       <li><a href="{{ path('cea_servicios', {'tipo' : 'antiguedad'})}}">En espera de Aprobación</a></li>
@@ -141,6 +141,55 @@
         {% block javascripts %}
             <script type="text/javascript" src="{{ asset('assets/vendor/jquery/dist/jquery.min.js') }}"></script>
             <script type="text/javascript" src="{{ asset('assets/vendor/bootstrap/dist/js/bootstrap.min.js') }}" ></script>
+            
+            <script>
+
+   function waitForMsg() {
+
+
+
+       $.ajax({
+           method: "GET",
+           url: "{{ url('ajax_contador_solicitudes') }}",
+           async: true,
+           cache: false,
+           timeout: 50000,
+           success: function (data) {
+                    
+                   var posts = JSON.parse(data.posts);
+                   console.log(posts);
+                   /*if(posts.length > 0)
+                    {
+                        var html = "";
+                        for(d in posts)
+                        {
+                            html += "<p>" + JSON.stringify(posts[d]) + "</p>";
+                        }
+                        $("#contador_solicitudes").append(html);
+                    }*/
+                   $("#contador_solicitudes").html(posts);
+                    setTimeout(waitForMsg, 10000);
+            },
+           error: function (XMLHttpRequest, textStatus, errorThrown) { 
+                 console.log(errorThrown);
+                 setTimeout(waitForMsg, 15000);
+
+           }
+
+       });
+
+   };
+
+
+
+   $(document).ready(function () {
+
+       waitForMsg();
+
+   });
+
+</script>
+            
         {% endblock %}
         
         
diff --git a/src/AppBundle/Controller/AjaxController.php b/src/AppBundle/Controller/AjaxController.php
new file mode 100644
index 0000000..7b5bd41
--- /dev/null
+++ b/src/AppBundle/Controller/AjaxController.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace AppBundle\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Symfony\Component\HttpFoundation\JsonResponse;
+ 
+use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\HttpFoundation\Request;
+
+
+
+/**
+ * Description of AjaxController
+ *
+ * @author ubv-cipee
+ * 
+ * 
+ */
+ 
+class AjaxController extends Controller {
+    
+    /**
+     * @Route("/ajax/contador_solicitudes", name="ajax_contador_solicitudes")
+     * @Method({"GET"})
+     */
+    public function contadorAction(Request $request){
+        if($request->isXmlHttpRequest()){
+            $encoders = array(new JsonEncoder());
+            $normalizers = array(new ObjectNormalizer());
+ 
+            $serializer = new Serializer($normalizers, $encoders);
+ 
+            $em = $this->getDoctrine()->getManager();
+            $posts =  $em->getRepository('AppBundle:DocenteServicio')->findBy(array(
+                'idEstatus'    => 2
+            ));            
+            $cuenta = count($posts);            
+            $response = new JsonResponse();
+            $response->setStatusCode(200);
+            $response->setData(array(
+                'response' => 'success',
+                'posts' => $serializer->serialize($cuenta, 'json')
+            ));
+            return $response;
+        }
+        
+    }
+    
+}
diff --git a/src/AppBundle/Controller/AscensoController.php b/src/AppBundle/Controller/AscensoController.php
index d85498c..eeccc65 100644
--- a/src/AppBundle/Controller/AscensoController.php
+++ b/src/AppBundle/Controller/AscensoController.php
@@ -200,13 +200,11 @@ class AscensoController extends Controller
 
         //si ya tiene una solicitud en espera, enviarlo a la pagina de los  servicios
 	$solicitud = $this->getDoctrine()->getRepository('AppBundle:DocenteServicio')->findOneBy(
-                array('idRolInstitucion'  => $this->getUser()->getIdRolInstitucion(), 'idServicioCe' => 6)                
+                array('idRolInstitucion'  => $this->getUser()->getIdRolInstitucion(), 'idServicioCe' => 5, 'idEstatus' => 1)                
         );
-        if($solicitud){
-            if($solicitud->getIdEstatus()->getId() != 4 ){
-                return $this->redirect($this->generateUrl('servicios_index'));	
-            }
-        }
+        
+        
+       
         
          $concurso = $this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findOneBy(
              array('idRolInstitucion'  => $this->getUser()->getIdRolInstitucion())                
@@ -219,6 +217,8 @@ class AscensoController extends Controller
                     'idEstatus'         => 1
                 )                
         );
+         
+         
 	
         $form = $this->createForm('AppBundle\Form\ReconocimientoEscalaType');
         $form->handleRequest($request);
@@ -329,6 +329,7 @@ class AscensoController extends Controller
             'idEstatus'         => 2
         ));
                 
+                
         $pida = $this->getDoctrine()->getRepository('AppBundle:AdscripcionPida')->findOneByIdRolInstitucion($servicio->getIdRolInstitucion());
         $antiguedad = $this->getDoctrine()->getRepository('AppBundle:DocenteServicio')->findOneBy(array(
             'idRolInstitucion' => $this->getUser()->getIdRolInstitucion(),
@@ -494,8 +495,8 @@ class AscensoController extends Controller
             if ($this->get('request')->request->get('tipo') == 2 ){
                 $ServicioAscenso = $this->getDoctrine()->getRepository('AppBundle:DocenteServicio')->findOneBy(array(
                     'idRolInstitucion'  => $this->getUser()->getIdRolInstitucion(),
-                    'idServicioCe'      => 5,
-                    'idEstatus'         => 1
+                    'idServicioCe'      => 6,
+                    'idEstatus'         => 2
                 ));
                 
                 
diff --git a/web/assets/vendor/AppBundle/main.css b/web/assets/vendor/AppBundle/main.css
index 2e24a2d..e83ae35 100644
--- a/web/assets/vendor/AppBundle/main.css
+++ b/web/assets/vendor/AppBundle/main.css
@@ -437,4 +437,19 @@ h6.bigstats{
 	font-weight: bold;
 	color: #545454;
 	line-height: 1em;
+}
+
+.badge {
+    display: inline;
+    min-width: 10px; 
+    padding: 3px 7px;
+    font-size: 10px;
+    font-weight: 100;
+    line-height: 0;
+    color: #fff;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    background-color: #3b8341;
+    border-radius: 10px;
 }
\ No newline at end of file
-- 
2.0.0