From e1cab739ee686598d51aed2f4b1dfea35405e6a0 Mon Sep 17 00:00:00 2001
From: Wilmer Ramones <wramones@ubv.edu.ve>
Date: Wed, 20 Jul 2016 14:05:59 -0400
Subject: [PATCH] Creado el CRUD de los estudiantes y la sentencia de solo
 mostar las Unidades Curriculares de su malla

---
 app/Resources/views/inscripcion/edit.html.twig     |  4 +--
 app/Resources/views/inscripcion/index.html.twig    | 15 ++++++----
 app/Resources/views/inscripcion/show.html.twig     |  6 ++++
 src/AppBundle/Controller/InscripcionController.php | 18 ++++++++----
 src/AppBundle/Entity/EstadoAcademico.php           | 21 ++++++-------
 src/AppBundle/Entity/Inscripcion.php               |  5 ++++
 src/AppBundle/Form/InscripcionEditType.php         | 34 ++++++++++++++++++++++
 src/AppBundle/Form/InscripcionType.php             | 24 +++++++++++++--
 8 files changed, 101 insertions(+), 26 deletions(-)
 create mode 100644 src/AppBundle/Form/InscripcionEditType.php

diff --git a/app/Resources/views/inscripcion/edit.html.twig b/app/Resources/views/inscripcion/edit.html.twig
index 2a2946a..0ac71c1 100644
--- a/app/Resources/views/inscripcion/edit.html.twig
+++ b/app/Resources/views/inscripcion/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends 'base_app.html.twig' %}
 
 {% block body %}
     <h1>Inscripcion edit</h1>
@@ -10,7 +10,7 @@
 
     <ul>
         <li>
-            <a href="{{ path('ceapp_estudiante_inscripcion_index') }}">Back to the list</a>
+            <a href="{{ path('inscripcion_index') }}">Back to the list</a>
         </li>
         <li>
             {{ form_start(delete_form) }}
diff --git a/app/Resources/views/inscripcion/index.html.twig b/app/Resources/views/inscripcion/index.html.twig
index 01fbefb..a51b7ca 100644
--- a/app/Resources/views/inscripcion/index.html.twig
+++ b/app/Resources/views/inscripcion/index.html.twig
@@ -15,7 +15,7 @@
                                 <h3> Unidades Curriculares Inscritas</h3>
                             </div>
                             <!-- /widget-header -->
-                            {% if not estado_academico.hasInscripcion %}
+                            {% if  not estado_academico.hasInscripcion | length > 0 %}
                             <div class="widget-content">
                                 <div class="widget big-stats-container">
                                     <div class="widget-content">                    
@@ -30,17 +30,20 @@
                                     <!-- /widget-content --> 
                                 </div>
                             </div>
-                            {% else %}
+<!--Si Tiene inscripcion-->{% else %}
                             <div class="widget-content">
                                 <div class="widget big-stats-container">
                                     <div class="widget-content">                    
-                                        <h6 class="bigstats">                        
+                                        <div class="container">                                                                                          
                                             {% for inscrita in estado_academico.hasInscripcion %}
-                                                <p>{{ inscrita.idOfertaAcademica.idMallaCurricularUc.idUnidadCurricularVolumen.idUnidadCurricular.nombre }}</p>
+                                                <p>
+                                                    {{ inscrita.idOfertaAcademica.idMallaCurricularUc.idUnidadCurricularVolumen.idUnidadCurricular.nombre }}                                                    
+                                                    <a class="btn btn-warning btn-xs" href="{{ path('ceapp_estudiante_inscripcion_edit', { 'id': inscrita.id }) }}"><i class="fa fa-edit"></i></a>
+                                                </p>
                                             {% endfor %}                        
-                                        </h6>                    
+                                        </div>                    
                                         <div class="col-md-2">
-                                            <a class="btn btn-primary" href="{{ path('ceapp_estudiante_inscripcion_new') }}">Inscribirme</a>
+                                            
                                         </div>
                                     </div>
                                     <!-- /widget-content --> 
diff --git a/app/Resources/views/inscripcion/show.html.twig b/app/Resources/views/inscripcion/show.html.twig
index 53896c0..c01672a 100644
--- a/app/Resources/views/inscripcion/show.html.twig
+++ b/app/Resources/views/inscripcion/show.html.twig
@@ -7,7 +7,13 @@
         <tbody>
             <tr>
                 <th>Id</th>
+                <th>Uc</th>
+                <th>Seccion</th>
+            </tr>
+            <tr>
                 <td>{{ inscripcion.id }}</td>
+                <td>{{ inscripcion.idOfertaAcademica.idMallaCurricularUc.idUnidadCurricularVolumen.idUnidadCurricular.nombre }}</td>
+                <td>{{ inscripcion.idOfertaAcademica.idSeccion.nombre }}</td>
             </tr>
         </tbody>
     </table>
diff --git a/src/AppBundle/Controller/InscripcionController.php b/src/AppBundle/Controller/InscripcionController.php
index f44c957..0fc9b1e 100644
--- a/src/AppBundle/Controller/InscripcionController.php
+++ b/src/AppBundle/Controller/InscripcionController.php
@@ -7,7 +7,8 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use AppBundle\Entity\Inscripcion;
-use AppBundle\Form\InscripcionType;
+use AppBundle\Entity\EstadoAcademico;
+
 
 /**
  * Inscripcion controller.
@@ -42,7 +43,9 @@ class InscripcionController extends Controller
     public function newAction(Request $request)
     {
         $inscripcion = $this->getDoctrine()->getRepository('AppBundle:EstadoAcademico')->findOneByIdRolInstitucion($this->getUser()->getIdRolInstitucion());
-        $form = $this->createForm('AppBundle\Form\InscripcionType', $inscripcion);
+        $form = $this->createForm('AppBundle\Form\InscripcionType', $inscripcion, array(
+            'inscripcion' => $inscripcion
+        ));
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {           
@@ -50,7 +53,7 @@ class InscripcionController extends Controller
             $em->persist($inscripcion);
             $em->flush();
 
-            return $this->redirectToRoute('ceapp_estudiante_inscripcion_show', array('id' => $inscripcion->getId()));
+            return $this->redirectToRoute('inscripcion_index');
         }
 
         return $this->render('inscripcion/new.html.twig', array(
@@ -83,12 +86,15 @@ class InscripcionController extends Controller
      */
     public function editAction(Request $request, Inscripcion $inscripcion)
     {
+        $em = $this->getDoctrine()->getManager();
         $deleteForm = $this->createDeleteForm($inscripcion);
-        $editForm = $this->createForm('AppBundle\Form\InscripcionType', $inscripcion);
+        $estado_academico = $em->getRepository('AppBundle:EstadoAcademico')->findOneByIdRolInstitucion($this->getUser()->getIdRolInstitucion());
+        $editForm = $this->createForm('AppBundle\Form\InscripcionEditType', $inscripcion);
         $editForm->handleRequest($request);
 
         if ($editForm->isSubmitted() && $editForm->isValid()) {
-            $em = $this->getDoctrine()->getManager();
+           // $em = $this->getDoctrine()->getManager();
+            $em->persist($estado_academico);
             $em->persist($inscripcion);
             $em->flush();
 
@@ -119,7 +125,7 @@ class InscripcionController extends Controller
             $em->flush();
         }
 
-        return $this->redirectToRoute('ceapp_estudiante_inscripcion_index');
+        return $this->redirectToRoute('inscripcion_index');
     }
 
     /**
diff --git a/src/AppBundle/Entity/EstadoAcademico.php b/src/AppBundle/Entity/EstadoAcademico.php
index 287b79e..6f31e73 100644
--- a/src/AppBundle/Entity/EstadoAcademico.php
+++ b/src/AppBundle/Entity/EstadoAcademico.php
@@ -84,7 +84,7 @@ class EstadoAcademico
      * */
     protected $hasInscripcion;
     
-    private $OfertaAcademica;
+    private $idOfertaAcademica;
 
    
     
@@ -93,8 +93,9 @@ class EstadoAcademico
      */
     public function __construct()
     {
-        $this->OfertaAcademica = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->idOfertaAcademica = new \Doctrine\Common\Collections\ArrayCollection();
         $this->hasInscripcion = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->fecha = new \DateTime();
     }
 
     /**
@@ -280,30 +281,30 @@ class EstadoAcademico
     
     
      /**
-     * Get OfertaAcademica
+     * Get idOfertaAcademica
      *
      * @return \Doctrine\Common\Collections\Collection 
      */
-    public function getOfertaAcademica()
+    public function getIdOfertaAcademica()
     {
-        $ofertaAcademica = new \Doctrine\Common\Collections\ArrayCollection();
+        $idOfertaAcademica = new \Doctrine\Common\Collections\ArrayCollection();
         
         foreach($this->hasInscripcion as $inscrita)
         {
-            $ofertaAcademica[] = $inscrita->getOfertaAcademica();
+            $idOfertaAcademica[] = $inscrita->getIdOfertaAcademica();
         }
 
-        return $ofertaAcademica;
+        return $idOfertaAcademica;
     }
    
     
     /**
-     * Set OfertaAcademica
+     * Set idOfertaAcademica
      *
      */
-    public function setOfertaAcademica($ofertaAcademica)
+    public function setIdOfertaAcademica($idOfertaAcademica)
     {
-        foreach($ofertaAcademica as $inscrita)
+        foreach($idOfertaAcademica as $inscrita)
         {
             $inscripcion = new Inscripcion();
 
diff --git a/src/AppBundle/Entity/Inscripcion.php b/src/AppBundle/Entity/Inscripcion.php
index db092aa..f96d153 100644
--- a/src/AppBundle/Entity/Inscripcion.php
+++ b/src/AppBundle/Entity/Inscripcion.php
@@ -125,4 +125,9 @@ class Inscripcion
     {
         return $this->idEstatus;
     }
+    
+    
+     public function __toString() {
+        return $this->getIdOfertaAcademica()->getIdMallaCurricularUc()->getIdUnidadCurricularVolumen()->getIdUnidadCurricular()->getNombre();
+    }
 }
diff --git a/src/AppBundle/Form/InscripcionEditType.php b/src/AppBundle/Form/InscripcionEditType.php
new file mode 100644
index 0000000..f7c20f0
--- /dev/null
+++ b/src/AppBundle/Form/InscripcionEditType.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace AppBundle\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+
+class InscripcionEditType extends AbstractType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('idOfertaAcademica')
+            ->add('idEstatus')
+
+        ;
+    }
+    
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => 'AppBundle\Entity\Inscripcion',
+        ));
+    }
+}
diff --git a/src/AppBundle/Form/InscripcionType.php b/src/AppBundle/Form/InscripcionType.php
index 5a2dbc5..8429808 100644
--- a/src/AppBundle/Form/InscripcionType.php
+++ b/src/AppBundle/Form/InscripcionType.php
@@ -6,6 +6,7 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Doctrine\ORM\EntityRepository;
 
 class InscripcionType extends AbstractType
 {
@@ -15,14 +16,32 @@ class InscripcionType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $this->estado_academico = $options['inscripcion'];
+        if (count($this->estado_academico->getHasInscripcion()) == 0){
+            $tray = 1;
+            $tram = 1; 
+        }        
+        echo $tray;
         $builder
             /*->add('idRolInstitucion')
             ->add('idOfertaAcademica')
             ->add('idEstatus')*/
-            ->add('OfertaAcademica', EntityType::class, array(
+            ->add('idOfertaAcademica', EntityType::class, array(
                 'class' => 'AppBundle:OfertaAcademica',
                 'expanded'  => true,
-                'multiple'  => true
+                'multiple'  => true,
+                'query_builder' => function (EntityRepository $er) {
+                    return $er->createQueryBuilder('u')
+                    ->orderBy('u.idMallaCurricularUc', 'ASC')
+                    ->innerJoin('u.idMallaCurricularUc', 'm', 'WITH', 'm.idTrayectoTramoModalidadTipoUc = ?2')
+                    ->innerJoin('m.idTrayectoTramoModalidadTipoUc', 't', 'WITH', 't.idTrayecto = ?3')
+                    ->where('u.idOfertaMallaCurricular = ?1 ') //que las uc conicidan con la malla del estado academico                    
+                    ->setParameters(array(
+                        1 => $this->estado_academico->getIdOfertaMallaCurricular(),
+                        2 => 1,
+                        3 => 1
+                     ));                   
+                 ;},
             ))
         ;
     }
@@ -34,6 +53,7 @@ class InscripcionType extends AbstractType
     {
         $resolver->setDefaults(array(
             'data_class' => 'AppBundle\Entity\EstadoAcademico',
+            'inscripcion' => null,
         ));
     }
 }
-- 
2.0.0