Merge pull request #47 from gerMdz/17-wizard-section

Se mejora creación de nueva sección desde el block principal, agregan…
gerMdz · Oct 16, 2021 · 835341b · 835341b
2 parents 77ffba8 + 90a0db7
commit 835341b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/docs/bitacora.md b/docs/bitacora.md
@@ -3,7 +3,8 @@
 
 #### Mejoras
     - Cambio en section edit
-    - Bug de nueva section, no indicaba que principal era obligatoria 
+    - Bug de nueva section, no indicaba que principal era obligatoria
+    - Se mejora creación de nueva sección desde el block principal, agregando la sección directamente al block
 
 #### Nuevas Funciones
 
diff --git a/src/Controller/ModelTemplateController.php b/src/Controller/ModelTemplateController.php
@@ -3,7 +3,6 @@
 namespace App\Controller;
 
 use App\Entity\ModelTemplate;
-use App\Entity\TypeBlock;
 use App\Form\ModelTemplateType;
 use App\Repository\ModelTemplateRepository;
 use App\Repository\TypeBlockRepository;
@@ -62,12 +61,11 @@ public function index(ModelTemplateRepository $modelTemplateRepository, Paginato
     /**
      * @Route("/{block}", name="model_template_index_block", methods={"GET"})
      * @param ModelTemplateRepository $modelTemplateRepository
-     * @param TypeBlockRepository $typeBlockRepository
      * @param Request $request
      * @param PaginatorInterface $paginator
      * @return Response
      */
-    public function indexBlock(ModelTemplateRepository $modelTemplateRepository, TypeBlockRepository $typeBlockRepository,Request $request, PaginatorInterface $paginator): Response
+    public function indexBlock(ModelTemplateRepository $modelTemplateRepository,Request $request, PaginatorInterface $paginator): Response
     {
         $block = $request->get('block');
         $modelTemplate = $modelTemplateRepository->findModelTemplatesByBlock($block);
@@ -247,6 +245,5 @@ public function createBlockFromModelTemplate(ModelTemplate $modelTemplate): Redi
         $this->session->set('model_template_id', $modelTemplate->getId());
         $entity = $modelTemplate->getBlock()->getEntity();
         return $this->redirectToRoute(sprintf('admin_%s_new_step1', strtolower($entity) ));
-
     }
 }
diff --git a/src/Controller/PrincipalController.php b/src/Controller/PrincipalController.php
@@ -18,13 +18,25 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @Route("/admin/principal")
  */
 class PrincipalController extends BaseController
 {
+
+    private $session;
+
+    /**
+     * @param SessionInterface $session
+     */
+    public function __construct(SessionInterface $session)
+    {
+        $this->session = $session;
+    }
+
     /**
      * @Route("/", name="principal_index", methods={"GET"})
      * @param PrincipalRepository $principalRepository
@@ -260,6 +272,7 @@ public function agregarSeccion(Request $request, Principal $principal, EntityMan
     {
         $form = $this->createForm(SectionAddType::class);
         $form->handleRequest($request);
+        $this->session->set('principal_id', $principal->getId());
 
         if ($form->isSubmitted() && $form->isValid()) {
 
@@ -269,6 +282,10 @@ public function agregarSeccion(Request $request, Principal $principal, EntityMan
             $entityManager->persist($principal);
             $entityManager->flush();
 
+            if($this->session->get('principal_id')){
+                $this->session->remove('principal_id');
+            }
+
             return $this->redirectToRoute('principal_show', [
                 'id' => $principal->getId(),
             ]);

diff --git a/src/Controller/SectionController.php b/src/Controller/SectionController.php
@@ -90,13 +90,24 @@ public function new(EntityManagerInterface $em, Request $request, UploaderHelper
                 $newFilename = $uploaderHelper->uploadEntradaImage($uploadedFile, false);
                 $section->setImageFilename($newFilename);
             }
+
+            if($this->session->get('principal_id')){
+                $principal_id = $this->session->get('principal_id');
+                $principal = $em->getRepository(Principal::class)->find($principal_id);
+                if($principal){
+                    $section->addPrincipale($principal);
+                }
+                $this->session->remove('principal_id');
+            }
+
             $em->persist($section);
             $em->flush();
 
             $this->addFlash('success', 'Sección creada. Gracias por su contribución');
 
             return $this->redirectToRoute('admin_section_list');
         }
+
         return $this->render('section_admin/new.html.twig', [
             'sectionForm' => $form->createView()
         ]);