From 4f4c22e4936c29d4a0931f1e678705a626c1f9f8 Mon Sep 17 00:00:00 2001 From: Emma284 Date: Tue, 1 Oct 2019 10:31:08 -0300 Subject: [PATCH 01/23] =?UTF-8?q?creaci=C3=B3n=20de=20nueva=20rama=20para?= =?UTF-8?q?=20desarrollo=20de=20checklist=20est=C3=A1tico?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.lock | 79 ++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/composer.lock b/composer.lock index be3fff0..079a6c4 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "composer/ca-bundle", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5" + "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/f26a67e397be0e5c00d7c52ec7b5010098e15ce5", - "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527", + "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527", "shasum": "" }, "require": { @@ -60,7 +60,7 @@ "ssl", "tls" ], - "time": "2019-08-02T09:05:43+00:00" + "time": "2019-08-30T08:44:50+00:00" }, { "name": "doctrine/annotations", @@ -1064,16 +1064,16 @@ }, { "name": "monolog/monolog", - "version": "1.24.0", + "version": "1.25.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf", + "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf", "shasum": "" }, "require": { @@ -1138,7 +1138,7 @@ "logging", "psr-3" ], - "time": "2018-11-05T09:00:11+00:00" + "time": "2019-09-06T13:49:17+00:00" }, { "name": "paragonie/random_compat", @@ -2226,16 +2226,16 @@ }, { "name": "symfony/symfony", - "version": "v3.4.30", + "version": "v3.4.31", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "4d911e98e1f70538edcca4576c65395ef0fbfa84" + "reference": "944e04808117477f46f804133d17913b77cf63d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/4d911e98e1f70538edcca4576c65395ef0fbfa84", - "reference": "4d911e98e1f70538edcca4576c65395ef0fbfa84", + "url": "https://api.github.com/repos/symfony/symfony/zipball/944e04808117477f46f804133d17913b77cf63d3", + "reference": "944e04808117477f46f804133d17913b77cf63d3", "shasum": "" }, "require": { @@ -2254,7 +2254,7 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.6", - "twig/twig": "^1.40|^2.9" + "twig/twig": "^1.41|^2.10" }, "conflict": { "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", @@ -2333,7 +2333,7 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0", "predis/predis": "~1.0", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8|~5.0", + "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0", "symfony/security-acl": "~2.8|~3.0" }, "type": "library", @@ -2352,7 +2352,8 @@ "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ - "src/Symfony/Component/Intl/Resources/stubs" + "src/Symfony/Component/Intl/Resources/stubs", + "src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php" ], "exclude-from-classmap": [ "**/Tests/" @@ -2377,30 +2378,30 @@ "keywords": [ "framework" ], - "time": "2019-07-27T17:14:21+00:00" + "time": "2019-08-26T16:36:53+00:00" }, { "name": "twig/twig", - "version": "v1.42.2", + "version": "v1.42.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "21707d6ebd05476854805e4f91b836531941bcd4" + "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/21707d6ebd05476854805e4f91b836531941bcd4", - "reference": "21707d6ebd05476854805e4f91b836531941bcd4", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e", + "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e", "shasum": "" }, "require": { - "php": ">=5.4.0", + "php": ">=5.5.0", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0" + "symfony/debug": "^3.4|^4.2", + "symfony/phpunit-bridge": "^4.4@dev|^5.0" }, "type": "library", "extra": { @@ -2423,19 +2424,19 @@ "authors": [ { "name": "Fabien Potencier", - "role": "Lead Developer", "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org" + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { - "name": "Armin Ronacher", - "role": "Project Founder", - "email": "armin.ronacher@active-4.com" + "name": "Twig Team", + "homepage": "https://twig.symfony.com/contributors", + "role": "Contributors" }, { - "name": "Twig Team", - "role": "Contributors", - "homepage": "https://twig.symfony.com/contributors" + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -2443,7 +2444,7 @@ "keywords": [ "templating" ], - "time": "2019-06-18T15:35:16+00:00" + "time": "2019-08-24T12:51:03+00:00" } ], "packages-dev": [ @@ -2503,16 +2504,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v3.4.30", + "version": "v3.4.31", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "8f1f27c186496128b861810809c27d956d342417" + "reference": "028617b04ae19d99d89089626ac969d161244ebc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/8f1f27c186496128b861810809c27d956d342417", - "reference": "8f1f27c186496128b861810809c27d956d342417", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/028617b04ae19d99d89089626ac969d161244ebc", + "reference": "028617b04ae19d99d89089626ac969d161244ebc", "shasum": "" }, "require": { @@ -2564,7 +2565,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2019-07-05T06:33:19+00:00" + "time": "2019-08-20T13:31:17+00:00" } ], "aliases": [], From 96c1b75d3d66c0b906067cacf7701e7121363ff0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Oct 2019 10:41:31 -0300 Subject: [PATCH 02/23] plantilla controller --- app/Resources/views/seccion/mostrar.html.twig | 25 ++++ .../Controller/DefaultController.php | 2 + .../Controller/PlantillaController.php | 33 +++-- .../Controller/SeccionController.php | 135 ++++-------------- src/AppBundle/Entity/Plantilla.php | 8 +- src/AppBundle/Entity/Resumen.php | 14 +- src/AppBundle/Entity/Tarea.php | 37 ++++- src/AppBundle/Form/SeccionType.php | 1 + src/AppBundle/Form/TareaType.php | 3 +- 9 files changed, 121 insertions(+), 137 deletions(-) create mode 100644 app/Resources/views/seccion/mostrar.html.twig diff --git a/app/Resources/views/seccion/mostrar.html.twig b/app/Resources/views/seccion/mostrar.html.twig new file mode 100644 index 0000000..28c3ec9 --- /dev/null +++ b/app/Resources/views/seccion/mostrar.html.twig @@ -0,0 +1,25 @@ +{% extends '@STGTheme/Default/base.html.twig' %} +{# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} +{{ form_widget(form) }} +{{ form_end(form) }} #} + +{% block body %} + + {{ form_start(form) }} + +
+ {% for row in tareas %} +
+
+ {{ row.nombre }} +
+
+ {{ form_row(row) }} +
+
+ {% endfor %} +
+ + {{ form_end(form) }} + +{% endblock %} \ No newline at end of file diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index 6334674..e73e16f 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -38,4 +38,6 @@ public function testFilterAction(Request $request) 'form' => $form->createView(), )); } + + } diff --git a/src/AppBundle/Controller/PlantillaController.php b/src/AppBundle/Controller/PlantillaController.php index 1f3ee6e..32ff433 100644 --- a/src/AppBundle/Controller/PlantillaController.php +++ b/src/AppBundle/Controller/PlantillaController.php @@ -17,14 +17,15 @@ use AppBundle\Form\SeccionType; use Symfony\Component\HttpFoundation\Request; -/** - * Description of PlantillaController - * - * @author Emma - */ - class PlantillaController extends Controller - { + /** + * Description of PlantillaController + * + * @author Emma + */ + + class PlantillaController extends Controller + { /** * @Route("/plantilla/new/", name="new_plantilla") */ @@ -93,18 +94,16 @@ public function plantillaVer(Request $request, $id) } -/** - * @Route("/plantilla/ver_2/", name="ver2_plantilla") - */ -public function plantillaVerAction(Request $request) -{ - $entityManager = $this->getDoctrine()->getManager(); - + /** + * @Route("/plantilla/ver_2/", name="ver2_plantilla") + */ + public function plantillaVerAction(Request $request) + { + $entityManager = $this->getDoctrine()->getManager(); - return $this->render('plantilla/ver.html.twig', array( - )); + return $this->render('plantilla/ver.html.twig', array()); -} + } } \ No newline at end of file diff --git a/src/AppBundle/Controller/SeccionController.php b/src/AppBundle/Controller/SeccionController.php index 8fd7fcf..224d158 100644 --- a/src/AppBundle/Controller/SeccionController.php +++ b/src/AppBundle/Controller/SeccionController.php @@ -16,6 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use AppBundle\Entity\Seccion; +use AppBundle\Entity\Tarea; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -26,130 +27,56 @@ use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\HttpFoundation\Request; use AppBundle\Form\SeccionType; +use Doctrine\Common\Collections\ArrayCollection; + class SeccionController extends Controller{ - /** - * @Route("/seccion/nuevo/") - * - */ - public function createAction() - { - // you can fetch the EntityManager via $this->getDoctrine() - // or you can add an argument to your action: createAction(EntityManagerInterface $entityManager) - $entityManager = $this->getDoctrine()->getManager(); - - $seccion = new Seccion(); - $seccion->setCalle('San Lorenzo'); - $seccion->setNumero(16); - $seccion->setPiso(0); - $seccion->setDpto('b'); - $seccion->setTelefono('98765432124'); - $seccion->setEmail('mail@algo.com'); - - - // tells Doctrine you want to (eventually) save the Product (no queries yet) - $entityManager->persist($seccion); - - // actually executes the queries (i.e. the INSERT query) - $entityManager->flush(); - -// HEAD:src/AppBundle/Controller/SeccionController.php - return new Response('Saved new product with id '.$seccion->getId()); - } - - // if you have multiple entity managers, use the registry to fetch them -// public function editAction() -// { -// $doctrine = $this->getDoctrine(); -// $entityManager = $doctrine->getManager(); -// $otherEntityManager = $doctrine->getManager('other_connection'); -// } - // return new Response('Saved new product with id '.$domicilio->getId()); - // } - /** * @Route("/seccion/mostrar/{id}/") */ - public function showAction($id) + public function showAction(Request $request, $id) { - $seccion = $this->getDoctrine()->getRepository(Seccion::class)->find($id); - + $entityManager = $this->getDoctrine()->getManager(); + $seccion = $entityManager->getRepository(Seccion::class)->find($id); + + // $seccion = $this->getDoctrine()->getRepository(Seccion::class)->find($id); + if (!$seccion) { + throw $this->createNotFoundException('No se encontró seccion que tiene este id '.$id); + } - else{ - return new Response('Se encontró el seccion con id: '.$seccion->getId().'. Está ubicado en calle: '.$seccion->getCalle().' al '.$seccion->getNumero()); - } - } - - /** - * @Route("/seccion/form/", name="laRutaVieja") - */ - //Formularios con seteo de datos por defecto - public function new2(Request $request) - { - - // creates a seccion and gives it some dummy data for this example - $seccion = new Seccion(); - $form = $this->createForm(SeccionType::class, $seccion); - - // catch all data - $form->handleRequest($request); - - - // validate all data and if it success save them - if ($form->isSubmitted() && $form->isValid()) { - - $task = $form->getData(); + $tareas = new ArrayCollection(); - return $this->redirectToRoute('laRuta'); + foreach ($seccion->getTareas() as $tarea) { + $tareas->add($tarea); } - - return $this->render('seccion/new.html.twig', [ - 'form' => $form->createView(), - ]); + // + // $tareas = $entityManager + // ->getRepository(Tarea::class) +// ->findBy(['idSeccion' => $id]); + $form = $this->createForm(SeccionType::class,$seccion); - } - - /** - * @Route("/seccion/nuevoSeccion/" ,name="laRuta") - */ - //Formularios con petición de datos por pantalla - public function new(Request $request) - { - // creates a seccion and gives it some dummy data for this example - $seccion = new Seccion(); - - // creates the form - $form = $this->createFormBuilder($seccion) - ->add('calle', TextType::class, ['label' => 'Calle: ']) - ->add('numero', IntegerType::class, ['label' => 'Número: ']) - ->add('piso', IntegerType::class, ['label' => 'Piso: ']) - ->add('dpto', TextType::class, ['label' => 'Departamento: ']) - ->add('telefono', TextType::class, ['label' => 'Teléfono: ']) - ->add('email', EmailType::class, ['label' => 'Email: ']) - ->add('save', SubmitType::class, ['label' => 'Create Seccion']) - ->getForm(); + if ($form->isSubmitted()) { + foreach ($tareas as $tarea) { - // catch all data - $form->handleRequest($request); - - - // validate all data and if it success save them - if ($form->isSubmitted() && $form->isValid()) { - - $task = $form->getData(); + if ($seccion->getTareas()->contains($tarea) === false) { + $entityManager->remove($tarea); + } + } + } + $entityManager->persist($seccion); + $entityManager->flush(); + return $this->render('seccion/mostrar.html.twig',[ - return $this->redirectToRoute('laRutaVieja'); - } - - return $this->render('seccion/new.html.twig', [ 'form' => $form->createView(), + 'tareas' =>$tareas ]); } + } diff --git a/src/AppBundle/Entity/Plantilla.php b/src/AppBundle/Entity/Plantilla.php index a1523e7..feb495e 100644 --- a/src/AppBundle/Entity/Plantilla.php +++ b/src/AppBundle/Entity/Plantilla.php @@ -69,18 +69,18 @@ function setSecciones($secciones) { } - public function addSecciones(Seccion $representante) + public function addSecciones(Seccion $seccion) { $secciones->setIdPlantilla($this); - $this->secciones->add($secciones); + $this->secciones->add($seccion); } - public function removeRepresentante(Representante $representante) + public function removeSecciones(Seccion $seccion) { - $this->representantes->removeElement($representante); + $this->secciones->removeElement($seccion); } /** diff --git a/src/AppBundle/Entity/Resumen.php b/src/AppBundle/Entity/Resumen.php index 309e12c..92c36c8 100644 --- a/src/AppBundle/Entity/Resumen.php +++ b/src/AppBundle/Entity/Resumen.php @@ -22,13 +22,13 @@ class Resumen */ private $id; - /** - * @ORM\OneToOne(targetEntity="Categorizacion", cascade={"persist"}) - * @ORM\JoinColumn(name="categorizacion_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\Categorizacion") - * @Assert\Valid - */ - private $categorizacion; +// /** + // * @ORM\OneToOne(targetEntity="Categorizacion", cascade={"persist"}) +// * @ORM\JoinColumn(name="categorizacion_id",referencedColumnName="id") +// * @Assert\Type(type="AppBundle\Entity\Categorizacion") +// * @Assert\Valid +// */ + private $categorizacion; /** diff --git a/src/AppBundle/Entity/Tarea.php b/src/AppBundle/Entity/Tarea.php index 39e0b5a..bc6ed4e 100644 --- a/src/AppBundle/Entity/Tarea.php +++ b/src/AppBundle/Entity/Tarea.php @@ -85,8 +85,14 @@ class Tarea { */ private $autoredaccion; + // /** + // * @ORM\OneToMany(targetEntity="Respuesta", mappedBy="tarea") + // */ + /** - * @ORM\OneToMany(targetEntity="Respuesta", mappedBy="tarea") + * @var string + * + * @ORM\Column(name="respuesta", type="string", length=150) */ private $respuestas; @@ -137,9 +143,34 @@ public function setIdSeccion(\AppBundle\Entity\Seccion $idSeccion) return $this; } + //Constructor - public function __construct() + // public function __construct() + // { + // $this->respuestas = new ArrayCollection(); + // } + + /** + * Get the value of nombre + * + * @return string + */ + public function getNombre() { - $this->respuestas = new ArrayCollection(); + return $this->nombre; + } + + /** + * Set the value of nombre + * + * @param string $nombre + * + * @return self + */ + public function setNombre(string $nombre) + { + $this->nombre = $nombre; + + return $this; } } diff --git a/src/AppBundle/Form/SeccionType.php b/src/AppBundle/Form/SeccionType.php index 2407d68..61751ab 100644 --- a/src/AppBundle/Form/SeccionType.php +++ b/src/AppBundle/Form/SeccionType.php @@ -15,6 +15,7 @@ use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\CollectionType; class SeccionType extends AbstractType { diff --git a/src/AppBundle/Form/TareaType.php b/src/AppBundle/Form/TareaType.php index c179d0e..088f7f4 100644 --- a/src/AppBundle/Form/TareaType.php +++ b/src/AppBundle/Form/TareaType.php @@ -15,8 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('nombre', TextType::class, ['label' => 'Nombre de la tarea: ']) - + ->add('nombre', TextType::class) ; } From c96b752b0cc6174480305d91f1f5828aa3f6bf22 Mon Sep 17 00:00:00 2001 From: Emma284 Date: Tue, 1 Oct 2019 12:56:42 -0300 Subject: [PATCH 03/23] =?UTF-8?q?creaci=C3=B3n=20estructura=20de=20formula?= =?UTF-8?q?rio=20B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nbproject/private/private.xml | 6 +- .../{Entity => Deprecated}/Respuesta.php | 0 .../{Entity => Deprecated}/Seccion.php | 0 .../SeccionController.php | 0 .../{Form => Deprecated}/SeccionType.php | 0 .../{Entity => Deprecated}/Tarea.php | 0 .../{Form => Deprecated}/TareaType.php | 0 .../Entity/FormularioB/CategoriaFinal.php | 18 ++ src/AppBundle/Entity/FormularioB/Dotacion.php | 18 ++ .../Entity/FormularioB/EmisionDeResiduos.php | 201 ++++++++++++++++++ .../Entity/FormularioB/FormularioB.php | 49 +++++ .../Entity/FormularioB/Localizacion.php | 18 ++ src/AppBundle/Entity/FormularioB/Riesgos.php | 45 ++++ 13 files changed, 351 insertions(+), 4 deletions(-) rename src/AppBundle/{Entity => Deprecated}/Respuesta.php (100%) rename src/AppBundle/{Entity => Deprecated}/Seccion.php (100%) rename src/AppBundle/{Controller => Deprecated}/SeccionController.php (100%) rename src/AppBundle/{Form => Deprecated}/SeccionType.php (100%) rename src/AppBundle/{Entity => Deprecated}/Tarea.php (100%) rename src/AppBundle/{Form => Deprecated}/TareaType.php (100%) create mode 100644 src/AppBundle/Entity/FormularioB/CategoriaFinal.php create mode 100644 src/AppBundle/Entity/FormularioB/Dotacion.php create mode 100644 src/AppBundle/Entity/FormularioB/EmisionDeResiduos.php create mode 100644 src/AppBundle/Entity/FormularioB/FormularioB.php create mode 100644 src/AppBundle/Entity/FormularioB/Localizacion.php create mode 100644 src/AppBundle/Entity/FormularioB/Riesgos.php diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 22d8cba..9083980 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,10 +3,8 @@ - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/Seccion.php - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/Tarea.php - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/Plantilla.php - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/Checklist.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioB/Dotacion.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioB/FormularioB.php diff --git a/src/AppBundle/Entity/Respuesta.php b/src/AppBundle/Deprecated/Respuesta.php similarity index 100% rename from src/AppBundle/Entity/Respuesta.php rename to src/AppBundle/Deprecated/Respuesta.php diff --git a/src/AppBundle/Entity/Seccion.php b/src/AppBundle/Deprecated/Seccion.php similarity index 100% rename from src/AppBundle/Entity/Seccion.php rename to src/AppBundle/Deprecated/Seccion.php diff --git a/src/AppBundle/Controller/SeccionController.php b/src/AppBundle/Deprecated/SeccionController.php similarity index 100% rename from src/AppBundle/Controller/SeccionController.php rename to src/AppBundle/Deprecated/SeccionController.php diff --git a/src/AppBundle/Form/SeccionType.php b/src/AppBundle/Deprecated/SeccionType.php similarity index 100% rename from src/AppBundle/Form/SeccionType.php rename to src/AppBundle/Deprecated/SeccionType.php diff --git a/src/AppBundle/Entity/Tarea.php b/src/AppBundle/Deprecated/Tarea.php similarity index 100% rename from src/AppBundle/Entity/Tarea.php rename to src/AppBundle/Deprecated/Tarea.php diff --git a/src/AppBundle/Form/TareaType.php b/src/AppBundle/Deprecated/TareaType.php similarity index 100% rename from src/AppBundle/Form/TareaType.php rename to src/AppBundle/Deprecated/TareaType.php diff --git a/src/AppBundle/Entity/FormularioB/CategoriaFinal.php b/src/AppBundle/Entity/FormularioB/CategoriaFinal.php new file mode 100644 index 0000000..fd3aa4c --- /dev/null +++ b/src/AppBundle/Entity/FormularioB/CategoriaFinal.php @@ -0,0 +1,18 @@ +residuosSolidosSemisolidos; + } + + function getRsu() { + return $this->rsu; + } + + function getRnp() { + return $this->rnp; + } + + function getTipoDeResiduo() { + return $this->tipoDeResiduo; + } + + function getRp() { + return $this->rp; + } + + function getDefinirCorrientesDeRP() { + return $this->definirCorrientesDeRP; + } + + function getValorResiduo() { + return $this->valorResiduo; + } + + function getEfluentesYResiduosLiquidos() { + return $this->efluentesYResiduosLiquidos; + } + + function getAguaATemperaturaAmbiente() { + return $this->aguaATemperaturaAmbiente; + } + + function getEfluentesSinRP() { + return $this->efluentesSinRP; + } + + function getEfluentesConRP() { + return $this->efluentesConRP; + } + + function getValorEfluente() { + return $this->valorEfluente; + } + + function getEmisionesGaseosas() { + return $this->emisionesGaseosas; + } + + function getComponentesNaturalesDelAire() { + return $this->componentesNaturalesDelAire; + } + + function getCombustionDeCombustiblesLiquidos() { + return $this->combustionDeCombustiblesLiquidos; + } + + function getNoContempladosBool() { + return $this->noContempladosBool; + } + + function getNoContempledosListado() { + return $this->noContempledosListado; + } + + function getValorEmisiones() { + return $this->valorEmisiones; + } + + function setResiduosSolidosSemisolidos($residuosSolidosSemisolidos) { + $this->residuosSolidosSemisolidos = $residuosSolidosSemisolidos; + } + + function setRsu($rsu) { + $this->rsu = $rsu; + } + + function setRnp($rnp) { + $this->rnp = $rnp; + } + + function setTipoDeResiduo($tipoDeResiduo) { + $this->tipoDeResiduo = $tipoDeResiduo; + } + + function setRp($rp) { + $this->rp = $rp; + } + + function setDefinirCorrientesDeRP($definirCorrientesDeRP) { + $this->definirCorrientesDeRP = $definirCorrientesDeRP; + } + + function setValorResiduo($valorResiduo) { + $this->valorResiduo = $valorResiduo; + } + + function setEfluentesYResiduosLiquidos($efluentesYResiduosLiquidos) { + $this->efluentesYResiduosLiquidos = $efluentesYResiduosLiquidos; + } + + function setAguaATemperaturaAmbiente($aguaATemperaturaAmbiente) { + $this->aguaATemperaturaAmbiente = $aguaATemperaturaAmbiente; + } + + function setEfluentesSinRP($efluentesSinRP) { + $this->efluentesSinRP = $efluentesSinRP; + } + + function setEfluentesConRP($efluentesConRP) { + $this->efluentesConRP = $efluentesConRP; + } + + function setValorEfluente($valorEfluente) { + $this->valorEfluente = $valorEfluente; + } + + function setEmisionesGaseosas($emisionesGaseosas) { + $this->emisionesGaseosas = $emisionesGaseosas; + } + + function setComponentesNaturalesDelAire($componentesNaturalesDelAire) { + $this->componentesNaturalesDelAire = $componentesNaturalesDelAire; + } + + function setCombustionDeCombustiblesLiquidos($combustionDeCombustiblesLiquidos) { + $this->combustionDeCombustiblesLiquidos = $combustionDeCombustiblesLiquidos; + } + + function setNoContempladosBool($noContempladosBool) { + $this->noContempladosBool = $noContempladosBool; + } + + function setNoContempledosListado($noContempledosListado) { + $this->noContempledosListado = $noContempledosListado; + } + + function setValorEmisiones($valorEmisiones) { + $this->valorEmisiones = $valorEmisiones; + } + + +} diff --git a/src/AppBundle/Entity/FormularioB/FormularioB.php b/src/AppBundle/Entity/FormularioB/FormularioB.php new file mode 100644 index 0000000..9a37a6e --- /dev/null +++ b/src/AppBundle/Entity/FormularioB/FormularioB.php @@ -0,0 +1,49 @@ + Date: Fri, 4 Oct 2019 10:49:13 -0300 Subject: [PATCH 04/23] plantilla controller --- app/Resources/views/plantilla/new.html.twig | 420 +++++++++++++++++- .../Controller/PlantillaController.php | 9 +- src/AppBundle/Entity/FormularioA/AFIP.php | 225 ++++++++++ src/AppBundle/Entity/FormularioA/API.php | 286 ++++++++++++ .../Entity/FormularioA/ActaSocietaria.php | 198 +++++++++ .../Entity/FormularioA/ContratoSocial.php | 226 ++++++++++ src/AppBundle/Entity/FormularioA/Dni.php | 48 ++ .../Entity/FormularioA/DomicilioLegal.php | 261 +++++++++++ .../Entity/FormularioA/DomicilioReal.php | 109 +++++ .../Entity/FormularioA/UsoConformeSuelo.php | 62 +++ src/AppBundle/Entity/Plantilla.php | 276 ++++++++++-- src/AppBundle/Form/FormularioA/APIType.php | 91 ++++ .../Form/FormularioA/ActaSocietariaType.php | 65 +++ src/AppBundle/Form/FormularioA/AfipType.php | 73 +++ .../Form/FormularioA/ContratoSocialType.php | 73 +++ src/AppBundle/Form/FormularioA/DNIType.php | 64 +++ .../Form/FormularioA/DomicilioLegalType.php | 46 ++ .../Form/FormularioA/DomicilioRealType.php | 34 ++ .../FormularioA/UsoConformeDeSueloType.php | 68 +++ src/AppBundle/Form/PlantillaType.php | 25 +- .../Repository/FormularioA/AFIPRepository.php | 13 + .../Repository/FormularioA/APIRepository.php | 13 + .../FormularioA/ActaSocietariaRepository.php | 13 + .../FormularioA/ContratoSocialRepository.php | 13 + .../Repository/FormularioA/DniRepository.php | 13 + .../FormularioA/DomicilioLegalRepository.php | 13 + .../FormularioA/DomicilioRealRepository.php | 13 + .../UsoConformeDeSueloRepository.php | 13 + 28 files changed, 2699 insertions(+), 64 deletions(-) create mode 100644 src/AppBundle/Entity/FormularioA/AFIP.php create mode 100644 src/AppBundle/Entity/FormularioA/API.php create mode 100644 src/AppBundle/Entity/FormularioA/ActaSocietaria.php create mode 100644 src/AppBundle/Entity/FormularioA/ContratoSocial.php create mode 100644 src/AppBundle/Entity/FormularioA/Dni.php create mode 100644 src/AppBundle/Entity/FormularioA/DomicilioLegal.php create mode 100644 src/AppBundle/Entity/FormularioA/DomicilioReal.php create mode 100644 src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php create mode 100644 src/AppBundle/Form/FormularioA/APIType.php create mode 100644 src/AppBundle/Form/FormularioA/ActaSocietariaType.php create mode 100644 src/AppBundle/Form/FormularioA/AfipType.php create mode 100644 src/AppBundle/Form/FormularioA/ContratoSocialType.php create mode 100644 src/AppBundle/Form/FormularioA/DNIType.php create mode 100644 src/AppBundle/Form/FormularioA/DomicilioLegalType.php create mode 100644 src/AppBundle/Form/FormularioA/DomicilioRealType.php create mode 100644 src/AppBundle/Form/FormularioA/UsoConformeDeSueloType.php create mode 100644 src/AppBundle/Repository/FormularioA/AFIPRepository.php create mode 100644 src/AppBundle/Repository/FormularioA/APIRepository.php create mode 100644 src/AppBundle/Repository/FormularioA/ActaSocietariaRepository.php create mode 100644 src/AppBundle/Repository/FormularioA/ContratoSocialRepository.php create mode 100644 src/AppBundle/Repository/FormularioA/DniRepository.php create mode 100644 src/AppBundle/Repository/FormularioA/DomicilioLegalRepository.php create mode 100644 src/AppBundle/Repository/FormularioA/DomicilioRealRepository.php create mode 100644 src/AppBundle/Repository/FormularioA/UsoConformeDeSueloRepository.php diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index 33a29b5..b461b47 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -227,33 +227,413 @@ {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} - {% for seccion in secciones %} - -
- - {{ form_label(seccion.nombre) }} - {{ form_widget(seccion.nombre, {'attr': {'class': form_errors(seccion.nombre) ? 'form-control is-invalid' : 'form-control'}}) }} - -
- {{ form_errors(seccion.nombre) }} +
DOMICILIO LEGAL
+ +
+ +
+ + {{ form_label(form.domicilioLegal.calle) }} + {{ form_widget(form.domicilioLegal.calle, {'attr': {'class': form_errors(form.domicilioLegal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.calle) }} +
+
- {% for tarea in seccion.tareas %} - -
+ {{ form_label(form.domicilioLegal.provincia) }} + {{ form_widget(form.domicilioLegal.provincia, {'attr': {'class': form_errors(form.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.provincia) }} +
+
+
+ + {{ form_label(form.domicilioLegal.departamento) }} + {{ form_widget(form.domicilioLegal.departamento, {'attr': {'class': form_errors(form.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.departamento) }} +
+
+
+ + {{ form_label(form.domicilioLegal.localidad) }} + {{ form_widget(form.domicilioLegal.localidad, {'attr': {'class': form_errors(form.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.localidad) }} +
+
+
+ + {{ form_label(form.domicilioLegal.cp) }} + {{ form_widget(form.domicilioLegal.cp, {'attr': {'class': form_errors(form.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.cp) }} +
+
+
+ + {{ form_label(form.domicilioLegal.email) }} + {{ form_widget(form.domicilioLegal.email, {'attr': {'class': form_errors(form.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.email) }} +
+
+
+ + {{ form_label(form.domicilioLegal.acepEmail) }} + {{ form_widget(form.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.acepEmail) }} +
+
+
+ +
DOMICILIO REAL
+ +
+ +
+ + {{ form_label(form.domicilioReal.calle) }} + {{ form_widget(form.domicilioReal.calle, {'attr': {'class': form_errors(form.domicilioReal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioReal.calle) }} +
+
+
+ + {{ form_label(form.domicilioReal.localidad) }} + {{ form_widget(form.domicilioReal.localidad, {'attr': {'class': form_errors(form.domicilioReal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioReal.localidad) }} +
+
+
+ +
CONTRATO SOCIAL
+ +
+ +
+ + {{ form_label(form.contratoSocial.fojaN) }} + {{ form_widget(form.contratoSocial.fojaN, {'attr': {'class': form_errors(form.contratoSocial.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.fojaN) }} +
+
- {{ form_label(tarea.nombre) }} - {{ form_widget(tarea.nombre, {'attr': {'class': form_errors(tarea.nombre) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ + {{ form_label(form.contratoSocial.poseeContrato) }} + {{ form_widget(form.contratoSocial.poseeContrato, {'attr': {'class': form_errors(form.contratoSocial.poseeContrato) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.poseeContrato) }} +
+
+ +
+ + {{ form_label(form.contratoSocial.unipersonal) }} + {{ form_widget(form.contratoSocial.unipersonal, {'attr': {'class': form_errors(form.contratoSocial.unipersonal) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.unipersonal) }} +
+
+
+ + {{ form_label(form.contratoSocial.titulares) }} + {{ form_widget(form.contratoSocial.titulares, {'attr': {'class': form_errors(form.contratoSocial.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.titulares) }} +
+
+
+ + {{ form_label(form.contratoSocial.vencido) }} + {{ form_widget(form.contratoSocial.vencido, {'attr': {'class': form_errors(form.contratoSocial.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.vencido) }} +
+
+
+ + {{ form_label(form.contratoSocial.verObjSoc) }} + {{ form_widget(form.contratoSocial.verObjSoc, {'attr': {'class': form_errors(form.contratoSocial.verObjSoc) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.verObjSoc) }} +
+
+
+ +
ACTA SOCIETARIA
+ +
+ +
+ + {{ form_label(form.actaSocietaria.fojaN) }} + {{ form_widget(form.actaSocietaria.fojaN, {'attr': {'class': form_errors(form.actaSocietaria.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.fojaN) }} +
+
+ +
+ + {{ form_label(form.actaSocietaria.actaSocietaria) }} + {{ form_widget(form.actaSocietaria.actaSocietaria, {'attr': {'class': form_errors(form.actaSocietaria.actaSocietaria) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.actaSocietaria) }} +
+
+
+ + {{ form_label(form.actaSocietaria.titulares) }} + {{ form_widget(form.actaSocietaria.titulares, {'attr': {'class': form_errors(form.actaSocietaria.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.titulares) }} +
+
+
+ + {{ form_label(form.actaSocietaria.vencido) }} + {{ form_widget(form.actaSocietaria.vencido, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.vencido) }} +
+
+
+ + {{ form_label(form.actaSocietaria.verObjSoc) }} + {{ form_widget(form.actaSocietaria.verObjSoc, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.verObjSoc) }} +
+
+
+ +
DNI
+ +
-
- {{ form_errors(tarea.nombre) }} -
+
+ + {{ form_label(form.dni.dni) }} + {{ form_widget(form.dni.dni, {'attr': {'class': form_errors(form.dni.dni) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.dni) }} +
+
+
+ + {{ form_label(form.dni.verDni) }} + {{ form_widget(form.dni.verDni, {'attr': {'class': form_errors(form.dni.verDni) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.verDni) }} +
+
+
+ + {{ form_label(form.dni.apoderado) }} + {{ form_widget(form.dni.apoderado, {'attr': {'class': form_errors(form.dni.apoderado) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.apoderado) }} +
+
+
+ + {{ form_label(form.dni.verApoderado) }} + {{ form_widget(form.dni.verApoderado, {'attr': {'class': form_errors(form.dni.verApoderado) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.verApoderado) }} +
+
+
+ +
AFIP
+ +
+ +
+ + {{ form_label(form.afip.constancia) }} + {{ form_widget(form.afip.constancia, {'attr': {'class': form_errors(form.afip.constancia) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.constancia) }} +
+
+
+ + {{ form_label(form.afip.fojaN) }} + {{ form_widget(form.afip.fojaN, {'attr': {'class': form_errors(form.afip.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.fojaN) }} +
+
+
+ {{ form_label(form.afip.verFechIni) }} + {{ form_widget(form.afip.verFechIni, {'attr': {'class': form_errors(form.afip.verFechIni) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verFechIni) }} +
+
+
+ {{ form_label(form.afip.verRazonSocial) }} + {{ form_widget(form.afip.verRazonSocial, {'attr': {'class': form_errors(form.afip.verRazonSocial) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verRazonSocial) }} +
+
+
+ {{ form_label(form.afip.verCUIT) }} + {{ form_widget(form.afip.verCUIT, {'attr': {'class': form_errors(form.afip.verCUIT) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verCUIT) }} +
+
+
+ {{ form_label(form.afip.verAct) }} + {{ form_widget(form.afip.verAct, {'attr': {'class': form_errors(form.afip.verAct) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verAct) }} +
+
+
+ +
API
+ +
+ +
+ + {{ form_label(form.api.preImpInmobiliario) }} + {{ form_widget(form.api.preImpInmobiliario, {'attr': {'class': form_errors(form.api.preImpInmobiliario) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.preImpInmobiliario) }} +
+
+ +
+ + {{ form_label(form.api.fojaN) }} + {{ form_widget(form.api.fojaN, {'attr': {'class': form_errors(form.api.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.fojaN) }} +
+
+
+ + {{ form_label(form.api.formPartida) }} + {{ form_widget(form.api.formPartida, {'attr': {'class': form_errors(form.api.formPartida) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.formPartida) }}
+
+
+ + {{ form_label(form.api.verNumPartida) }} + {{ form_widget(form.api.verNumPartida, {'attr': {'class': form_errors(form.api.verNumPartida) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verNumPartida) }} +
+
+
+ + {{ form_label(form.api.verPartidaCatastro) }} + {{ form_widget(form.api.verPartidaCatastro, {'attr': {'class': form_errors(form.api.verPartidaCatastro) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verPartidaCatastro) }} +
+
+
+ + {{ form_label(form.api.verTitularBoleta) }} + {{ form_widget(form.api.verTitularBoleta, {'attr': {'class': form_errors(form.api.verTitularBoleta) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verTitularBoleta) }} +
+
+
+ + {{ form_label(form.api.verIndTitular) }} + {{ form_widget(form.api.verIndTitular, {'attr': {'class': form_errors(form.api.verIndTitular) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verIndTitular) }} +
+
+
+ + {{ form_label(form.api.AcreDocUsoInmueble) }} + {{ form_widget(form.api.AcreDocUsoInmueble, {'attr': {'class': form_errors(form.api.AcreDocUsoInmueble) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.AcreDocUsoInmueble) }} +
+
+
+ +
USO CONFORME DE SUELO
+ +
+ +
- {% endfor %} - + {{ form_label(form.usoConformeDeSuelo.usoConformeSuelo) }} + {{ form_widget(form.usoConformeDeSuelo.usoConformeSuelo, {'attr': {'class': form_errors(form.usoConformeDeSuelo.usoConformeSuelo) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.usoConformeSuelo) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.fojaN) }} + {{ form_widget(form.usoConformeDeSuelo.fojaN, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.fojaN) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.presentaHabilitacion) }} + {{ form_widget(form.usoConformeDeSuelo.presentaHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.presentaHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.presentaHabilitacion) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} + {{ form_widget(form.usoConformeDeSuelo.fechaInicioHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.fechaVencimiento) }} + {{ form_widget(form.usoConformeDeSuelo.fechaVencimiento, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaVencimiento) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.fechaVencimiento) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.verActividad) }} + {{ form_widget(form.usoConformeDeSuelo.verActividad, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verActividad) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.verActividad) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.verLocalizacion) }} + {{ form_widget(form.usoConformeDeSuelo.verLocalizacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verLocalizacion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.verLocalizacion) }} +
+
- {% endfor %} {{form_end(form)}}
{% endblock %} \ No newline at end of file diff --git a/src/AppBundle/Controller/PlantillaController.php b/src/AppBundle/Controller/PlantillaController.php index 32ff433..b43b7d5 100644 --- a/src/AppBundle/Controller/PlantillaController.php +++ b/src/AppBundle/Controller/PlantillaController.php @@ -49,15 +49,10 @@ public function plantillaNewAction(Request $request) //return $this->redirectToRoute('listar_formularios'); } - $secciones = $entityManager - ->getRepository(Seccion::class) - ->findBy([ - 'idPlantilla' => $plantilla->getId() - ]); + return $this->render('plantilla/new.html.twig', array( - 'form' => $form->createView(), - 'secciones' => $secciones + 'form' => $form->createView() )); diff --git a/src/AppBundle/Entity/FormularioA/AFIP.php b/src/AppBundle/Entity/FormularioA/AFIP.php new file mode 100644 index 0000000..cb5a559 --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/AFIP.php @@ -0,0 +1,225 @@ +id; + } + + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; + } + + /** + * Get the value of constancia + * + * @return bool + */ + public function getConstancia() + { + return $this->constancia; + } + + /** + * Set the value of constancia + * + * @param bool $constancia + * + * @return self + */ + public function setConstancia(bool $constancia) + { + $this->constancia = $constancia; + + return $this; + } + + /** + * Get the value of fojaN + * + * @return string + */ + public function getFojaN() + { + return $this->fojaN; + } + + /** + * Set the value of fojaN + * + * @param string $fojaN + * + * @return self + */ + public function setFojaN(string $fojaN) + { + $this->fojaN = $fojaN; + + return $this; + } + + /** + * Get the value of verFechIni + * + * @return bool + */ + public function getVerFechIni() + { + return $this->verFechIni; + } + + /** + * Set the value of verFechIni + * + * @param bool $verFechIni + * + * @return self + */ + public function setVerFechIni(bool $verFechIni) + { + $this->verFechIni = $verFechIni; + + return $this; + } + + /** + * Get the value of verRazonSocial + * + * @return bool + */ + public function getVerRazonSocial() + { + return $this->verRazonSocial; + } + + /** + * Set the value of verRazonSocial + * + * @param bool $verRazonSocial + * + * @return self + */ + public function setVerRazonSocial(bool $verRazonSocial) + { + $this->verRazonSocial = $verRazonSocial; + + return $this; + } + + /** + * Get the value of verCUIT + * + * @return bool + */ + public function getVerCUIT() + { + return $this->verCUIT; + } + + /** + * Set the value of verCUIT + * + * @param bool $verCUIT + * + * @return self + */ + public function setVerCUIT(bool $verCUIT) + { + $this->verCUIT = $verCUIT; + + return $this; + } + + /** + * Get the value of verAct + * + * @return bool + */ + public function getVerAct() + { + return $this->verAct; + } + + /** + * Set the value of verAct + * + * @param bool $verAct + * + * @return self + */ + public function setVerAct(bool $verAct) + { + $this->verAct = $verAct; + + return $this; + } +} diff --git a/src/AppBundle/Entity/FormularioA/API.php b/src/AppBundle/Entity/FormularioA/API.php new file mode 100644 index 0000000..db0cddf --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/API.php @@ -0,0 +1,286 @@ +id; + } + + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; + } + + + + /** + * Get the value of AcreDocUsoInmueble + * + * @return bool + */ + public function getAcreDocUsoInmueble() + { + return $this->AcreDocUsoInmueble; + } + + /** + * Set the value of AcreDocUsoInmueble + * + * @param bool $AcreDocUsoInmueble + * + * @return self + */ + public function setAcreDocUsoInmueble(bool $AcreDocUsoInmueble) + { + $this->AcreDocUsoInmueble = $AcreDocUsoInmueble; + + return $this; + } + + /** + * Get the value of verIndTitular + * + * @return bool + */ + public function getVerIndTitular() + { + return $this->verIndTitular; + } + + /** + * Set the value of verIndTitular + * + * @param bool $verIndTitular + * + * @return self + */ + public function setVerIndTitular(bool $verIndTitular) + { + $this->verIndTitular = $verIndTitular; + + return $this; + } + + /** + * Get the value of verTitularBoleta + * + * @return bool + */ + public function getVerTitularBoleta() + { + return $this->verTitularBoleta; + } + + /** + * Set the value of verTitularBoleta + * + * @param bool $verTitularBoleta + * + * @return self + */ + public function setVerTitularBoleta(bool $verTitularBoleta) + { + $this->verTitularBoleta = $verTitularBoleta; + + return $this; + } + + /** + * Get the value of verPartidaCatastro + * + * @return bool + */ + public function getVerPartidaCatastro() + { + return $this->verPartidaCatastro; + } + + /** + * Set the value of verPartidaCatastro + * + * @param bool $verPartidaCatastro + * + * @return self + */ + public function setVerPartidaCatastro(bool $verPartidaCatastro) + { + $this->verPartidaCatastro = $verPartidaCatastro; + + return $this; + } + + /** + * Get the value of verNumPartida + * + * @return bool + */ + public function getVerNumPartida() + { + return $this->verNumPartida; + } + + /** + * Set the value of verNumPartida + * + * @param bool $verNumPartida + * + * @return self + */ + public function setVerNumPartida(bool $verNumPartida) + { + $this->verNumPartida = $verNumPartida; + + return $this; + } + + /** + * Get the value of formPartida + * + * @return bool + */ + public function getFormPartida() + { + return $this->formPartida; + } + + /** + * Set the value of formPartida + * + * @param bool $formPartida + * + * @return self + */ + public function setFormPartida(bool $formPartida) + { + $this->formPartida = $formPartida; + + return $this; + } + + /** + * Get the value of fojaN + * + * @return string + */ + public function getFojaN() + { + return $this->fojaN; + } + + /** + * Set the value of fojaN + * + * @param string $fojaN + * + * @return self + */ + public function setFojaN(string $fojaN) + { + $this->fojaN = $fojaN; + + return $this; + } + + /** + * Get the value of preImpInmobiliario + * + * @return bool + */ + public function getPreImpInmobiliario() + { + return $this->preImpInmobiliario; + } + + /** + * Set the value of preImpInmobiliario + * + * @param bool $preImpInmobiliario + * + * @return self + */ + public function setPreImpInmobiliario(bool $preImpInmobiliario) + { + $this->preImpInmobiliario = $preImpInmobiliario; + + return $this; + } +} diff --git a/src/AppBundle/Entity/FormularioA/ActaSocietaria.php b/src/AppBundle/Entity/FormularioA/ActaSocietaria.php new file mode 100644 index 0000000..c095a12 --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/ActaSocietaria.php @@ -0,0 +1,198 @@ +verObjSoc; + } + + /** + * Set the value of verObjSoc + * + * @param bool $verObjSoc + * + * @return self + */ + public function setVerObjSoc(bool $verObjSoc) + { + $this->verObjSoc = $verObjSoc; + + return $this; + } + + /** + * Get the value of vencido + * + * @return bool + */ + public function getVencido() + { + return $this->vencido; + } + + /** + * Set the value of vencido + * + * @param bool $vencido + * + * @return self + */ + public function setVencido(bool $vencido) + { + $this->vencido = $vencido; + + return $this; + } + + /** + * Get the value of titulares + * + * @return bool + */ + public function getTitulares() + { + return $this->titulares; + } + + /** + * Set the value of titulares + * + * @param bool $titulares + * + * @return self + */ + public function setTitulares(bool $titulares) + { + $this->titulares = $titulares; + + return $this; + } + + /** + * Get the value of fojaN + * + * @return string + */ + public function getFojaN() + { + return $this->fojaN; + } + + /** + * Set the value of fojaN + * + * @param string $fojaN + * + * @return self + */ + public function setFojaN(string $fojaN) + { + $this->fojaN = $fojaN; + + return $this; + } + + + /** + * Get the value of id + * + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; + } + + /** + * Get the value of actaSocietaria + * + * @return bool + */ + public function getActaSocietaria() + { + return $this->actaSocietaria; + } + + /** + * Set the value of actaSocietaria + * + * @param bool $actaSocietaria + * + * @return self + */ + public function setActaSocietaria(bool $actaSocietaria) + { + $this->actaSocietaria = $actaSocietaria; + + return $this; + } +} diff --git a/src/AppBundle/Entity/FormularioA/ContratoSocial.php b/src/AppBundle/Entity/FormularioA/ContratoSocial.php new file mode 100644 index 0000000..40a9b70 --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/ContratoSocial.php @@ -0,0 +1,226 @@ +verObjSoc; + } + + /** + * Set the value of verObjSoc + * + * @param bool $verObjSoc + * + * @return self + */ + public function setVerObjSoc(bool $verObjSoc) + { + $this->verObjSoc = $verObjSoc; + + return $this; + } + + /** + * Get the value of vencido + * + * @return bool + */ + public function getVencido() + { + return $this->vencido; + } + + /** + * Set the value of vencido + * + * @param bool $vencido + * + * @return self + */ + public function setVencido(bool $vencido) + { + $this->vencido = $vencido; + + return $this; + } + + /** + * Get the value of titulares + * + * @return bool + */ + public function getTitulares() + { + return $this->titulares; + } + + /** + * Set the value of titulares + * + * @param bool $titulares + * + * @return self + */ + public function setTitulares(bool $titulares) + { + $this->titulares = $titulares; + + return $this; + } + + /** + * Get the value of unipersonal + * + * @return bool + */ + public function getUnipersonal() + { + return $this->unipersonal; + } + + /** + * Set the value of unipersonal + * + * @param bool $unipersonal + * + * @return self + */ + public function setUnipersonal(bool $unipersonal) + { + $this->unipersonal = $unipersonal; + + return $this; + } + + /** + * Get the value of fojaN + * + * @return string + */ + public function getFojaN() + { + return $this->fojaN; + } + + /** + * Set the value of fojaN + * + * @param string $fojaN + * + * @return self + */ + public function setFojaN(string $fojaN) + { + $this->fojaN = $fojaN; + + return $this; + } + + /** + * Get the value of poseeContrato + * + * @return bool + */ + public function getPoseeContrato() + { + return $this->poseeContrato; + } + + /** + * Set the value of poseeContrato + * + * @param bool $poseeContrato + * + * @return self + */ + public function setPoseeContrato(bool $poseeContrato) + { + $this->poseeContrato = $poseeContrato; + + return $this; + } + + /** + * Get the value of id + * + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; + } +} diff --git a/src/AppBundle/Entity/FormularioA/Dni.php b/src/AppBundle/Entity/FormularioA/Dni.php new file mode 100644 index 0000000..d4a9330 --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/Dni.php @@ -0,0 +1,48 @@ +calle; + } + + /** + * Set the value of calle + * + * @param string $calle + * + * @return self + */ + public function setCalle(string $calle) + { + $this->calle = $calle; + + return $this; + } + + /** + * Get the value of provincia + * + * @return string + */ + public function getProvincia() + { + return $this->provincia; + } + + /** + * Set the value of provincia + * + * @param string $provincia + * + * @return self + */ + public function setProvincia(string $provincia) + { + $this->provincia = $provincia; + + return $this; + } + + /** + * Get the value of departamento + * + * @return string + */ + public function getDepartamento() + { + return $this->departamento; + } + + /** + * Set the value of departamento + * + * @param string $departamento + * + * @return self + */ + public function setDepartamento(string $departamento) + { + $this->departamento = $departamento; + + return $this; + } + + /** + * Get the value of localidad + * + * @return string + */ + public function getLocalidad() + { + return $this->localidad; + } + + /** + * Set the value of localidad + * + * @param string $localidad + * + * @return self + */ + public function setLocalidad(string $localidad) + { + $this->localidad = $localidad; + + return $this; + } + + /** + * Get the value of cp + * + * @return string + */ + public function getCp() + { + return $this->cp; + } + + /** + * Set the value of cp + * + * @param string $cp + * + * @return self + */ + public function setCp(string $cp) + { + $this->cp = $cp; + + return $this; + } + + /** + * Get the value of email + * + * @return string + */ + public function getEmail() + { + return $this->email; + } + + /** + * Set the value of email + * + * @param string $email + * + * @return self + */ + public function setEmail(string $email) + { + $this->email = $email; + + return $this; + } + + /** + * Get the value of id + * + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; + } + + /** + * Get the value of verEmail + * + * @return string + */ + public function getVerEmail() + { + return $this->verEmail; + } + + /** + * Set the value of verEmail + * + * @param string $verEmail + * + * @return self + */ + public function setVerEmail(string $verEmail) + { + $this->verEmail = $verEmail; + + return $this; + } +} diff --git a/src/AppBundle/Entity/FormularioA/DomicilioReal.php b/src/AppBundle/Entity/FormularioA/DomicilioReal.php new file mode 100644 index 0000000..f9ccfa2 --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/DomicilioReal.php @@ -0,0 +1,109 @@ +calle; + } + + /** + * Set the value of calle + * + * @param string $calle + * + * @return self + */ + public function setCalle(string $calle) + { + $this->calle = $calle; + + return $this; + } + + /** + * Get the value of localidad + * + * @return string + */ + public function getLocalidad() + { + return $this->localidad; + } + + /** + * Set the value of localidad + * + * @param string $localidad + * + * @return self + */ + public function setLocalidad(string $localidad) + { + $this->localidad = $localidad; + + return $this; + } + + /** + * Get the value of id + * + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; + } +} diff --git a/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php b/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php new file mode 100644 index 0000000..49f77cf --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php @@ -0,0 +1,62 @@ +id; } - function getNombre() { - return $this->nombre; + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; } - - function setId($id) { - $this->id = $id; + /** + * Get the value of nombre + * + * @return string + */ + public function getNombre() + { + return $this->nombre; } - function setNombre($nombre) { + /** + * Set the value of nombre + * + * @param string $nombre + * + * @return self + */ + public function setNombre(string $nombre) + { $this->nombre = $nombre; + + return $this; } - function getSecciones() { - return $this->secciones; + /** + * Get the value of domicilioLegal + */ + public function getDomicilioLegal() + { + return $this->domicilioLegal; + } + + /** + * Set the value of domicilioLegal + * + * @return self + */ + public function setDomicilioLegal($domicilioLegal) + { + $this->domicilioLegal = $domicilioLegal; + + return $this; + } + + /** + * Get the value of domicilioReal + */ + public function getDomicilioReal() + { + return $this->domicilioReal; } - function setSecciones($secciones) { - $this->secciones = $secciones; + /** + * Set the value of domicilioReal + * + * @return self + */ + public function setDomicilioReal($domicilioReal) + { + $this->domicilioReal = $domicilioReal; + + return $this; } - - public function addSecciones(Seccion $seccion) + /** + * Get the value of contratoSocial + */ + public function getContratoSocial() + { + return $this->contratoSocial; + } + + /** + * Set the value of contratoSocial + * + * @return self + */ + public function setContratoSocial($contratoSocial) { - - $secciones->setIdPlantilla($this); + $this->contratoSocial = $contratoSocial; - $this->secciones->add($seccion); - + return $this; } - public function removeSecciones(Seccion $seccion) + /** + * Get the value of actaSocietaria + */ + public function getActaSocietaria() { - $this->secciones->removeElement($seccion); + return $this->actaSocietaria; } - + + /** + * Set the value of actaSocietaria + * + * @return self + */ + public function setActaSocietaria($actaSocietaria) + { + $this->actaSocietaria = $actaSocietaria; + + return $this; + } + + /** + * Get the value of dni + */ + public function getDni() + { + return $this->dni; + } + + /** + * Set the value of dni + * + * @return self + */ + public function setDni($dni) + { + $this->dni = $dni; + + return $this; + } + /** - * Constructor - */ - public function __construct() + * Get the value of afip + */ + public function getAfip() { - $this->secciones = new ArrayCollection(); + return $this->afip; } + /** + * Set the value of afip + * + * @return self + */ + public function setAfip($afip) + { + $this->afip = $afip; + + return $this; + } + + /** + * Get the value of api + */ + public function getApi() + { + return $this->api; + } + + /** + * Set the value of api + * + * @return self + */ + public function setApi($api) + { + $this->api = $api; + + return $this; + } + + /** + * Get the value of usoConformeDeSuelo + */ + public function getUsoConformeDeSuelo() + { + return $this->usoConformeDeSuelo; + } + + /** + * Set the value of usoConformeDeSuelo + * + * @return self + */ + public function setUsoConformeDeSuelo($usoConformeDeSuelo) + { + $this->usoConformeDeSuelo = $usoConformeDeSuelo; + + return $this; + } } diff --git a/src/AppBundle/Form/FormularioA/APIType.php b/src/AppBundle/Form/FormularioA/APIType.php new file mode 100644 index 0000000..4ba8f73 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/APIType.php @@ -0,0 +1,91 @@ +add('preImpInmobiliario', Choicetype::class, [ + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + 'label' => 'Presenta impuesto inmobiliario' + ]) + ->add('fojaN', TextType::class,['label' => 'Foja N°']) + ->add('formPartida', Choicetype::class, [ + 'label' => 'Indicar si corresponde a un formato de N° de partida', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + ->add('verNumPartida', Choicetype::class, [ + 'label' => 'Verificar Nº de partida', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + 'DOMICILIO INCOMPLETO' => null, + ], + ]) + ->add('verPartidaCatastro', Choicetype::class, [ + 'label' => 'Verificar N° de partida con catastro', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('verTitularBoleta', Choicetype::class, [ + 'label' => 'Indicar si figura titular en la boleta', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + + ->add('verIndTitular', Choicetype::class, [ + 'label' => 'Verificar iniciador con titular', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('AcreDocUsoInmueble', Choicetype::class, [ + 'label' => 'Acreditar documentación de uso de inmueble', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioA/ActaSocietariaType.php b/src/AppBundle/Form/FormularioA/ActaSocietariaType.php new file mode 100644 index 0000000..5a13914 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/ActaSocietariaType.php @@ -0,0 +1,65 @@ +add('fojaN', TextType::class, ['label' => 'Foja N°: ']) + ->add('actaSocietaria', Choicetype::class, [ + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + 'label' => 'Indicar si tiene acta societaria' + ]) + ->add('titulares', Choicetype::class, [ + 'label' => 'Verificar titulares', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('vencido', Choicetype::class, [ + 'label' => 'Indicar si está vencido', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + ->add('verObjSoc', Choicetype::class, [ + 'label' => 'Verificar objeto de la sociedad', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioA/AfipType.php b/src/AppBundle/Form/FormularioA/AfipType.php new file mode 100644 index 0000000..33449b1 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/AfipType.php @@ -0,0 +1,73 @@ +add('constancia', Choicetype::class, [ + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + 'label' => 'Presenta constancia de AFIP' + ]) + ->add('fojaN', TextType::class,['label' => 'Foja N°']) + ->add('verFechIni', Choicetype::class, [ + 'label' => 'Verificar fecha de inicio', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('verRazonSocial', Choicetype::class, [ + 'label' => 'Verificar nombre de la razón social', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('verCUIT', Choicetype::class, [ + 'label' => 'Verificar N° de CUIT', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('verAct', Choicetype::class, [ + 'label' => 'Verificar actividades', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioA/ContratoSocialType.php b/src/AppBundle/Form/FormularioA/ContratoSocialType.php new file mode 100644 index 0000000..2447174 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/ContratoSocialType.php @@ -0,0 +1,73 @@ +add('fojaN', TextType::class, ['label' => 'Foja N°: ']) + ->add('poseeContrato', Choicetype::class, [ + 'choices' => [ + 'Si' => true, + 'No' => false, + 'SOCIEDAD DE HECHO' => null, + ], + 'label' => 'Indicar si tiene contrato social' + ]) + ->add('unipersonal', Choicetype::class, [ + 'label' => 'Verificar que sea unipersonal ', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + ->add('titulares', Choicetype::class, [ + 'label' => 'Verificar titulares', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('vencido', Choicetype::class, [ + 'label' => 'Indicar si está vencido', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + ->add('verObjSoc', Choicetype::class, [ + 'label' => 'Verificar objeto de la sociedad', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioA/DNIType.php b/src/AppBundle/Form/FormularioA/DNIType.php new file mode 100644 index 0000000..9f3ef26 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/DNIType.php @@ -0,0 +1,64 @@ +add('dni', Choicetype::class, [ + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + 'label' => 'Presenta DNI titulares y/o socios' + ]) + ->add('verDni', Choicetype::class, [ + 'label' => 'Verificar DNI titulares y/o socios', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ->add('apoderado', Choicetype::class, [ + 'label' => 'Indicar si tiene apoderado/s', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + ->add('verApoderado', Choicetype::class, [ + 'label' => 'Verificar documentación apoderado/s', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioA/DomicilioLegalType.php b/src/AppBundle/Form/FormularioA/DomicilioLegalType.php new file mode 100644 index 0000000..b5bd616 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/DomicilioLegalType.php @@ -0,0 +1,46 @@ +add('calle', TextType::class, ['label' => 'Calle: ']) + ->add('provincia', TextType::class, ['label' => 'Provincia: ']) + ->add('departamento', TextType::class, ['label' => 'Departamento: ']) + ->add('localidad', TextType::class, ['label' => 'Localidad: ']) + ->add('cp', TextType::class, ['label' => 'Codigo Postal: ']) + ->add('email', TextType::class, ['label' => 'Dirección email: ']) + ->add('acepEmail', ChoiceType::class, [ + 'choices' => [ + '' => null, + 'Si' => true, + 'No' => false, + ], + 'label' => 'Acepta recibir correo legal en el email' + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioA/DomicilioRealType.php b/src/AppBundle/Form/FormularioA/DomicilioRealType.php new file mode 100644 index 0000000..3d459d3 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/DomicilioRealType.php @@ -0,0 +1,34 @@ +add('calle', TextType::class, ['label' => 'Calle: ']) + ->add('localidad', TextType::class, ['label' => 'Localidad: ']) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioA/UsoConformeDeSueloType.php b/src/AppBundle/Form/FormularioA/UsoConformeDeSueloType.php new file mode 100644 index 0000000..081b5fe --- /dev/null +++ b/src/AppBundle/Form/FormularioA/UsoConformeDeSueloType.php @@ -0,0 +1,68 @@ +add('usoConformeSuelo', Choicetype::class, [ + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + 'label' => 'Uso conforme de suelo' + ]) + ->add('fojaN', TextType::class,['label' => 'Foja N°']) + ->add('presentaHabilitacion', Choicetype::class, [ + 'label' => 'Presenta habilitación municipal y/o comunal', + 'choices' => [ + 'Si' => true, + 'No' => false, + '' => null, + ], + ]) + ->add('fechaInicioHabilitacion', DateType::class, ['label' => 'Verificar Nº de partida']) + ->add('fechaVencimiento', DateType::class, ['label' => 'Verificar N° de partida con catastro']) + ->add('verActividad', Choicetype::class, [ + 'label' => 'Verificar actividad', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + + ->add('verLocalizacion', Choicetype::class, [ + 'label' => 'Verificar localización', + 'choices' => [ + 'COINCIDE' => true, + 'NO COINCIDE' => false, + '' => null, + ], + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => DomicilioLegal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/PlantillaType.php b/src/AppBundle/Form/PlantillaType.php index 5fa340e..a391c77 100644 --- a/src/AppBundle/Form/PlantillaType.php +++ b/src/AppBundle/Form/PlantillaType.php @@ -5,15 +5,21 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; use AppBundle\Form\SeccionType; +use AppBundle\Form\FormularioA\DomicilioLegalType; +use AppBundle\Form\FormularioA\DomicilioRealType; +use AppBundle\Form\FormularioA\ContratoSocialType; +use AppBundle\Form\FormularioA\ActaSocietariaType; +use AppBundle\Form\FormularioA\APIType; +use AppBundle\Form\FormularioA\UsoConformeDeSueloType; +use AppBundle\Form\FormularioA\DNIType; +use AppBundle\Form\FormularioA\AfipType; use AppBundle\Entity\Plantilla; use AppBundle\Entity\Seccion; use Symfony\Component\OptionsResolver\OptionsResolver; //use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; -//use Symfony\Component\Form\Extension\Core\Type\TextareaType; -//use Symfony\Component\Form\Extension\Core\Type\IntegerType; -//use Symfony\Component\Form\Extension\Core\Type\EmailType; + class PlantillaType extends AbstractType { @@ -21,12 +27,15 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder //->add('nombre', TextType::class, ['label' => 'Nombre del checklist: ']) - ->add('secciones',CollectionType::class, [ - 'entry_type' => SeccionType::class, - 'entry_options' => ['label' => 'Secciones: '], - ]) + ->add('domicilioLegal', DomicilioLegalType::class) + ->add('domicilioReal', DomicilioRealType::class) + ->add('contratoSocial', ContratoSocialType::class) + ->add('actaSocietaria', ActaSocietariaType::class) + ->add('dni', DNIType::class) + ->add('afip', AfipType::class) + ->add('api', APIType::class) + ->add('usoConformeDeSuelo', UsoConformeDeSueloType::class) ; - } public function configureOptions(OptionsResolver $resolver) diff --git a/src/AppBundle/Repository/FormularioA/AFIPRepository.php b/src/AppBundle/Repository/FormularioA/AFIPRepository.php new file mode 100644 index 0000000..c6467f6 --- /dev/null +++ b/src/AppBundle/Repository/FormularioA/AFIPRepository.php @@ -0,0 +1,13 @@ + Date: Mon, 7 Oct 2019 07:26:37 -0300 Subject: [PATCH 05/23] =?UTF-8?q?formulario=20B,=20no=20terminado=20a?= =?UTF-8?q?=C3=BAn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nbproject/private/private.xml | 2 +- .../Entity/FormularioB/CategoriaFinal.php | 2 +- src/AppBundle/Entity/FormularioB/Dotacion.php | 8 +- .../Entity/FormularioB/Localizacion.php | 15 ++- .../Form/FormularioB/DotacionType.php | 49 +++++++++ .../FormularioB/EmisionDeResiduosType.php | 100 ++++++++++++++++++ .../Form/FormularioB/FormularioBType.php | 34 ++++++ .../Form/FormularioB/LocalizacionType.php | 54 ++++++++++ .../Form/FormularioB/RiesgosType.php | 65 ++++++++++++ 9 files changed, 325 insertions(+), 4 deletions(-) create mode 100644 src/AppBundle/Form/FormularioB/DotacionType.php create mode 100644 src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php create mode 100644 src/AppBundle/Form/FormularioB/FormularioBType.php create mode 100644 src/AppBundle/Form/FormularioB/LocalizacionType.php create mode 100644 src/AppBundle/Form/FormularioB/RiesgosType.php diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 9083980..a9739dd 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,7 +3,7 @@ - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioB/Dotacion.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioB/FormularioBType.php file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioB/FormularioB.php diff --git a/src/AppBundle/Entity/FormularioB/CategoriaFinal.php b/src/AppBundle/Entity/FormularioB/CategoriaFinal.php index fd3aa4c..93420ec 100644 --- a/src/AppBundle/Entity/FormularioB/CategoriaFinal.php +++ b/src/AppBundle/Entity/FormularioB/CategoriaFinal.php @@ -14,5 +14,5 @@ * @author Admin */ class CategoriaFinal { - //put your code here + private $categoriaAsignada; } diff --git a/src/AppBundle/Entity/FormularioB/Dotacion.php b/src/AppBundle/Entity/FormularioB/Dotacion.php index 94f9941..6c6b241 100644 --- a/src/AppBundle/Entity/FormularioB/Dotacion.php +++ b/src/AppBundle/Entity/FormularioB/Dotacion.php @@ -14,5 +14,11 @@ * @author Admin */ class Dotacion { - //put your code here + + private $dotacionDePersonal; + + private $potenciaInstalada; + + private $superficieCubierta; + } diff --git a/src/AppBundle/Entity/FormularioB/Localizacion.php b/src/AppBundle/Entity/FormularioB/Localizacion.php index 2ea6d85..4168429 100644 --- a/src/AppBundle/Entity/FormularioB/Localizacion.php +++ b/src/AppBundle/Entity/FormularioB/Localizacion.php @@ -14,5 +14,18 @@ * @author Admin */ class Localizacion { - //put your code here + + private $zonificacion; + + private $aguaDeRed; + + private $redCloacal; + + private $energiaElectrica; + + private $gas; + + + + } diff --git a/src/AppBundle/Form/FormularioB/DotacionType.php b/src/AppBundle/Form/FormularioB/DotacionType.php new file mode 100644 index 0000000..670ecc2 --- /dev/null +++ b/src/AppBundle/Form/FormularioB/DotacionType.php @@ -0,0 +1,49 @@ +add('dotacionDePersonal', ChoiceType::class, ['label' => 'Dotación de Personal:', + 'choices' => [ + '<15' => '<15', + '16-50' => '16-50', + '51-150' => '51-150', + '151-500' => '151-500', + '>500' => '>500', + ],]) + ->add('potenciaInstalada', ChoiceType::class, ['label' => 'Potencia instalada:', + 'choices' => [ + '<25' => '<25', + '26-100' => '26-100', + '101-500' => '101-500', + '>500' => '>500', + ],]) + ->add('superficieCubierta', ChoiceType::class, ['label' => 'Superficie cubierta/superficie total:', + 'choices' => [ + '<0.20' => '<0.20', + '0.21-0.50' => '0.21-0.50', + '0.51-0.80' => '0.51-0.80', + '0.81-1.00' => '0.81-1.00', + ],]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => Dotacion::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php b/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php new file mode 100644 index 0000000..b1392b8 --- /dev/null +++ b/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php @@ -0,0 +1,100 @@ +add('residuosSolidosSemisolidos', ChoiceType::class, ['label' => 'Residuos solidos y/o semisolidos:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('rsu', ChoiceType::class, ['label' => 'RSU:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('rnp', ChoiceType::class, ['label' => 'RNP:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('tipoDeResiduo', TextType::class, ['label' => 'Tipo de residuo:', + ])//ver de hacer choice con los códigos + ->add('rp', ChoiceType::class, ['label' => 'RP:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('definirCorrientesDeRP', TextType::class, ['label' => 'Definir corrientes de RP:', + ])//ver de hacer choice con los códigos + ->add('valorResiduo', NumberType::class, ['label' => 'Valor:', + ]) + ->add('efluentesYResiduosLiquidos', ChoiceType::class, ['label' => 'Efluentes y/o residuos líquidos:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('aguaATemperaturaAmbiente', ChoiceType::class, ['label' => 'Agua a temperatura ambiente:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('efluentesSinRP', ChoiceType::class, ['label' => 'Efluentes sin RP:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('efluentesConRP', ChoiceType::class, ['label' => 'Efluentes con RP:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('valorEfluente', TextType::class, ['label' => 'Valor:', + ]) + ->add('emisionesGaseosas', ChoiceType::class, ['label' => 'Emisiones gaseosas:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('componentesNaturalesDelAire', ChoiceType::class, ['label' => 'Componentes naturales del aire:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('combustionDeCombustiblesLiquidos', ChoiceType::class, ['label' => 'Combustión de combustibles líquidos:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('noContempladosBool', ChoiceType::class, ['label' => 'Los no contemplados anteriormente:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('noContempladosListado', TextType::class, ['label' => 'Indique cuales:', + ]) + ->add('valorEmisiones', NumberType::class, ['label' => 'Valor:', + ]); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => EmisionDeResiduos::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioB/FormularioBType.php b/src/AppBundle/Form/FormularioB/FormularioBType.php new file mode 100644 index 0000000..3ab8735 --- /dev/null +++ b/src/AppBundle/Form/FormularioB/FormularioBType.php @@ -0,0 +1,34 @@ +add('estadoSoporteDigital', TextType::class, ['label' => 'Estado de soporte digital:']) + ->add('ingresarCodigoExcel', TextType::class, ['label' => 'Ingresar código en excel:']) + ->add('$emisionDeResiduos', EmisionDeResiduosType::class, ['label' => false]) + ->add('riesgos', riesgosType::class, ['label' => false]) + ->add('dotacion', dotacionType::class, ['label' => false]) + ->add('localización', localizaciónType::class, ['label' => false]) + ->add('categoriaFinal', categoriaFinalType::class, ['label' => false]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => Dotacion::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioB/LocalizacionType.php b/src/AppBundle/Form/FormularioB/LocalizacionType.php new file mode 100644 index 0000000..19ea7a0 --- /dev/null +++ b/src/AppBundle/Form/FormularioB/LocalizacionType.php @@ -0,0 +1,54 @@ +add('zonificacion', ChoiceType::class, ['label' => 'Zonificación:', + 'choices' => [ + 'Parque industrial' => 'Parque industrial', + 'Industrial y rural' => 'Industrial y rural', + 'Otros' => 'Otros', + 'Urbana' => 'Urbana', + ],]) + ->add('aguaDeRed', ChoiceType::class, ['label' => 'Agua de red:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('redCloacal', ChoiceType::class, ['label' => 'Red cloacal:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('energiaElectrica', ChoiceType::class, ['label' => 'Energía electríca:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('gas', ChoiceType::class, ['label' => 'Gas:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ], + ]); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => Localizacion::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioB/RiesgosType.php b/src/AppBundle/Form/FormularioB/RiesgosType.php new file mode 100644 index 0000000..b4c2f2e --- /dev/null +++ b/src/AppBundle/Form/FormularioB/RiesgosType.php @@ -0,0 +1,65 @@ +add('riesgosPresuntos', ChoiceType::class, ['label' => 'Riesgos presuntos:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('acustico', ChoiceType::class, ['label' => 'Acústico:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('aparatosSometidosAPresion', ChoiceType::class, ['label' => 'Aparatos sometidos a presión:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('sustanciasQuimicas', ChoiceType::class, ['label' => 'Sustancias químicas:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('explosion', ChoiceType::class, ['label' => 'Explosión:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('incendio', ChoiceType::class, ['label' => 'Incendio:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('otrosBool', ChoiceType::class, ['label' => 'Otros:', + 'choices' => [ + 'Si' => true, + 'No' => false, + ],]) + ->add('otrosListado', TextType::class, ['label' => 'Indicar cuales:', + ]); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => Riesgos::class, + ]); + } + +} \ No newline at end of file From 19fca7fed94d431d05a5003f5fca3f119a0ee90b Mon Sep 17 00:00:00 2001 From: Emma284 Date: Mon, 7 Oct 2019 10:28:53 -0300 Subject: [PATCH 06/23] separacion en formulario A y B --- app/Resources/views/formularioB/new.html.twig | 639 ++++++++++++++++++ .../Controller/PlantillaController.php | 17 +- src/AppBundle/Entity/FormularioA.php | 83 --- .../Entity/FormularioA/FormularioA.php | 165 +++++ src/AppBundle/Entity/Plantilla.php | 268 +------- .../Form/FormularioA/FormularioAType.php | 41 ++ .../Form/FormularioB/FormularioBType.php | 20 +- src/AppBundle/Form/PlantillaType.php | 27 +- 8 files changed, 891 insertions(+), 369 deletions(-) create mode 100644 app/Resources/views/formularioB/new.html.twig delete mode 100644 src/AppBundle/Entity/FormularioA.php create mode 100644 src/AppBundle/Entity/FormularioA/FormularioA.php create mode 100644 src/AppBundle/Form/FormularioA/FormularioAType.php diff --git a/app/Resources/views/formularioB/new.html.twig b/app/Resources/views/formularioB/new.html.twig new file mode 100644 index 0000000..b461b47 --- /dev/null +++ b/app/Resources/views/formularioB/new.html.twig @@ -0,0 +1,639 @@ +{% extends '@STGTheme/Default/base.html.twig' %} +{# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} +{{ form_widget(form) }} +{{ form_end(form) }} #} + +{% block content %} + +
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
SUB-RUTINA
+ +
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+
+ +
ESTANDAR
+ +
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ + + + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ +
+ +
+ +
 
+ +
+ + {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} + +
DOMICILIO LEGAL
+ +
+ +
+ + {{ form_label(form.domicilioLegal.calle) }} + {{ form_widget(form.domicilioLegal.calle, {'attr': {'class': form_errors(form.domicilioLegal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.calle) }} +
+
+
+ + {{ form_label(form.domicilioLegal.provincia) }} + {{ form_widget(form.domicilioLegal.provincia, {'attr': {'class': form_errors(form.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.provincia) }} +
+
+
+ + {{ form_label(form.domicilioLegal.departamento) }} + {{ form_widget(form.domicilioLegal.departamento, {'attr': {'class': form_errors(form.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.departamento) }} +
+
+
+ + {{ form_label(form.domicilioLegal.localidad) }} + {{ form_widget(form.domicilioLegal.localidad, {'attr': {'class': form_errors(form.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.localidad) }} +
+
+
+ + {{ form_label(form.domicilioLegal.cp) }} + {{ form_widget(form.domicilioLegal.cp, {'attr': {'class': form_errors(form.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.cp) }} +
+
+
+ + {{ form_label(form.domicilioLegal.email) }} + {{ form_widget(form.domicilioLegal.email, {'attr': {'class': form_errors(form.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.email) }} +
+
+
+ + {{ form_label(form.domicilioLegal.acepEmail) }} + {{ form_widget(form.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioLegal.acepEmail) }} +
+
+
+ +
DOMICILIO REAL
+ +
+ +
+ + {{ form_label(form.domicilioReal.calle) }} + {{ form_widget(form.domicilioReal.calle, {'attr': {'class': form_errors(form.domicilioReal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioReal.calle) }} +
+
+
+ + {{ form_label(form.domicilioReal.localidad) }} + {{ form_widget(form.domicilioReal.localidad, {'attr': {'class': form_errors(form.domicilioReal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.domicilioReal.localidad) }} +
+
+
+ +
CONTRATO SOCIAL
+ +
+ +
+ + {{ form_label(form.contratoSocial.fojaN) }} + {{ form_widget(form.contratoSocial.fojaN, {'attr': {'class': form_errors(form.contratoSocial.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.fojaN) }} +
+
+ +
+ + {{ form_label(form.contratoSocial.poseeContrato) }} + {{ form_widget(form.contratoSocial.poseeContrato, {'attr': {'class': form_errors(form.contratoSocial.poseeContrato) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.poseeContrato) }} +
+
+ +
+ + {{ form_label(form.contratoSocial.unipersonal) }} + {{ form_widget(form.contratoSocial.unipersonal, {'attr': {'class': form_errors(form.contratoSocial.unipersonal) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.unipersonal) }} +
+
+
+ + {{ form_label(form.contratoSocial.titulares) }} + {{ form_widget(form.contratoSocial.titulares, {'attr': {'class': form_errors(form.contratoSocial.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.titulares) }} +
+
+
+ + {{ form_label(form.contratoSocial.vencido) }} + {{ form_widget(form.contratoSocial.vencido, {'attr': {'class': form_errors(form.contratoSocial.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.vencido) }} +
+
+
+ + {{ form_label(form.contratoSocial.verObjSoc) }} + {{ form_widget(form.contratoSocial.verObjSoc, {'attr': {'class': form_errors(form.contratoSocial.verObjSoc) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.contratoSocial.verObjSoc) }} +
+
+
+ +
ACTA SOCIETARIA
+ +
+ +
+ + {{ form_label(form.actaSocietaria.fojaN) }} + {{ form_widget(form.actaSocietaria.fojaN, {'attr': {'class': form_errors(form.actaSocietaria.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.fojaN) }} +
+
+ +
+ + {{ form_label(form.actaSocietaria.actaSocietaria) }} + {{ form_widget(form.actaSocietaria.actaSocietaria, {'attr': {'class': form_errors(form.actaSocietaria.actaSocietaria) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.actaSocietaria) }} +
+
+
+ + {{ form_label(form.actaSocietaria.titulares) }} + {{ form_widget(form.actaSocietaria.titulares, {'attr': {'class': form_errors(form.actaSocietaria.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.titulares) }} +
+
+
+ + {{ form_label(form.actaSocietaria.vencido) }} + {{ form_widget(form.actaSocietaria.vencido, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.vencido) }} +
+
+
+ + {{ form_label(form.actaSocietaria.verObjSoc) }} + {{ form_widget(form.actaSocietaria.verObjSoc, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.actaSocietaria.verObjSoc) }} +
+
+
+ +
DNI
+ +
+ +
+ + {{ form_label(form.dni.dni) }} + {{ form_widget(form.dni.dni, {'attr': {'class': form_errors(form.dni.dni) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.dni) }} +
+
+
+ + {{ form_label(form.dni.verDni) }} + {{ form_widget(form.dni.verDni, {'attr': {'class': form_errors(form.dni.verDni) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.verDni) }} +
+
+
+ + {{ form_label(form.dni.apoderado) }} + {{ form_widget(form.dni.apoderado, {'attr': {'class': form_errors(form.dni.apoderado) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.apoderado) }} +
+
+
+ + {{ form_label(form.dni.verApoderado) }} + {{ form_widget(form.dni.verApoderado, {'attr': {'class': form_errors(form.dni.verApoderado) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.dni.verApoderado) }} +
+
+
+ +
AFIP
+ +
+ +
+ + {{ form_label(form.afip.constancia) }} + {{ form_widget(form.afip.constancia, {'attr': {'class': form_errors(form.afip.constancia) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.constancia) }} +
+
+
+ + {{ form_label(form.afip.fojaN) }} + {{ form_widget(form.afip.fojaN, {'attr': {'class': form_errors(form.afip.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.fojaN) }} +
+
+
+ {{ form_label(form.afip.verFechIni) }} + {{ form_widget(form.afip.verFechIni, {'attr': {'class': form_errors(form.afip.verFechIni) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verFechIni) }} +
+
+
+ {{ form_label(form.afip.verRazonSocial) }} + {{ form_widget(form.afip.verRazonSocial, {'attr': {'class': form_errors(form.afip.verRazonSocial) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verRazonSocial) }} +
+
+
+ {{ form_label(form.afip.verCUIT) }} + {{ form_widget(form.afip.verCUIT, {'attr': {'class': form_errors(form.afip.verCUIT) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verCUIT) }} +
+
+
+ {{ form_label(form.afip.verAct) }} + {{ form_widget(form.afip.verAct, {'attr': {'class': form_errors(form.afip.verAct) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.afip.verAct) }} +
+
+
+ +
API
+ +
+ +
+ + {{ form_label(form.api.preImpInmobiliario) }} + {{ form_widget(form.api.preImpInmobiliario, {'attr': {'class': form_errors(form.api.preImpInmobiliario) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.preImpInmobiliario) }} +
+
+ +
+ + {{ form_label(form.api.fojaN) }} + {{ form_widget(form.api.fojaN, {'attr': {'class': form_errors(form.api.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.fojaN) }} +
+
+
+ + {{ form_label(form.api.formPartida) }} + {{ form_widget(form.api.formPartida, {'attr': {'class': form_errors(form.api.formPartida) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.formPartida) }} +
+
+
+ + {{ form_label(form.api.verNumPartida) }} + {{ form_widget(form.api.verNumPartida, {'attr': {'class': form_errors(form.api.verNumPartida) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verNumPartida) }} +
+
+
+ + {{ form_label(form.api.verPartidaCatastro) }} + {{ form_widget(form.api.verPartidaCatastro, {'attr': {'class': form_errors(form.api.verPartidaCatastro) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verPartidaCatastro) }} +
+
+
+ + {{ form_label(form.api.verTitularBoleta) }} + {{ form_widget(form.api.verTitularBoleta, {'attr': {'class': form_errors(form.api.verTitularBoleta) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verTitularBoleta) }} +
+
+
+ + {{ form_label(form.api.verIndTitular) }} + {{ form_widget(form.api.verIndTitular, {'attr': {'class': form_errors(form.api.verIndTitular) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.verIndTitular) }} +
+
+
+ + {{ form_label(form.api.AcreDocUsoInmueble) }} + {{ form_widget(form.api.AcreDocUsoInmueble, {'attr': {'class': form_errors(form.api.AcreDocUsoInmueble) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.api.AcreDocUsoInmueble) }} +
+
+
+ +
USO CONFORME DE SUELO
+ +
+ +
+ + {{ form_label(form.usoConformeDeSuelo.usoConformeSuelo) }} + {{ form_widget(form.usoConformeDeSuelo.usoConformeSuelo, {'attr': {'class': form_errors(form.usoConformeDeSuelo.usoConformeSuelo) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.usoConformeSuelo) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.fojaN) }} + {{ form_widget(form.usoConformeDeSuelo.fojaN, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.fojaN) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.presentaHabilitacion) }} + {{ form_widget(form.usoConformeDeSuelo.presentaHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.presentaHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.presentaHabilitacion) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} + {{ form_widget(form.usoConformeDeSuelo.fechaInicioHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.fechaVencimiento) }} + {{ form_widget(form.usoConformeDeSuelo.fechaVencimiento, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaVencimiento) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.fechaVencimiento) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.verActividad) }} + {{ form_widget(form.usoConformeDeSuelo.verActividad, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verActividad) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.verActividad) }} +
+
+
+ + {{ form_label(form.usoConformeDeSuelo.verLocalizacion) }} + {{ form_widget(form.usoConformeDeSuelo.verLocalizacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verLocalizacion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.usoConformeDeSuelo.verLocalizacion) }} +
+
+
+ {{form_end(form)}} +
+{% endblock %} \ No newline at end of file diff --git a/src/AppBundle/Controller/PlantillaController.php b/src/AppBundle/Controller/PlantillaController.php index b43b7d5..dacebeb 100644 --- a/src/AppBundle/Controller/PlantillaController.php +++ b/src/AppBundle/Controller/PlantillaController.php @@ -8,24 +8,15 @@ namespace AppBundle\Controller; -use Doctrine\Common\Collections\ArrayCollection; use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use AppBundle\Entity\Plantilla; use AppBundle\Form\PlantillaType; use AppBundle\Entity\Seccion; -use AppBundle\Form\SeccionType; use Symfony\Component\HttpFoundation\Request; - - /** - * Description of PlantillaController - * - * @author Emma - */ - - class PlantillaController extends Controller - { +class PlantillaController extends Controller +{ /** * @Route("/plantilla/new/", name="new_plantilla") */ @@ -42,10 +33,10 @@ public function plantillaNewAction(Request $request) if($form->isSubmitted() && $form->isValid()){ $plantilla = $form->getData(); - + $entityManager->persist($plantilla); $entityManager->flush(); - + //return $this->redirectToRoute('listar_formularios'); } diff --git a/src/AppBundle/Entity/FormularioA.php b/src/AppBundle/Entity/FormularioA.php deleted file mode 100644 index 73f4a22..0000000 --- a/src/AppBundle/Entity/FormularioA.php +++ /dev/null @@ -1,83 +0,0 @@ -resumenEjecutivo; - } - - /** - * Set the value of resumenEjecutivo - * - * @param string $resumenEjecutivo - * - * @return self - */ - public function setResumenEjecutivo(string $resumenEjecutivo) - { - $this->resumenEjecutivo = $resumenEjecutivo; - - return $this; - } - - - /** - * Get the value of id - * - * @return int - */ - public function getId() - { - return $this->id; - } - - /** - * Set the value of id - * - * @param int $id - * - * @return self - */ - public function setId(int $id) - { - $this->id = $id; - - return $this; - } -} diff --git a/src/AppBundle/Entity/FormularioA/FormularioA.php b/src/AppBundle/Entity/FormularioA/FormularioA.php new file mode 100644 index 0000000..8dddaec --- /dev/null +++ b/src/AppBundle/Entity/FormularioA/FormularioA.php @@ -0,0 +1,165 @@ +id; + } + + function getDomicilioLegal() { + return $this->domicilioLegal; + } + + function getDomicilioReal() { + return $this->domicilioReal; + } + + function getContratoSocial() { + return $this->contratoSocial; + } + + function getActaSocietaria() { + return $this->actaSocietaria; + } + + function getDni() { + return $this->dni; + } + + function getAfip() { + return $this->afip; + } + + function getApi() { + return $this->api; + } + + function getUsoConformeDeSuelo() { + return $this->usoConformeDeSuelo; + } + + function setId($id) { + $this->id = $id; + } + + function setDomicilioLegal($domicilioLegal) { + $this->domicilioLegal = $domicilioLegal; + } + + function setDomicilioReal($domicilioReal) { + $this->domicilioReal = $domicilioReal; + } + + function setContratoSocial($contratoSocial) { + $this->contratoSocial = $contratoSocial; + } + + function setActaSocietaria($actaSocietaria) { + $this->actaSocietaria = $actaSocietaria; + } + + function setDni($dni) { + $this->dni = $dni; + } + + function setAfip($afip) { + $this->afip = $afip; + } + + function setApi($api) { + $this->api = $api; + } + + function setUsoConformeDeSuelo($usoConformeDeSuelo) { + $this->usoConformeDeSuelo = $usoConformeDeSuelo; + } + + + +} diff --git a/src/AppBundle/Entity/Plantilla.php b/src/AppBundle/Entity/Plantilla.php index b72ba44..6ef2951 100644 --- a/src/AppBundle/Entity/Plantilla.php +++ b/src/AppBundle/Entity/Plantilla.php @@ -38,275 +38,59 @@ class Plantilla */ private $checklists; - - /** - * @ORM\OneToOne(targetEntity="DomicilioLegal", cascade={"persist"}) - * @ORM\JoinColumn(name="domicilioLegal_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\DomicilioLegal") - * @Assert\Valid - */ - private $domicilioLegal; - - - /** - * @ORM\OneToOne(targetEntity="DomicilioReal", cascade={"persist"}) - * @ORM\JoinColumn(name="DomicilioReal_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\DomicilioReal") - * @Assert\Valid - */ - private $domicilioReal; - - /** - * @ORM\OneToOne(targetEntity="ContratoSocial", cascade={"persist"}) - * @ORM\JoinColumn(name="contratoSocial_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\ContratoSocial") - * @Assert\Valid - */ - private $contratoSocial; - /** - * @ORM\OneToOne(targetEntity="ActaSocietaria", cascade={"persist"}) - * @ORM\JoinColumn(name="actaSocietaria_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\ActaSocietaria") - * @Assert\Valid - */ - private $actaSocietaria; - - /** - * @ORM\OneToOne(targetEntity="Dni", cascade={"persist"}) - * @ORM\JoinColumn(name="dni_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\Dni") - * @Assert\Valid + * + * @var type FormularioA */ - private $dni; + private $formularioA; /** - * @ORM\OneToOne(targetEntity="AFIP", cascade={"persist"}) - * @ORM\JoinColumn(name="afip_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\AFIP") - * @Assert\Valid - */ - private $afip; - /** - * @ORM\OneToOne(targetEntity="API", cascade={"persist"}) - * @ORM\JoinColumn(name="api_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\API") - * @Assert\Valid - */ - private $api; - /** - * @ORM\OneToOne(targetEntity="UsoConformeDeSuelo", cascade={"persist"}) - * @ORM\JoinColumn(name="usoConformeDeSuelo_id",referencedColumnName="id") - * @Assert\Type(type="AppBundle\Entity\FormularioA\UsoConformeDeSuelo") - * @Assert\Valid + * + * @var type FormularioB */ - private $usoConformeDeSuelo; + private $formularioB; - /** - * Get the value of id - * - * @return int - */ - public function getId() - { + + //Getters and setter + function getId() { return $this->id; } - /** - * Set the value of id - * - * @param int $id - * - * @return self - */ - public function setId(int $id) - { - $this->id = $id; - - return $this; - } - - /** - * Get the value of nombre - * - * @return string - */ - public function getNombre() - { + function getNombre() { return $this->nombre; } - /** - * Set the value of nombre - * - * @param string $nombre - * - * @return self - */ - public function setNombre(string $nombre) - { - $this->nombre = $nombre; - - return $this; + function getChecklists() { + return $this->checklists; } - /** - * Get the value of domicilioLegal - */ - public function getDomicilioLegal() - { - return $this->domicilioLegal; - } - - /** - * Set the value of domicilioLegal - * - * @return self - */ - public function setDomicilioLegal($domicilioLegal) - { - $this->domicilioLegal = $domicilioLegal; - - return $this; - } - - /** - * Get the value of domicilioReal - */ - public function getDomicilioReal() - { - return $this->domicilioReal; + function getFormularioA(): type { + return $this->formularioA; } - /** - * Set the value of domicilioReal - * - * @return self - */ - public function setDomicilioReal($domicilioReal) - { - $this->domicilioReal = $domicilioReal; - - return $this; - } - - /** - * Get the value of contratoSocial - */ - public function getContratoSocial() - { - return $this->contratoSocial; - } - - /** - * Set the value of contratoSocial - * - * @return self - */ - public function setContratoSocial($contratoSocial) - { - $this->contratoSocial = $contratoSocial; - - return $this; - } - - /** - * Get the value of actaSocietaria - */ - public function getActaSocietaria() - { - return $this->actaSocietaria; - } - - /** - * Set the value of actaSocietaria - * - * @return self - */ - public function setActaSocietaria($actaSocietaria) - { - $this->actaSocietaria = $actaSocietaria; - - return $this; - } - - /** - * Get the value of dni - */ - public function getDni() - { - return $this->dni; + function getFormularioB(): type { + return $this->formularioB; } - /** - * Set the value of dni - * - * @return self - */ - public function setDni($dni) - { - $this->dni = $dni; - - return $this; - } - - /** - * Get the value of afip - */ - public function getAfip() - { - return $this->afip; + function setId($id) { + $this->id = $id; } - /** - * Set the value of afip - * - * @return self - */ - public function setAfip($afip) - { - $this->afip = $afip; - - return $this; + function setNombre($nombre) { + $this->nombre = $nombre; } - /** - * Get the value of api - */ - public function getApi() - { - return $this->api; + function setChecklists($checklists) { + $this->checklists = $checklists; } - /** - * Set the value of api - * - * @return self - */ - public function setApi($api) - { - $this->api = $api; - - return $this; + function setFormularioA(type $formularioA) { + $this->formularioA = $formularioA; } - /** - * Get the value of usoConformeDeSuelo - */ - public function getUsoConformeDeSuelo() - { - return $this->usoConformeDeSuelo; + function setFormularioB(type $formularioB) { + $this->formularioB = $formularioB; } - /** - * Set the value of usoConformeDeSuelo - * - * @return self - */ - public function setUsoConformeDeSuelo($usoConformeDeSuelo) - { - $this->usoConformeDeSuelo = $usoConformeDeSuelo; - return $this; - } } diff --git a/src/AppBundle/Form/FormularioA/FormularioAType.php b/src/AppBundle/Form/FormularioA/FormularioAType.php new file mode 100644 index 0000000..6e474e9 --- /dev/null +++ b/src/AppBundle/Form/FormularioA/FormularioAType.php @@ -0,0 +1,41 @@ +add('nombre', TextType::class, ['label' => 'Nombre del checklist: ']) + ->add('domicilioLegal', DomicilioLegalType::class) + ->add('domicilioReal', DomicilioRealType::class) + ->add('contratoSocial', ContratoSocialType::class) + ->add('actaSocietaria', ActaSocietariaType::class) + ->add('dni', DNIType::class) + ->add('afip', AfipType::class) + ->add('api', APIType::class) + ->add('usoConformeDeSuelo', UsoConformeDeSueloType::class) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => FormularioA::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioB/FormularioBType.php b/src/AppBundle/Form/FormularioB/FormularioBType.php index 3ab8735..f70c2f6 100644 --- a/src/AppBundle/Form/FormularioB/FormularioBType.php +++ b/src/AppBundle/Form/FormularioB/FormularioBType.php @@ -4,9 +4,13 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use AppBundle\Entity\FormularioB\FormularioB; +use AppBundle\Form\FormularioB\EmisionDeResiduosType; +use AppBundle\Form\FormularioB\CategoriaFinalType; +use AppBundle\Form\FormularioB\DotacionType; +use AppBundle\Form\FormularioB\LocalizacionType; +use AppBundle\Form\FormularioB\RiesgosType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\Extension\Core\Type\ChoiceType; - class FormularioBType extends AbstractType @@ -16,18 +20,18 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('estadoSoporteDigital', TextType::class, ['label' => 'Estado de soporte digital:']) ->add('ingresarCodigoExcel', TextType::class, ['label' => 'Ingresar código en excel:']) - ->add('$emisionDeResiduos', EmisionDeResiduosType::class, ['label' => false]) - ->add('riesgos', riesgosType::class, ['label' => false]) - ->add('dotacion', dotacionType::class, ['label' => false]) - ->add('localización', localizaciónType::class, ['label' => false]) - ->add('categoriaFinal', categoriaFinalType::class, ['label' => false]) + ->add('$emisionDeResiduos', EmisionDeResiduosType::class) + ->add('riesgos', RiesgosType::class) + ->add('dotacion', DotacionType::class) + ->add('localización', LocalizacionType::class) + ->add('categoriaFinal', CategoriaFinalType::class) ; } public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'data_class' => Dotacion::class, + 'data_class' => FormularioB::class, ]); } diff --git a/src/AppBundle/Form/PlantillaType.php b/src/AppBundle/Form/PlantillaType.php index a391c77..6b1bcfa 100644 --- a/src/AppBundle/Form/PlantillaType.php +++ b/src/AppBundle/Form/PlantillaType.php @@ -2,23 +2,11 @@ namespace AppBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; -use AppBundle\Form\SeccionType; -use AppBundle\Form\FormularioA\DomicilioLegalType; -use AppBundle\Form\FormularioA\DomicilioRealType; -use AppBundle\Form\FormularioA\ContratoSocialType; -use AppBundle\Form\FormularioA\ActaSocietariaType; -use AppBundle\Form\FormularioA\APIType; -use AppBundle\Form\FormularioA\UsoConformeDeSueloType; -use AppBundle\Form\FormularioA\DNIType; -use AppBundle\Form\FormularioA\AfipType; +use AppBundle\Form\FormularioB\FormularioBType; +use AppBundle\Form\FormularioA\FormularioAType; use AppBundle\Entity\Plantilla; -use AppBundle\Entity\Seccion; use Symfony\Component\OptionsResolver\OptionsResolver; -//use Symfony\Component\Form\Extension\Core\Type\DateType; -use Symfony\Component\Form\Extension\Core\Type\TextType; -use Symfony\Component\Form\Extension\Core\Type\CollectionType; class PlantillaType extends AbstractType @@ -26,15 +14,8 @@ class PlantillaType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - //->add('nombre', TextType::class, ['label' => 'Nombre del checklist: ']) - ->add('domicilioLegal', DomicilioLegalType::class) - ->add('domicilioReal', DomicilioRealType::class) - ->add('contratoSocial', ContratoSocialType::class) - ->add('actaSocietaria', ActaSocietariaType::class) - ->add('dni', DNIType::class) - ->add('afip', AfipType::class) - ->add('api', APIType::class) - ->add('usoConformeDeSuelo', UsoConformeDeSueloType::class) + ->add('formularioA', FormularioAType::class) + ->add('formularioB', FormularioBType::class) ; } From 831462ebda8c003f567d674b617cfaac72a8ec10 Mon Sep 17 00:00:00 2001 From: Emma284 Date: Mon, 7 Oct 2019 10:30:22 -0300 Subject: [PATCH 07/23] separacion en formulario A y B --- src/AppBundle/Deprecated/Respuesta.php | 45 ----- src/AppBundle/Deprecated/Seccion.php | 147 --------------- .../Deprecated/SeccionController.php | 82 -------- src/AppBundle/Deprecated/SeccionType.php | 49 ----- src/AppBundle/Deprecated/Tarea.php | 176 ------------------ src/AppBundle/Deprecated/TareaType.php | 29 --- .../Repository/RespuestaRepository.php | 13 -- .../Repository/SeccionRepository.php | 13 -- src/AppBundle/Repository/TareaRepository.php | 13 -- 9 files changed, 567 deletions(-) delete mode 100644 src/AppBundle/Deprecated/Respuesta.php delete mode 100644 src/AppBundle/Deprecated/Seccion.php delete mode 100644 src/AppBundle/Deprecated/SeccionController.php delete mode 100644 src/AppBundle/Deprecated/SeccionType.php delete mode 100644 src/AppBundle/Deprecated/Tarea.php delete mode 100644 src/AppBundle/Deprecated/TareaType.php delete mode 100644 src/AppBundle/Repository/RespuestaRepository.php delete mode 100644 src/AppBundle/Repository/SeccionRepository.php delete mode 100644 src/AppBundle/Repository/TareaRepository.php diff --git a/src/AppBundle/Deprecated/Respuesta.php b/src/AppBundle/Deprecated/Respuesta.php deleted file mode 100644 index abeccb3..0000000 --- a/src/AppBundle/Deprecated/Respuesta.php +++ /dev/null @@ -1,45 +0,0 @@ -id; - } - - - - /** - * Get the value of nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Set the value of nombre - * - * @param string $nombre - * - * @return self - */ - public function setNombre(string $nombre) - { - $this->nombre = $nombre; - - return $this; - } - - /** - * Get the value of idPlantilla - * - * @return \AppBundle\Entity\Plantilla - */ - public function getIdPlantilla() - { - return $this->idPlantilla; - } - - /** - * Set the value of idPlantilla - * - * @param \AppBundle\Entity\Plantilla $idPlantilla - * - * @return self - */ - public function setIdPlantilla(\AppBundle\Entity\Plantilla $idPlantilla) - { - $this->idPlantilla = $idPlantilla; - - return $this; - } - - /** - * Get the value of tareas - */ - public function getTareas() - { - return $this->tareas; - } - - /** - * Set the value of tareas - * - * @return self - */ - public function setTareas($tareas) - { - $this->tareas = $tareas; - - return $this; - } - - public function addTareas(Tarea $tarea) - { - - $tareas->setIdSeccion($this); - - $this->tareas->add($tarea); - - } - - public function removeTareas(Tarea $tarea) - { - $this->tareas->removeElement($tarea); - } - - /** - * Constructor - */ - public function __construct() - { - $this->tareas = new ArrayCollection(); - } -} diff --git a/src/AppBundle/Deprecated/SeccionController.php b/src/AppBundle/Deprecated/SeccionController.php deleted file mode 100644 index 224d158..0000000 --- a/src/AppBundle/Deprecated/SeccionController.php +++ /dev/null @@ -1,82 +0,0 @@ -getDoctrine()->getManager(); - $seccion = $entityManager->getRepository(Seccion::class)->find($id); - - // $seccion = $this->getDoctrine()->getRepository(Seccion::class)->find($id); - - if (!$seccion) { - - throw $this->createNotFoundException('No se encontró seccion que tiene este id '.$id); - - } - - $tareas = new ArrayCollection(); - - foreach ($seccion->getTareas() as $tarea) { - $tareas->add($tarea); - } - // - // $tareas = $entityManager - // ->getRepository(Tarea::class) -// ->findBy(['idSeccion' => $id]); - $form = $this->createForm(SeccionType::class,$seccion); - - if ($form->isSubmitted()) { - - foreach ($tareas as $tarea) { - - if ($seccion->getTareas()->contains($tarea) === false) { - $entityManager->remove($tarea); - } - } - } - - $entityManager->persist($seccion); - $entityManager->flush(); - return $this->render('seccion/mostrar.html.twig',[ - - 'form' => $form->createView(), - 'tareas' =>$tareas - ]); - } - -} diff --git a/src/AppBundle/Deprecated/SeccionType.php b/src/AppBundle/Deprecated/SeccionType.php deleted file mode 100644 index 61751ab..0000000 --- a/src/AppBundle/Deprecated/SeccionType.php +++ /dev/null @@ -1,49 +0,0 @@ -add('nombre', TextType::class, ['label' => 'Nombre de sección: ']) - ->add('tareas',CollectionType::class, [ - 'entry_type' => TareaType::class, - 'entry_options' => ['label' => 'tareas: '], - ]) - ; - } - - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults([ - 'data_class' => Seccion::class, - ]); - } - - public function tareas() : array - { - $items = array(); - - //ver como agregar los elementos recuperados de la base de datos - - return $items; - } - -} \ No newline at end of file diff --git a/src/AppBundle/Deprecated/Tarea.php b/src/AppBundle/Deprecated/Tarea.php deleted file mode 100644 index bc6ed4e..0000000 --- a/src/AppBundle/Deprecated/Tarea.php +++ /dev/null @@ -1,176 +0,0 @@ -tipo; - } - - /** - * Set the value of tipo - * - * @param string $tipo - * - * @return self - */ - public function setTipo(string $tipo) - { - $this->tipo = $tipo; - - return $this; - } - - /** - * Get the value of idSeccion - * - * @return \AppBundle\Entity\Seccion - */ - public function getIdSeccion() - { - return $this->idSeccion; - } - - /** - * Set the value of idSeccion - * - * @param \AppBundle\Entity\Seccion $idSeccion - * - * @return self - */ - public function setIdSeccion(\AppBundle\Entity\Seccion $idSeccion) - { - $this->idSeccion = $idSeccion; - - return $this; - } - - //Constructor - // public function __construct() - // { - // $this->respuestas = new ArrayCollection(); - // } - - /** - * Get the value of nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Set the value of nombre - * - * @param string $nombre - * - * @return self - */ - public function setNombre(string $nombre) - { - $this->nombre = $nombre; - - return $this; - } -} diff --git a/src/AppBundle/Deprecated/TareaType.php b/src/AppBundle/Deprecated/TareaType.php deleted file mode 100644 index 088f7f4..0000000 --- a/src/AppBundle/Deprecated/TareaType.php +++ /dev/null @@ -1,29 +0,0 @@ -add('nombre', TextType::class) - ; - } - - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults([ - 'data_class' => Tarea::class, - ]); - } - -} \ No newline at end of file diff --git a/src/AppBundle/Repository/RespuestaRepository.php b/src/AppBundle/Repository/RespuestaRepository.php deleted file mode 100644 index 659222d..0000000 --- a/src/AppBundle/Repository/RespuestaRepository.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Mon, 7 Oct 2019 11:29:42 -0300 Subject: [PATCH 08/23] estructura finalizada --- app/Resources/views/formularioB/new.html.twig | 639 ------------------ src/AppBundle/Entity/Checklist.php | 229 ------- .../Entity/FormularioA/FormularioA.php | 30 +- .../Entity/FormularioB/CategoriaFinal.php | 39 +- src/AppBundle/Entity/FormularioB/Dotacion.php | 66 +- .../Entity/FormularioB/EmisionDeResiduos.php | 98 ++- .../Entity/FormularioB/FormularioB.php | 119 +++- .../Entity/FormularioB/Localizacion.php | 84 ++- src/AppBundle/Entity/FormularioB/Riesgos.php | 111 ++- src/AppBundle/Entity/Plantilla.php | 34 +- src/AppBundle/Entity/Resumen.php | 7 +- .../Form/FormularioA/FormularioAType.php | 2 +- .../Form/FormularioB/DotacionType.php | 2 +- .../FormularioB/EmisionDeResiduosType.php | 2 +- .../Form/FormularioB/LocalizacionType.php | 2 +- .../Form/FormularioB/RiesgosType.php | 2 +- 16 files changed, 532 insertions(+), 934 deletions(-) delete mode 100644 app/Resources/views/formularioB/new.html.twig delete mode 100644 src/AppBundle/Entity/Checklist.php diff --git a/app/Resources/views/formularioB/new.html.twig b/app/Resources/views/formularioB/new.html.twig deleted file mode 100644 index b461b47..0000000 --- a/app/Resources/views/formularioB/new.html.twig +++ /dev/null @@ -1,639 +0,0 @@ -{% extends '@STGTheme/Default/base.html.twig' %} -{# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} -{{ form_widget(form) }} -{{ form_end(form) }} #} - -{% block content %} - -
- -
- -
- - -
-
- - -
-
- - -
-
- - -
- -
- - -
-
- - -
-
- - -
-
- - -
- -
- -
SUB-RUTINA
- -
- -
- - - -
- -
-
- -
- - - -
- -
-
- -
- - - -
- -
-
- -
- - - -
- -
-
- -
- - - -
- -
-
-
- -
ESTANDAR
- -
- -
- - - -
- -
-
- -
- - - -
- -
-
- -
- - - -
- -
-
- -
- - - - - -
- -
-
- -
- - - -
- -
-
- -
- - - -
- -
-
- -
- - - -
- -
-
- -
- -
- -
 
- -
- - {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} - -
DOMICILIO LEGAL
- -
- -
- - {{ form_label(form.domicilioLegal.calle) }} - {{ form_widget(form.domicilioLegal.calle, {'attr': {'class': form_errors(form.domicilioLegal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioLegal.calle) }} -
-
-
- - {{ form_label(form.domicilioLegal.provincia) }} - {{ form_widget(form.domicilioLegal.provincia, {'attr': {'class': form_errors(form.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioLegal.provincia) }} -
-
-
- - {{ form_label(form.domicilioLegal.departamento) }} - {{ form_widget(form.domicilioLegal.departamento, {'attr': {'class': form_errors(form.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioLegal.departamento) }} -
-
-
- - {{ form_label(form.domicilioLegal.localidad) }} - {{ form_widget(form.domicilioLegal.localidad, {'attr': {'class': form_errors(form.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioLegal.localidad) }} -
-
-
- - {{ form_label(form.domicilioLegal.cp) }} - {{ form_widget(form.domicilioLegal.cp, {'attr': {'class': form_errors(form.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioLegal.cp) }} -
-
-
- - {{ form_label(form.domicilioLegal.email) }} - {{ form_widget(form.domicilioLegal.email, {'attr': {'class': form_errors(form.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioLegal.email) }} -
-
-
- - {{ form_label(form.domicilioLegal.acepEmail) }} - {{ form_widget(form.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioLegal.acepEmail) }} -
-
-
- -
DOMICILIO REAL
- -
- -
- - {{ form_label(form.domicilioReal.calle) }} - {{ form_widget(form.domicilioReal.calle, {'attr': {'class': form_errors(form.domicilioReal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioReal.calle) }} -
-
-
- - {{ form_label(form.domicilioReal.localidad) }} - {{ form_widget(form.domicilioReal.localidad, {'attr': {'class': form_errors(form.domicilioReal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.domicilioReal.localidad) }} -
-
-
- -
CONTRATO SOCIAL
- -
- -
- - {{ form_label(form.contratoSocial.fojaN) }} - {{ form_widget(form.contratoSocial.fojaN, {'attr': {'class': form_errors(form.contratoSocial.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.contratoSocial.fojaN) }} -
-
- -
- - {{ form_label(form.contratoSocial.poseeContrato) }} - {{ form_widget(form.contratoSocial.poseeContrato, {'attr': {'class': form_errors(form.contratoSocial.poseeContrato) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.contratoSocial.poseeContrato) }} -
-
- -
- - {{ form_label(form.contratoSocial.unipersonal) }} - {{ form_widget(form.contratoSocial.unipersonal, {'attr': {'class': form_errors(form.contratoSocial.unipersonal) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.contratoSocial.unipersonal) }} -
-
-
- - {{ form_label(form.contratoSocial.titulares) }} - {{ form_widget(form.contratoSocial.titulares, {'attr': {'class': form_errors(form.contratoSocial.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.contratoSocial.titulares) }} -
-
-
- - {{ form_label(form.contratoSocial.vencido) }} - {{ form_widget(form.contratoSocial.vencido, {'attr': {'class': form_errors(form.contratoSocial.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.contratoSocial.vencido) }} -
-
-
- - {{ form_label(form.contratoSocial.verObjSoc) }} - {{ form_widget(form.contratoSocial.verObjSoc, {'attr': {'class': form_errors(form.contratoSocial.verObjSoc) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.contratoSocial.verObjSoc) }} -
-
-
- -
ACTA SOCIETARIA
- -
- -
- - {{ form_label(form.actaSocietaria.fojaN) }} - {{ form_widget(form.actaSocietaria.fojaN, {'attr': {'class': form_errors(form.actaSocietaria.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.actaSocietaria.fojaN) }} -
-
- -
- - {{ form_label(form.actaSocietaria.actaSocietaria) }} - {{ form_widget(form.actaSocietaria.actaSocietaria, {'attr': {'class': form_errors(form.actaSocietaria.actaSocietaria) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.actaSocietaria.actaSocietaria) }} -
-
-
- - {{ form_label(form.actaSocietaria.titulares) }} - {{ form_widget(form.actaSocietaria.titulares, {'attr': {'class': form_errors(form.actaSocietaria.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.actaSocietaria.titulares) }} -
-
-
- - {{ form_label(form.actaSocietaria.vencido) }} - {{ form_widget(form.actaSocietaria.vencido, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.actaSocietaria.vencido) }} -
-
-
- - {{ form_label(form.actaSocietaria.verObjSoc) }} - {{ form_widget(form.actaSocietaria.verObjSoc, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.actaSocietaria.verObjSoc) }} -
-
-
- -
DNI
- -
- -
- - {{ form_label(form.dni.dni) }} - {{ form_widget(form.dni.dni, {'attr': {'class': form_errors(form.dni.dni) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.dni.dni) }} -
-
-
- - {{ form_label(form.dni.verDni) }} - {{ form_widget(form.dni.verDni, {'attr': {'class': form_errors(form.dni.verDni) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.dni.verDni) }} -
-
-
- - {{ form_label(form.dni.apoderado) }} - {{ form_widget(form.dni.apoderado, {'attr': {'class': form_errors(form.dni.apoderado) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.dni.apoderado) }} -
-
-
- - {{ form_label(form.dni.verApoderado) }} - {{ form_widget(form.dni.verApoderado, {'attr': {'class': form_errors(form.dni.verApoderado) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.dni.verApoderado) }} -
-
-
- -
AFIP
- -
- -
- - {{ form_label(form.afip.constancia) }} - {{ form_widget(form.afip.constancia, {'attr': {'class': form_errors(form.afip.constancia) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.afip.constancia) }} -
-
-
- - {{ form_label(form.afip.fojaN) }} - {{ form_widget(form.afip.fojaN, {'attr': {'class': form_errors(form.afip.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.afip.fojaN) }} -
-
-
- {{ form_label(form.afip.verFechIni) }} - {{ form_widget(form.afip.verFechIni, {'attr': {'class': form_errors(form.afip.verFechIni) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.afip.verFechIni) }} -
-
-
- {{ form_label(form.afip.verRazonSocial) }} - {{ form_widget(form.afip.verRazonSocial, {'attr': {'class': form_errors(form.afip.verRazonSocial) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.afip.verRazonSocial) }} -
-
-
- {{ form_label(form.afip.verCUIT) }} - {{ form_widget(form.afip.verCUIT, {'attr': {'class': form_errors(form.afip.verCUIT) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.afip.verCUIT) }} -
-
-
- {{ form_label(form.afip.verAct) }} - {{ form_widget(form.afip.verAct, {'attr': {'class': form_errors(form.afip.verAct) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.afip.verAct) }} -
-
-
- -
API
- -
- -
- - {{ form_label(form.api.preImpInmobiliario) }} - {{ form_widget(form.api.preImpInmobiliario, {'attr': {'class': form_errors(form.api.preImpInmobiliario) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.preImpInmobiliario) }} -
-
- -
- - {{ form_label(form.api.fojaN) }} - {{ form_widget(form.api.fojaN, {'attr': {'class': form_errors(form.api.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.fojaN) }} -
-
-
- - {{ form_label(form.api.formPartida) }} - {{ form_widget(form.api.formPartida, {'attr': {'class': form_errors(form.api.formPartida) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.formPartida) }} -
-
-
- - {{ form_label(form.api.verNumPartida) }} - {{ form_widget(form.api.verNumPartida, {'attr': {'class': form_errors(form.api.verNumPartida) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.verNumPartida) }} -
-
-
- - {{ form_label(form.api.verPartidaCatastro) }} - {{ form_widget(form.api.verPartidaCatastro, {'attr': {'class': form_errors(form.api.verPartidaCatastro) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.verPartidaCatastro) }} -
-
-
- - {{ form_label(form.api.verTitularBoleta) }} - {{ form_widget(form.api.verTitularBoleta, {'attr': {'class': form_errors(form.api.verTitularBoleta) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.verTitularBoleta) }} -
-
-
- - {{ form_label(form.api.verIndTitular) }} - {{ form_widget(form.api.verIndTitular, {'attr': {'class': form_errors(form.api.verIndTitular) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.verIndTitular) }} -
-
-
- - {{ form_label(form.api.AcreDocUsoInmueble) }} - {{ form_widget(form.api.AcreDocUsoInmueble, {'attr': {'class': form_errors(form.api.AcreDocUsoInmueble) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.api.AcreDocUsoInmueble) }} -
-
-
- -
USO CONFORME DE SUELO
- -
- -
- - {{ form_label(form.usoConformeDeSuelo.usoConformeSuelo) }} - {{ form_widget(form.usoConformeDeSuelo.usoConformeSuelo, {'attr': {'class': form_errors(form.usoConformeDeSuelo.usoConformeSuelo) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.usoConformeDeSuelo.usoConformeSuelo) }} -
-
-
- - {{ form_label(form.usoConformeDeSuelo.fojaN) }} - {{ form_widget(form.usoConformeDeSuelo.fojaN, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.usoConformeDeSuelo.fojaN) }} -
-
-
- - {{ form_label(form.usoConformeDeSuelo.presentaHabilitacion) }} - {{ form_widget(form.usoConformeDeSuelo.presentaHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.presentaHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.usoConformeDeSuelo.presentaHabilitacion) }} -
-
-
- - {{ form_label(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} - {{ form_widget(form.usoConformeDeSuelo.fechaInicioHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} -
-
-
- - {{ form_label(form.usoConformeDeSuelo.fechaVencimiento) }} - {{ form_widget(form.usoConformeDeSuelo.fechaVencimiento, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaVencimiento) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.usoConformeDeSuelo.fechaVencimiento) }} -
-
-
- - {{ form_label(form.usoConformeDeSuelo.verActividad) }} - {{ form_widget(form.usoConformeDeSuelo.verActividad, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verActividad) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.usoConformeDeSuelo.verActividad) }} -
-
-
- - {{ form_label(form.usoConformeDeSuelo.verLocalizacion) }} - {{ form_widget(form.usoConformeDeSuelo.verLocalizacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verLocalizacion) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.usoConformeDeSuelo.verLocalizacion) }} -
-
-
- {{form_end(form)}} -
-{% endblock %} \ No newline at end of file diff --git a/src/AppBundle/Entity/Checklist.php b/src/AppBundle/Entity/Checklist.php deleted file mode 100644 index 173b978..0000000 --- a/src/AppBundle/Entity/Checklist.php +++ /dev/null @@ -1,229 +0,0 @@ -id; - } - - function getNombre() { - return $this->nombre; - } - - function getIniciador() { - return $this->iniciador; - } - - function getNumeroExpediente() { - return $this->numeroExpediente; - } - - function getEvaluador() { - return $this->evaluador; - } - - function getVersion() { - return $this->version; - } - - function getFechaInicioEvaluacion() { - return $this->fechaInicioEvaluacion; - } - - function getFechaFinEvaluacion() { - return $this->fechaFinEvaluacion; - } - - - - function setId($id) { - $this->id = $id; - } - - function setNombre($nombre) { - $this->nombre = $nombre; - } - - function setIniciador($iniciador) { - $this->iniciador = $iniciador; - } - - function setNumeroExpediente($numeroExpediente) { - $this->numeroExpediente = $numeroExpediente; - } - - function setEvaluador($evaluador) { - $this->evaluador = $evaluador; - } - - function setVersion($version) { - $this->version = $version; - } - - function setFechaInicioEvaluacion($fechaInicioEvaluacion) { - $this->fechaInicioEvaluacion = $fechaInicioEvaluacion; - } - - function setFechaFinEvaluacion($fechaFinEvaluacion) { - $this->fechaFinEvaluacion = $fechaFinEvaluacion; - } - - - - - public function __construct() - { - $this->seccion = new ArrayCollection(); - } - - function getComentarioDeEvaluador() { - return $this->comentarioDeEvaluador; - } - - function setComentarioDeEvaluador($comentarioDeEvaluador) { - $this->comentarioDeEvaluador = $comentarioDeEvaluador; - } - - function getFechaInicioExpediente() { - return $this->fechaInicioExpediente; - } - - function setFechaInicioExpediente($fechaInicioExpediente) { - $this->fechaInicioExpediente = $fechaInicioExpediente; - } - - - - - /** - * Get the value of plantilla - */ - public function getPlantilla() - { - return $this->plantilla; - } - - /** - * Set the value of plantilla - * - * @return self - */ - public function setPlantilla($plantilla) - { - $this->plantilla = $plantilla; - - return $this; - } -} diff --git a/src/AppBundle/Entity/FormularioA/FormularioA.php b/src/AppBundle/Entity/FormularioA/FormularioA.php index 8dddaec..350fb84 100644 --- a/src/AppBundle/Entity/FormularioA/FormularioA.php +++ b/src/AppBundle/Entity/FormularioA/FormularioA.php @@ -1,6 +1,6 @@ usoConformeDeSuelo = $usoConformeDeSuelo; } + function getPlantilla() { + return $this->plantilla; + } + + function setPlantilla($plantilla) { + $this->plantilla = $plantilla; + } + } diff --git a/src/AppBundle/Entity/FormularioB/CategoriaFinal.php b/src/AppBundle/Entity/FormularioB/CategoriaFinal.php index 93420ec..7249e86 100644 --- a/src/AppBundle/Entity/FormularioB/CategoriaFinal.php +++ b/src/AppBundle/Entity/FormularioB/CategoriaFinal.php @@ -7,12 +7,47 @@ */ namespace AppBundle\Entity\FormularioB; +use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** - * Description of CategoriaFinal + * CategoriaFinal * - * @author Admin + * @ORM\Table(name="CategoriaFinal") + * + * @ORM\Entity */ class CategoriaFinal { + /** + * @var int + * + * @ORM\Column(name="id", type="integer") + * @ORM\Id + * @ORM\GeneratedValue(strategy="AUTO") + */ + private $id; + + /** + * + * @var int + */ private $categoriaAsignada; + + function getId() { + return $this->id; + } + + function getCategoriaAsignada() { + return $this->categoriaAsignada; + } + + function setId($id) { + $this->id = $id; + } + + function setCategoriaAsignada($categoriaAsignada) { + $this->categoriaAsignada = $categoriaAsignada; + } + + } diff --git a/src/AppBundle/Entity/FormularioB/Dotacion.php b/src/AppBundle/Entity/FormularioB/Dotacion.php index 6c6b241..38eddec 100644 --- a/src/AppBundle/Entity/FormularioB/Dotacion.php +++ b/src/AppBundle/Entity/FormularioB/Dotacion.php @@ -8,17 +8,77 @@ namespace AppBundle\Entity\FormularioB; +use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** - * Description of Dotacion + * Dotacion * - * @author Admin + * @ORM\Table(name="Dotacion") + * + * @ORM\Entity */ class Dotacion { + /** + * @var int + * + * @ORM\Column(name="id", type="integer") + * @ORM\Id + * @ORM\GeneratedValue(strategy="AUTO") + */ + private $id; + + /** + * + * @var string + */ private $dotacionDePersonal; + + /** + * + * @var string + */ private $potenciaInstalada; - private $superficieCubierta; + /** + * + * @var string + */ + private $superficieCubierta; + + function getId() { + return $this->id; + } + + function getDotacionDePersonal() { + return $this->dotacionDePersonal; + } + + function getPotenciaInstalada() { + return $this->potenciaInstalada; + } + + function getSuperficieCubierta() { + return $this->superficieCubierta; + } + + function setId($id) { + $this->id = $id; + } + + function setDotacionDePersonal($dotacionDePersonal) { + $this->dotacionDePersonal = $dotacionDePersonal; + } + + function setPotenciaInstalada($potenciaInstalada) { + $this->potenciaInstalada = $potenciaInstalada; + } + + function setSuperficieCubierta($superficieCubierta) { + $this->superficieCubierta = $superficieCubierta; + } + + } diff --git a/src/AppBundle/Entity/FormularioB/EmisionDeResiduos.php b/src/AppBundle/Entity/FormularioB/EmisionDeResiduos.php index ed37e9e..db43e1c 100644 --- a/src/AppBundle/Entity/FormularioB/EmisionDeResiduos.php +++ b/src/AppBundle/Entity/FormularioB/EmisionDeResiduos.php @@ -8,51 +8,139 @@ namespace AppBundle\Entity\FormularioB; +use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** - * Description of EmisionDeResiduos + * EmisionDeResiduos * - * @author Admin + * @ORM\Table(name="EmisionDeResiduos") + * + * @ORM\Entity */ class EmisionDeResiduos { + /** + * @var int + * + * @ORM\Column(name="id", type="integer") + * @ORM\Id + * @ORM\GeneratedValue(strategy="AUTO") + */ + private $id; + /** + * + * @var bool + */ private $residuosSolidosSemisolidos; + /** + * + * @var bool + */ private $rsu; + /** + * + * @var bool + */ private $rnp; + /** + * + * @var string + */ private $tipoDeResiduo; + /** + * + * @var bool + */ private $rp; + /** + * + * @var string + */ private $definirCorrientesDeRP; + /** + * + * @var double + */ private $valorResiduo; + /** + * + * @var bool + */ private $efluentesYResiduosLiquidos; + /** + * + * @var bool + */ private $aguaATemperaturaAmbiente; + /** + * + * @var bool + */ private $efluentesSinRP; + /** + * + * @var bool + */ private $efluentesConRP; + /** + * + * @var double + */ private $valorEfluente; + /** + * + * @var bool + */ private $emisionesGaseosas; + /** + * + * @var bool + */ private $componentesNaturalesDelAire; + /** + * + * @var bool + */ private $combustionDeCombustiblesLiquidos; + /** + * + * @var bool + */ private $noContempladosBool; + /** + * + * @var string + */ private $noContempledosListado; + /** + * + * @var double + */ private $valorEmisiones; //Getters and setters + function getId() { + return $this->id; + } + function getResiduosSolidosSemisolidos() { return $this->residuosSolidosSemisolidos; } @@ -125,6 +213,10 @@ function getValorEmisiones() { return $this->valorEmisiones; } + function setId($id) { + $this->id = $id; + } + function setResiduosSolidosSemisolidos($residuosSolidosSemisolidos) { $this->residuosSolidosSemisolidos = $residuosSolidosSemisolidos; } @@ -197,5 +289,5 @@ function setValorEmisiones($valorEmisiones) { $this->valorEmisiones = $valorEmisiones; } - + } diff --git a/src/AppBundle/Entity/FormularioB/FormularioB.php b/src/AppBundle/Entity/FormularioB/FormularioB.php index 9a37a6e..bc688e3 100644 --- a/src/AppBundle/Entity/FormularioB/FormularioB.php +++ b/src/AppBundle/Entity/FormularioB/FormularioB.php @@ -3,13 +3,13 @@ namespace AppBundle\Entity\FormularioB; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Validator\Constraints as Assert; /** * FormularioB * - * @ORM\Table(name="formularioB") - * @ORM\Entity(repositoryClass="AppBundle\Repository\FormularioBRepository") + * @ORM\Table(name="FormularioB") + * + * @ORM\Entity */ class FormularioB { @@ -22,28 +22,127 @@ class FormularioB */ private $id; - + /** + * + * @ORM\Column(name="estadoSoporteDigital", type="string") + */ private $estadoSoporteDigital; + /** + * + * @ORM\Column(name="codigoExcel", type="string") + */ private $ingresarCodigoExcel; /** - * - * @ORM\OneToOne(targetEntity="AppBundle\Entity\FormularioB\EmisionDeResiduos", mappedBy="formularioB") + * @ORM\OneToOne(targetEntity="EmisionDeResiduos", cascade={"persist"}) + * @ORM\JoinColumn(name="emisionDeResiduos_id",referencedColumnName="id") */ private $emisionDeResiduos; - + /** + * @ORM\OneToOne(targetEntity="Riesgos", cascade={"persist"}) + * @ORM\JoinColumn(name="riesgos_id",referencedColumnName="id") + */ private $riesgos; - + /** + * @ORM\OneToOne(targetEntity="Dotacion", cascade={"persist"}) + * @ORM\JoinColumn(name="dotacion_id",referencedColumnName="id") + */ private $dotacion; - + /** + * @ORM\OneToOne(targetEntity="Localizacion", cascade={"persist"}) + * @ORM\JoinColumn(name="localizacion_id",referencedColumnName="id") + */ private $localización; - + /** + * @ORM\OneToOne(targetEntity="CategoriaFinal", cascade={"persist"}) + * @ORM\JoinColumn(name="categoriaFinal_id",referencedColumnName="id") + */ private $categoriaFinal; + /** + * + * @ORM\OneToOne(targetEntity="AppBundle\Entity\Plantilla", cascade={"persist"}, inversedBy="formularioB") + */ + private $plantilla; + + + function getId() { + return $this->id; + } + + function getEstadoSoporteDigital() { + return $this->estadoSoporteDigital; + } + + function getIngresarCodigoExcel() { + return $this->ingresarCodigoExcel; + } + + function getEmisionDeResiduos() { + return $this->emisionDeResiduos; + } + + function getRiesgos() { + return $this->riesgos; + } + + function getDotacion() { + return $this->dotacion; + } + + function getLocalización() { + return $this->localización; + } + + function getCategoriaFinal() { + return $this->categoriaFinal; + } + + function getPlantilla() { + return $this->plantilla; + } + + function setId($id) { + $this->id = $id; + } + + function setEstadoSoporteDigital($estadoSoporteDigital) { + $this->estadoSoporteDigital = $estadoSoporteDigital; + } + + function setIngresarCodigoExcel($ingresarCodigoExcel) { + $this->ingresarCodigoExcel = $ingresarCodigoExcel; + } + + function setEmisionDeResiduos($emisionDeResiduos) { + $this->emisionDeResiduos = $emisionDeResiduos; + } + + function setRiesgos($riesgos) { + $this->riesgos = $riesgos; + } + + function setDotacion($dotacion) { + $this->dotacion = $dotacion; + } + + function setLocalización($localización) { + $this->localización = $localización; + } + + function setCategoriaFinal($categoriaFinal) { + $this->categoriaFinal = $categoriaFinal; + } + + function setPlantilla($plantilla) { + $this->plantilla = $plantilla; + } + + } diff --git a/src/AppBundle/Entity/FormularioB/Localizacion.php b/src/AppBundle/Entity/FormularioB/Localizacion.php index 4168429..48cd059 100644 --- a/src/AppBundle/Entity/FormularioB/Localizacion.php +++ b/src/AppBundle/Entity/FormularioB/Localizacion.php @@ -8,24 +8,104 @@ namespace AppBundle\Entity\FormularioB; +use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** - * Description of Localizacion + * Localizacion * - * @author Admin + * @ORM\Table(name="Localizacion") + * + * @ORM\Entity */ class Localizacion { + /** + * @var int + * + * @ORM\Column(name="id", type="integer") + * @ORM\Id + * @ORM\GeneratedValue(strategy="AUTO") + */ + private $id; + /** + * + * @var string + */ private $zonificacion; + /** + * + * @var bool + */ private $aguaDeRed; + /** + * + * @var bool + */ private $redCloacal; + /** + * + * @var bool + */ private $energiaElectrica; + /** + * + * @var bool + */ private $gas; + function getId() { + return $this->id; + } + + function getZonificacion() { + return $this->zonificacion; + } + + function getAguaDeRed() { + return $this->aguaDeRed; + } + + function getRedCloacal() { + return $this->redCloacal; + } + + function getEnergiaElectrica() { + return $this->energiaElectrica; + } + + function getGas() { + return $this->gas; + } + + function setId($id) { + $this->id = $id; + } + + function setZonificacion($zonificacion) { + $this->zonificacion = $zonificacion; + } + + function setAguaDeRed($aguaDeRed) { + $this->aguaDeRed = $aguaDeRed; + } + + function setRedCloacal($redCloacal) { + $this->redCloacal = $redCloacal; + } + + function setEnergiaElectrica($energiaElectrica) { + $this->energiaElectrica = $energiaElectrica; + } + + function setGas($gas) { + $this->gas = $gas; + } + } diff --git a/src/AppBundle/Entity/FormularioB/Riesgos.php b/src/AppBundle/Entity/FormularioB/Riesgos.php index a894fd3..4e50369 100644 --- a/src/AppBundle/Entity/FormularioB/Riesgos.php +++ b/src/AppBundle/Entity/FormularioB/Riesgos.php @@ -7,12 +7,13 @@ */ namespace AppBundle\Entity\FormularioB; - +use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** * Riesgos * * @ORM\Table(name="riesgos") - * @ORM\Entity(repositoryClass="AppBundle\Repository\FormularioB\RiesgosRepository") + * @ORM\Entity */ class Riesgos { /** @@ -24,22 +25,126 @@ class Riesgos { */ private $id; + /** + * + * @var bool + */ private $riesgosPresuntos; + /** + * + * @var bool + */ private $acustico; + /** + * + * @var bool + */ private $aparatosSometidosAPresion; + /** + * + * @var bool + */ private $sustanciasQuimicas; + /** + * + * @var bool + */ private $explosion; + /** + * + * @var bool + */ private $incendio; + /** + * + * @var bool + */ private $otrosBool; + /** + * + * @var string + */ private $otrosListado; - + function getId() { + return $this->id; + } + + function getRiesgosPresuntos() { + return $this->riesgosPresuntos; + } + + function getAcustico() { + return $this->acustico; + } + + function getAparatosSometidosAPresion() { + return $this->aparatosSometidosAPresion; + } + + function getSustanciasQuimicas() { + return $this->sustanciasQuimicas; + } + + function getExplosion() { + return $this->explosion; + } + + function getIncendio() { + return $this->incendio; + } + + function getOtrosBool() { + return $this->otrosBool; + } + + function getOtrosListado() { + return $this->otrosListado; + } + + function setId($id) { + $this->id = $id; + } + + function setRiesgosPresuntos($riesgosPresuntos) { + $this->riesgosPresuntos = $riesgosPresuntos; + } + + function setAcustico($acustico) { + $this->acustico = $acustico; + } + + function setAparatosSometidosAPresion($aparatosSometidosAPresion) { + $this->aparatosSometidosAPresion = $aparatosSometidosAPresion; + } + + function setSustanciasQuimicas($sustanciasQuimicas) { + $this->sustanciasQuimicas = $sustanciasQuimicas; + } + + function setExplosion($explosion) { + $this->explosion = $explosion; + } + + function setIncendio($incendio) { + $this->incendio = $incendio; + } + + function setOtrosBool($otrosBool) { + $this->otrosBool = $otrosBool; + } + + function setOtrosListado($otrosListado) { + $this->otrosListado = $otrosListado; + } + + } diff --git a/src/AppBundle/Entity/Plantilla.php b/src/AppBundle/Entity/Plantilla.php index 6ef2951..774569c 100644 --- a/src/AppBundle/Entity/Plantilla.php +++ b/src/AppBundle/Entity/Plantilla.php @@ -33,20 +33,14 @@ class Plantilla */ private $nombre; - /** - * @ORM\OneToMany(targetEntity="AppBundle\Entity\Checklist", mappedBy="plantilla") - */ - private $checklists; /** - * - * @var type FormularioA + * @ORM\OneToOne(targetEntity="AppBundle\Entity\FormularioA\FormularioA", cascade={"persist"}, mappedBy="plantilla") */ private $formularioA; /** - * - * @var type FormularioB + * @ORM\OneToOne(targetEntity="AppBundle\Entity\FormularioB\FormularioB", cascade={"persist"}, mappedBy="plantilla") */ private $formularioB; @@ -60,18 +54,6 @@ function getNombre() { return $this->nombre; } - function getChecklists() { - return $this->checklists; - } - - function getFormularioA(): type { - return $this->formularioA; - } - - function getFormularioB(): type { - return $this->formularioB; - } - function setId($id) { $this->id = $id; } @@ -80,15 +62,19 @@ function setNombre($nombre) { $this->nombre = $nombre; } - function setChecklists($checklists) { - $this->checklists = $checklists; + function getFormularioA() { + return $this->formularioA; + } + + function getFormularioB() { + return $this->formularioB; } - function setFormularioA(type $formularioA) { + function setFormularioA($formularioA) { $this->formularioA = $formularioA; } - function setFormularioB(type $formularioB) { + function setFormularioB($formularioB) { $this->formularioB = $formularioB; } diff --git a/src/AppBundle/Entity/Resumen.php b/src/AppBundle/Entity/Resumen.php index 92c36c8..a36978e 100644 --- a/src/AppBundle/Entity/Resumen.php +++ b/src/AppBundle/Entity/Resumen.php @@ -31,12 +31,7 @@ class Resumen private $categorizacion; - /** - * - * @ORM\OneToOne(targetEntity="AppBundle\Entity\Checklist", inversedBy="resumen") - * @ORM\JoinColumn(name="checklist_id", referencedColumnName="id") - */ - private $checklist; + /** diff --git a/src/AppBundle/Form/FormularioA/FormularioAType.php b/src/AppBundle/Form/FormularioA/FormularioAType.php index 6e474e9..ae85732 100644 --- a/src/AppBundle/Form/FormularioA/FormularioAType.php +++ b/src/AppBundle/Form/FormularioA/FormularioAType.php @@ -1,5 +1,5 @@ Date: Mon, 7 Oct 2019 12:19:43 -0300 Subject: [PATCH 09/23] formularios A y B funcionando, B falta renderizar correctamente --- app/Resources/views/plantilla/new.html.twig | 270 +++++++++--------- src/AppBundle/Entity/FormularioA/AFIP.php | 1 + src/AppBundle/Entity/FormularioA/API.php | 2 + .../Entity/FormularioA/ActaSocietaria.php | 1 + src/AppBundle/Entity/FormularioA/Dni.php | 42 +++ .../Entity/FormularioA/DomicilioLegal.php | 10 + .../Entity/FormularioA/FormularioA.php | 14 +- .../Entity/FormularioA/UsoConformeSuelo.php | 70 ++++- .../Form/FormularioA/FormularioAType.php | 4 +- ...SueloType.php => UsoConformeSueloType.php} | 8 +- .../Form/FormularioB/CategoriaFinalType.php | 29 ++ .../FormularioB/EmisionDeResiduosType.php | 1 + .../Form/FormularioB/FormularioBType.php | 4 +- ...ory.php => UsoConformeSueloRepository.php} | 4 +- 14 files changed, 307 insertions(+), 153 deletions(-) rename src/AppBundle/Form/FormularioA/{UsoConformeDeSueloType.php => UsoConformeSueloType.php} (91%) create mode 100644 src/AppBundle/Form/FormularioB/CategoriaFinalType.php rename src/AppBundle/Repository/FormularioA/{UsoConformeDeSueloRepository.php => UsoConformeSueloRepository.php} (60%) diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index b461b47..55b95de 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -233,58 +233,58 @@
- {{ form_label(form.domicilioLegal.calle) }} - {{ form_widget(form.domicilioLegal.calle, {'attr': {'class': form_errors(form.domicilioLegal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioLegal.calle) }} + {{ form_widget(form.formularioA.domicilioLegal.calle, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.calle) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioLegal.calle) }} + {{ form_errors(form.formularioA.domicilioLegal.calle) }}
- {{ form_label(form.domicilioLegal.provincia) }} - {{ form_widget(form.domicilioLegal.provincia, {'attr': {'class': form_errors(form.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioLegal.provincia) }} + {{ form_widget(form.formularioA.domicilioLegal.provincia, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioLegal.provincia) }} + {{ form_errors(form.formularioA.domicilioLegal.provincia) }}
- {{ form_label(form.domicilioLegal.departamento) }} - {{ form_widget(form.domicilioLegal.departamento, {'attr': {'class': form_errors(form.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioLegal.departamento) }} + {{ form_widget(form.formularioA.domicilioLegal.departamento, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioLegal.departamento) }} + {{ form_errors(form.formularioA.domicilioLegal.departamento) }}
- {{ form_label(form.domicilioLegal.localidad) }} - {{ form_widget(form.domicilioLegal.localidad, {'attr': {'class': form_errors(form.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioLegal.localidad) }} + {{ form_widget(form.formularioA.domicilioLegal.localidad, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioLegal.localidad) }} + {{ form_errors(form.formularioA.domicilioLegal.localidad) }}
- {{ form_label(form.domicilioLegal.cp) }} - {{ form_widget(form.domicilioLegal.cp, {'attr': {'class': form_errors(form.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioLegal.cp) }} + {{ form_widget(form.formularioA.domicilioLegal.cp, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioLegal.cp) }} + {{ form_errors(form.formularioA.domicilioLegal.cp) }}
- {{ form_label(form.domicilioLegal.email) }} - {{ form_widget(form.domicilioLegal.email, {'attr': {'class': form_errors(form.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioLegal.email) }} + {{ form_widget(form.formularioA.domicilioLegal.email, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioLegal.email) }} + {{ form_errors(form.formularioA.domicilioLegal.email) }}
- {{ form_label(form.domicilioLegal.acepEmail) }} - {{ form_widget(form.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioLegal.acepEmail) }} + {{ form_widget(form.formularioA.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioLegal.acepEmail) }} + {{ form_errors(form.formularioA.domicilioLegal.acepEmail) }}
@@ -295,18 +295,18 @@
- {{ form_label(form.domicilioReal.calle) }} - {{ form_widget(form.domicilioReal.calle, {'attr': {'class': form_errors(form.domicilioReal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioReal.calle) }} + {{ form_widget(form.formularioA.domicilioReal.calle, {'attr': {'class': form_errors(form.formularioA.domicilioReal.calle) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioReal.calle) }} + {{ form_errors(form.formularioA.domicilioReal.calle) }}
- {{ form_label(form.domicilioReal.localidad) }} - {{ form_widget(form.domicilioReal.localidad, {'attr': {'class': form_errors(form.domicilioReal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.domicilioReal.localidad) }} + {{ form_widget(form.formularioA.domicilioReal.localidad, {'attr': {'class': form_errors(form.formularioA.domicilioReal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.domicilioReal.localidad) }} + {{ form_errors(form.formularioA.domicilioReal.localidad) }}
@@ -317,52 +317,52 @@
- {{ form_label(form.contratoSocial.fojaN) }} - {{ form_widget(form.contratoSocial.fojaN, {'attr': {'class': form_errors(form.contratoSocial.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.contratoSocial.fojaN) }} + {{ form_widget(form.formularioA.contratoSocial.fojaN, {'attr': {'class': form_errors(form.formularioA.contratoSocial.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.contratoSocial.fojaN) }} + {{ form_errors(form.formularioA.contratoSocial.fojaN) }}
- {{ form_label(form.contratoSocial.poseeContrato) }} - {{ form_widget(form.contratoSocial.poseeContrato, {'attr': {'class': form_errors(form.contratoSocial.poseeContrato) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.contratoSocial.poseeContrato) }} + {{ form_widget(form.formularioA.contratoSocial.poseeContrato, {'attr': {'class': form_errors(form.formularioA.contratoSocial.poseeContrato) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.contratoSocial.poseeContrato) }} + {{ form_errors(form.formularioA.contratoSocial.poseeContrato) }}
- {{ form_label(form.contratoSocial.unipersonal) }} - {{ form_widget(form.contratoSocial.unipersonal, {'attr': {'class': form_errors(form.contratoSocial.unipersonal) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.contratoSocial.unipersonal) }} + {{ form_widget(form.formularioA.contratoSocial.unipersonal, {'attr': {'class': form_errors(form.formularioA.contratoSocial.unipersonal) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.contratoSocial.unipersonal) }} + {{ form_errors(form.formularioA.contratoSocial.unipersonal) }}
- {{ form_label(form.contratoSocial.titulares) }} - {{ form_widget(form.contratoSocial.titulares, {'attr': {'class': form_errors(form.contratoSocial.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.contratoSocial.titulares) }} + {{ form_widget(form.formularioA.contratoSocial.titulares, {'attr': {'class': form_errors(form.formularioA.contratoSocial.titulares) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.contratoSocial.titulares) }} + {{ form_errors(form.formularioA.contratoSocial.titulares) }}
- {{ form_label(form.contratoSocial.vencido) }} - {{ form_widget(form.contratoSocial.vencido, {'attr': {'class': form_errors(form.contratoSocial.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.contratoSocial.vencido) }} + {{ form_widget(form.formularioA.contratoSocial.vencido, {'attr': {'class': form_errors(form.formularioA.contratoSocial.vencido) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.contratoSocial.vencido) }} + {{ form_errors(form.formularioA.contratoSocial.vencido) }}
- {{ form_label(form.contratoSocial.verObjSoc) }} - {{ form_widget(form.contratoSocial.verObjSoc, {'attr': {'class': form_errors(form.contratoSocial.verObjSoc) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.contratoSocial.verObjSoc) }} + {{ form_widget(form.formularioA.contratoSocial.verObjSoc, {'attr': {'class': form_errors(form.formularioA.contratoSocial.verObjSoc) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.contratoSocial.verObjSoc) }} + {{ form_errors(form.formularioA.contratoSocial.verObjSoc) }}
@@ -373,43 +373,43 @@
- {{ form_label(form.actaSocietaria.fojaN) }} - {{ form_widget(form.actaSocietaria.fojaN, {'attr': {'class': form_errors(form.actaSocietaria.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.actaSocietaria.fojaN) }} + {{ form_widget(form.formularioA.actaSocietaria.fojaN, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.actaSocietaria.fojaN) }} + {{ form_errors(form.formularioA.actaSocietaria.fojaN) }}
- {{ form_label(form.actaSocietaria.actaSocietaria) }} - {{ form_widget(form.actaSocietaria.actaSocietaria, {'attr': {'class': form_errors(form.actaSocietaria.actaSocietaria) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.actaSocietaria.actaSocietaria) }} + {{ form_widget(form.formularioA.actaSocietaria.actaSocietaria, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.actaSocietaria) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.actaSocietaria.actaSocietaria) }} + {{ form_errors(form.formularioA.actaSocietaria.actaSocietaria) }}
- {{ form_label(form.actaSocietaria.titulares) }} - {{ form_widget(form.actaSocietaria.titulares, {'attr': {'class': form_errors(form.actaSocietaria.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.actaSocietaria.titulares) }} + {{ form_widget(form.formularioA.actaSocietaria.titulares, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.titulares) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.actaSocietaria.titulares) }} + {{ form_errors(form.formularioA.actaSocietaria.titulares) }}
- {{ form_label(form.actaSocietaria.vencido) }} - {{ form_widget(form.actaSocietaria.vencido, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.actaSocietaria.vencido) }} + {{ form_widget(form.formularioA.actaSocietaria.vencido, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.actaSocietaria.vencido) }} + {{ form_errors(form.formularioA.actaSocietaria.vencido) }}
- {{ form_label(form.actaSocietaria.verObjSoc) }} - {{ form_widget(form.actaSocietaria.verObjSoc, {'attr': {'class': form_errors(form.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.actaSocietaria.verObjSoc) }} + {{ form_widget(form.formularioA.actaSocietaria.verObjSoc, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.actaSocietaria.verObjSoc) }} + {{ form_errors(form.formularioA.actaSocietaria.verObjSoc) }}
@@ -420,34 +420,34 @@
- {{ form_label(form.dni.dni) }} - {{ form_widget(form.dni.dni, {'attr': {'class': form_errors(form.dni.dni) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.dni.dni) }} + {{ form_widget(form.formularioA.dni.dni, {'attr': {'class': form_errors(form.formularioA.dni.dni) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.dni.dni) }} + {{ form_errors(form.formularioA.dni.dni) }}
- {{ form_label(form.dni.verDni) }} - {{ form_widget(form.dni.verDni, {'attr': {'class': form_errors(form.dni.verDni) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.dni.verDni) }} + {{ form_widget(form.formularioA.dni.verDni, {'attr': {'class': form_errors(form.formularioA.dni.verDni) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.dni.verDni) }} + {{ form_errors(form.formularioA.dni.verDni) }}
- {{ form_label(form.dni.apoderado) }} - {{ form_widget(form.dni.apoderado, {'attr': {'class': form_errors(form.dni.apoderado) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.dni.apoderado) }} + {{ form_widget(form.formularioA.dni.apoderado, {'attr': {'class': form_errors(form.formularioA.dni.apoderado) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.dni.apoderado) }} + {{ form_errors(form.formularioA.dni.apoderado) }}
- {{ form_label(form.dni.verApoderado) }} - {{ form_widget(form.dni.verApoderado, {'attr': {'class': form_errors(form.dni.verApoderado) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.dni.verApoderado) }} + {{ form_widget(form.formularioA.dni.verApoderado, {'attr': {'class': form_errors(form.formularioA.dni.verApoderado) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.dni.verApoderado) }} + {{ form_errors(form.formularioA.dni.verApoderado) }}
@@ -458,46 +458,46 @@
- {{ form_label(form.afip.constancia) }} - {{ form_widget(form.afip.constancia, {'attr': {'class': form_errors(form.afip.constancia) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.afip.constancia) }} + {{ form_widget(form.formularioA.afip.constancia, {'attr': {'class': form_errors(form.formularioA.afip.constancia) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.afip.constancia) }} + {{ form_errors(form.formularioA.afip.constancia) }}
- {{ form_label(form.afip.fojaN) }} - {{ form_widget(form.afip.fojaN, {'attr': {'class': form_errors(form.afip.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.afip.fojaN) }} + {{ form_widget(form.formularioA.afip.fojaN, {'attr': {'class': form_errors(form.formularioA.afip.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.afip.fojaN) }} + {{ form_errors(form.formularioA.afip.fojaN) }}
- {{ form_label(form.afip.verFechIni) }} - {{ form_widget(form.afip.verFechIni, {'attr': {'class': form_errors(form.afip.verFechIni) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.afip.verFechIni) }} + {{ form_widget(form.formularioA.afip.verFechIni, {'attr': {'class': form_errors(form.formularioA.afip.verFechIni) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.afip.verFechIni) }} + {{ form_errors(form.formularioA.afip.verFechIni) }}
- {{ form_label(form.afip.verRazonSocial) }} - {{ form_widget(form.afip.verRazonSocial, {'attr': {'class': form_errors(form.afip.verRazonSocial) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.afip.verRazonSocial) }} + {{ form_widget(form.formularioA.afip.verRazonSocial, {'attr': {'class': form_errors(form.formularioA.afip.verRazonSocial) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.afip.verRazonSocial) }} + {{ form_errors(form.formularioA.afip.verRazonSocial) }}
- {{ form_label(form.afip.verCUIT) }} - {{ form_widget(form.afip.verCUIT, {'attr': {'class': form_errors(form.afip.verCUIT) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.afip.verCUIT) }} + {{ form_widget(form.formularioA.afip.verCUIT, {'attr': {'class': form_errors(form.formularioA.afip.verCUIT) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.afip.verCUIT) }} + {{ form_errors(form.formularioA.afip.verCUIT) }}
- {{ form_label(form.afip.verAct) }} - {{ form_widget(form.afip.verAct, {'attr': {'class': form_errors(form.afip.verAct) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.afip.verAct) }} + {{ form_widget(form.formularioA.afip.verAct, {'attr': {'class': form_errors(form.formularioA.afip.verAct) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.afip.verAct) }} + {{ form_errors(form.formularioA.afip.verAct) }}
@@ -508,67 +508,67 @@
- {{ form_label(form.api.preImpInmobiliario) }} - {{ form_widget(form.api.preImpInmobiliario, {'attr': {'class': form_errors(form.api.preImpInmobiliario) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.preImpInmobiliario) }} + {{ form_widget(form.formularioA.api.preImpInmobiliario, {'attr': {'class': form_errors(form.formularioA.api.preImpInmobiliario) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.preImpInmobiliario) }} + {{ form_errors(form.formularioA.api.preImpInmobiliario) }}
- {{ form_label(form.api.fojaN) }} - {{ form_widget(form.api.fojaN, {'attr': {'class': form_errors(form.api.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.fojaN) }} + {{ form_widget(form.formularioA.api.fojaN, {'attr': {'class': form_errors(form.formularioA.api.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.fojaN) }} + {{ form_errors(form.formularioA.api.fojaN) }}
- {{ form_label(form.api.formPartida) }} - {{ form_widget(form.api.formPartida, {'attr': {'class': form_errors(form.api.formPartida) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.formPartida) }} + {{ form_widget(form.formularioA.api.formPartida, {'attr': {'class': form_errors(form.formularioA.api.formPartida) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.formPartida) }} + {{ form_errors(form.formularioA.api.formPartida) }}
- {{ form_label(form.api.verNumPartida) }} - {{ form_widget(form.api.verNumPartida, {'attr': {'class': form_errors(form.api.verNumPartida) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.verNumPartida) }} + {{ form_widget(form.formularioA.api.verNumPartida, {'attr': {'class': form_errors(form.formularioA.api.verNumPartida) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.verNumPartida) }} + {{ form_errors(form.formularioA.api.verNumPartida) }}
- {{ form_label(form.api.verPartidaCatastro) }} - {{ form_widget(form.api.verPartidaCatastro, {'attr': {'class': form_errors(form.api.verPartidaCatastro) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.verPartidaCatastro) }} + {{ form_widget(form.formularioA.api.verPartidaCatastro, {'attr': {'class': form_errors(form.formularioA.api.verPartidaCatastro) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.verPartidaCatastro) }} + {{ form_errors(form.formularioA.api.verPartidaCatastro) }}
- {{ form_label(form.api.verTitularBoleta) }} - {{ form_widget(form.api.verTitularBoleta, {'attr': {'class': form_errors(form.api.verTitularBoleta) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.verTitularBoleta) }} + {{ form_widget(form.formularioA.api.verTitularBoleta, {'attr': {'class': form_errors(form.formularioA.api.verTitularBoleta) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.verTitularBoleta) }} + {{ form_errors(form.formularioA.api.verTitularBoleta) }}
- {{ form_label(form.api.verIndTitular) }} - {{ form_widget(form.api.verIndTitular, {'attr': {'class': form_errors(form.api.verIndTitular) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.verIndTitular) }} + {{ form_widget(form.formularioA.api.verIndTitular, {'attr': {'class': form_errors(form.formularioA.api.verIndTitular) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.verIndTitular) }} + {{ form_errors(form.formularioA.api.verIndTitular) }}
- {{ form_label(form.api.AcreDocUsoInmueble) }} - {{ form_widget(form.api.AcreDocUsoInmueble, {'attr': {'class': form_errors(form.api.AcreDocUsoInmueble) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.api.AcreDocUsoInmueble) }} + {{ form_widget(form.formularioA.api.AcreDocUsoInmueble, {'attr': {'class': form_errors(form.formularioA.api.AcreDocUsoInmueble) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.api.AcreDocUsoInmueble) }} + {{ form_errors(form.formularioA.api.AcreDocUsoInmueble) }}
@@ -579,58 +579,58 @@
- {{ form_label(form.usoConformeDeSuelo.usoConformeSuelo) }} - {{ form_widget(form.usoConformeDeSuelo.usoConformeSuelo, {'attr': {'class': form_errors(form.usoConformeDeSuelo.usoConformeSuelo) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.usoConformeSuelo.usoConformeSuelo2) }} + {{ form_widget(form.formularioA.usoConformeSuelo.usoConformeSuelo2, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.usoConformeSuelo2) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.usoConformeDeSuelo.usoConformeSuelo) }} + {{ form_errors(form.formularioA.usoConformeSuelo.usoConformeSuelo2) }}
- {{ form_label(form.usoConformeDeSuelo.fojaN) }} - {{ form_widget(form.usoConformeDeSuelo.fojaN, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.usoConformeSuelo.fojaN) }} + {{ form_widget(form.formularioA.usoConformeSuelo.fojaN, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.usoConformeDeSuelo.fojaN) }} + {{ form_errors(form.formularioA.usoConformeSuelo.fojaN) }}
- {{ form_label(form.usoConformeDeSuelo.presentaHabilitacion) }} - {{ form_widget(form.usoConformeDeSuelo.presentaHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.presentaHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.usoConformeSuelo.presentaHabilitacion) }} + {{ form_widget(form.formularioA.usoConformeSuelo.presentaHabilitacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.presentaHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.usoConformeDeSuelo.presentaHabilitacion) }} + {{ form_errors(form.formularioA.usoConformeSuelo.presentaHabilitacion) }}
- {{ form_label(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} - {{ form_widget(form.usoConformeDeSuelo.fechaInicioHabilitacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) }} + {{ form_widget(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.usoConformeDeSuelo.fechaInicioHabilitacion) }} + {{ form_errors(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) }}
- {{ form_label(form.usoConformeDeSuelo.fechaVencimiento) }} - {{ form_widget(form.usoConformeDeSuelo.fechaVencimiento, {'attr': {'class': form_errors(form.usoConformeDeSuelo.fechaVencimiento) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.usoConformeSuelo.fechaVencimiento) }} + {{ form_widget(form.formularioA.usoConformeSuelo.fechaVencimiento, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fechaVencimiento) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.usoConformeDeSuelo.fechaVencimiento) }} + {{ form_errors(form.formularioA.usoConformeSuelo.fechaVencimiento) }}
- {{ form_label(form.usoConformeDeSuelo.verActividad) }} - {{ form_widget(form.usoConformeDeSuelo.verActividad, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verActividad) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.usoConformeSuelo.verActividad) }} + {{ form_widget(form.formularioA.usoConformeSuelo.verActividad, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.verActividad) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.usoConformeDeSuelo.verActividad) }} + {{ form_errors(form.formularioA.usoConformeSuelo.verActividad) }}
- {{ form_label(form.usoConformeDeSuelo.verLocalizacion) }} - {{ form_widget(form.usoConformeDeSuelo.verLocalizacion, {'attr': {'class': form_errors(form.usoConformeDeSuelo.verLocalizacion) ? 'form-control is-invalid' : 'form-control'}}) }} + {{ form_label(form.formularioA.usoConformeSuelo.verLocalizacion) }} + {{ form_widget(form.formularioA.usoConformeSuelo.verLocalizacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.verLocalizacion) ? 'form-control is-invalid' : 'form-control'}}) }}
- {{ form_errors(form.usoConformeDeSuelo.verLocalizacion) }} + {{ form_errors(form.formularioA.usoConformeSuelo.verLocalizacion) }}
diff --git a/src/AppBundle/Entity/FormularioA/AFIP.php b/src/AppBundle/Entity/FormularioA/AFIP.php index cb5a559..4810ea7 100644 --- a/src/AppBundle/Entity/FormularioA/AFIP.php +++ b/src/AppBundle/Entity/FormularioA/AFIP.php @@ -222,4 +222,5 @@ public function setVerAct(bool $verAct) return $this; } + } diff --git a/src/AppBundle/Entity/FormularioA/API.php b/src/AppBundle/Entity/FormularioA/API.php index db0cddf..5fe8a5c 100644 --- a/src/AppBundle/Entity/FormularioA/API.php +++ b/src/AppBundle/Entity/FormularioA/API.php @@ -283,4 +283,6 @@ public function setPreImpInmobiliario(bool $preImpInmobiliario) return $this; } + + } diff --git a/src/AppBundle/Entity/FormularioA/ActaSocietaria.php b/src/AppBundle/Entity/FormularioA/ActaSocietaria.php index c095a12..8511427 100644 --- a/src/AppBundle/Entity/FormularioA/ActaSocietaria.php +++ b/src/AppBundle/Entity/FormularioA/ActaSocietaria.php @@ -195,4 +195,5 @@ public function setActaSocietaria(bool $actaSocietaria) return $this; } + } diff --git a/src/AppBundle/Entity/FormularioA/Dni.php b/src/AppBundle/Entity/FormularioA/Dni.php index d4a9330..6d0c5fe 100644 --- a/src/AppBundle/Entity/FormularioA/Dni.php +++ b/src/AppBundle/Entity/FormularioA/Dni.php @@ -44,5 +44,47 @@ class Dni { * @var bool */ private $verApoderado; + + + function getId() { + return $this->id; + } + + function getDni() { + return $this->dni; + } + + function getVerDni() { + return $this->verDni; + } + + function getApoderado() { + return $this->apoderado; + } + + function getVerApoderado() { + return $this->verApoderado; + } + + function setId($id) { + $this->id = $id; + } + + function setDni($dni) { + $this->dni = $dni; + } + + function setVerDni($verDni) { + $this->verDni = $verDni; + } + + function setApoderado($apoderado) { + $this->apoderado = $apoderado; + } + + function setVerApoderado($verApoderado) { + $this->verApoderado = $verApoderado; + } + } diff --git a/src/AppBundle/Entity/FormularioA/DomicilioLegal.php b/src/AppBundle/Entity/FormularioA/DomicilioLegal.php index b0ebcfc..e7b96c7 100644 --- a/src/AppBundle/Entity/FormularioA/DomicilioLegal.php +++ b/src/AppBundle/Entity/FormularioA/DomicilioLegal.php @@ -258,4 +258,14 @@ public function setVerEmail(string $verEmail) return $this; } + + function getAcepEmail() { + return $this->acepEmail; + } + + function setAcepEmail($acepEmail) { + $this->acepEmail = $acepEmail; + } + + } diff --git a/src/AppBundle/Entity/FormularioA/FormularioA.php b/src/AppBundle/Entity/FormularioA/FormularioA.php index 350fb84..8dfe96e 100644 --- a/src/AppBundle/Entity/FormularioA/FormularioA.php +++ b/src/AppBundle/Entity/FormularioA/FormularioA.php @@ -126,9 +126,6 @@ function getApi() { return $this->api; } - function getUsoConformeDeSuelo() { - return $this->usoConformeDeSuelo; - } function setId($id) { $this->id = $id; @@ -162,10 +159,6 @@ function setApi($api) { $this->api = $api; } - function setUsoConformeDeSuelo($usoConformeDeSuelo) { - $this->usoConformeDeSuelo = $usoConformeDeSuelo; - } - function getPlantilla() { return $this->plantilla; } @@ -173,6 +166,13 @@ function getPlantilla() { function setPlantilla($plantilla) { $this->plantilla = $plantilla; } + function getUsoConformeSuelo() { + return $this->usoConformeSuelo; + } + + function setUsoConformeSuelo($usoConformeSuelo) { + $this->usoConformeSuelo = $usoConformeSuelo; + } diff --git a/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php b/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php index 49f77cf..8ae6a74 100644 --- a/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php +++ b/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php @@ -28,7 +28,7 @@ class UsoConformeSuelo { /** * @var string */ - private $usoConformeSuelo; + private $usoConformeSuelo2; /** * @var int @@ -59,4 +59,72 @@ class UsoConformeSuelo { * @var bool */ private $verLocalizacion; + + + function getId() { + return $this->id; + } + + function getFojaN() { + return $this->fojaN; + } + + function getPresentaHabilitacion() { + return $this->presentaHabilitacion; + } + + function getFechaInicioHabilitacion(): \DateTime { + return $this->fechaInicioHabilitacion; + } + + function getFechaVencimiento(): \DateTime { + return $this->fechaVencimiento; + } + + function getVerActividad() { + return $this->verActividad; + } + + function getVerLocalizacion() { + return $this->verLocalizacion; + } + + function setId($id) { + $this->id = $id; + } + + + function setFojaN($fojaN) { + $this->fojaN = $fojaN; + } + + function setPresentaHabilitacion($presentaHabilitacion) { + $this->presentaHabilitacion = $presentaHabilitacion; + } + + function setFechaInicioHabilitacion(\DateTime $fechaInicioHabilitacion) { + $this->fechaInicioHabilitacion = $fechaInicioHabilitacion; + } + + function setFechaVencimiento(\DateTime $fechaVencimiento) { + $this->fechaVencimiento = $fechaVencimiento; + } + + function setVerActividad($verActividad) { + $this->verActividad = $verActividad; + } + + function setVerLocalizacion($verLocalizacion) { + $this->verLocalizacion = $verLocalizacion; + } + function getUsoConformeSuelo2() { + return $this->usoConformeSuelo2; + } + + function setUsoConformeSuelo2($usoConformeSuelo) { + $this->usoConformeSuelo2 = $usoConformeSuelo; + } + + + } diff --git a/src/AppBundle/Form/FormularioA/FormularioAType.php b/src/AppBundle/Form/FormularioA/FormularioAType.php index ae85732..abb65ab 100644 --- a/src/AppBundle/Form/FormularioA/FormularioAType.php +++ b/src/AppBundle/Form/FormularioA/FormularioAType.php @@ -8,7 +8,7 @@ use AppBundle\Form\FormularioA\ContratoSocialType; use AppBundle\Form\FormularioA\ActaSocietariaType; use AppBundle\Form\FormularioA\APIType; -use AppBundle\Form\FormularioA\UsoConformeDeSueloType; +use AppBundle\Form\FormularioA\UsoConformeSueloType; use AppBundle\Form\FormularioA\DNIType; use AppBundle\Form\FormularioA\AfipType; use AppBundle\Entity\FormularioA\FormularioA; @@ -27,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('dni', DNIType::class) ->add('afip', AfipType::class) ->add('api', APIType::class) - ->add('usoConformeDeSuelo', UsoConformeDeSueloType::class) + ->add('usoConformeSuelo', UsoConformeSueloType::class) ; } diff --git a/src/AppBundle/Form/FormularioA/UsoConformeDeSueloType.php b/src/AppBundle/Form/FormularioA/UsoConformeSueloType.php similarity index 91% rename from src/AppBundle/Form/FormularioA/UsoConformeDeSueloType.php rename to src/AppBundle/Form/FormularioA/UsoConformeSueloType.php index 081b5fe..e731cf0 100644 --- a/src/AppBundle/Form/FormularioA/UsoConformeDeSueloType.php +++ b/src/AppBundle/Form/FormularioA/UsoConformeSueloType.php @@ -4,7 +4,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; -use AppBundle\Entity\FormularioA\DomicilioLegal; +use AppBundle\Entity\FormularioA\UsoConformeSuelo; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -14,12 +14,12 @@ -class UsoConformeDeSueloType extends AbstractType +class UsoConformeSueloType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('usoConformeSuelo', Choicetype::class, [ + ->add('usoConformeSuelo2', Choicetype::class, [ 'choices' => [ 'Si' => true, 'No' => false, @@ -61,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'data_class' => DomicilioLegal::class, + 'data_class' => UsoConformeSuelo::class, ]); } diff --git a/src/AppBundle/Form/FormularioB/CategoriaFinalType.php b/src/AppBundle/Form/FormularioB/CategoriaFinalType.php new file mode 100644 index 0000000..dc21852 --- /dev/null +++ b/src/AppBundle/Form/FormularioB/CategoriaFinalType.php @@ -0,0 +1,29 @@ +add('categoriaAsignada', NumberType::class, ['label' => 'Categoría asignada: ', + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => CategoriaFinal::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php b/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php index 8a48d64..7abdb5b 100644 --- a/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php +++ b/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php @@ -7,6 +7,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\Extension\Core\Type\NumberType; diff --git a/src/AppBundle/Form/FormularioB/FormularioBType.php b/src/AppBundle/Form/FormularioB/FormularioBType.php index f70c2f6..07f4ea0 100644 --- a/src/AppBundle/Form/FormularioB/FormularioBType.php +++ b/src/AppBundle/Form/FormularioB/FormularioBType.php @@ -20,10 +20,10 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('estadoSoporteDigital', TextType::class, ['label' => 'Estado de soporte digital:']) ->add('ingresarCodigoExcel', TextType::class, ['label' => 'Ingresar código en excel:']) - ->add('$emisionDeResiduos', EmisionDeResiduosType::class) + ->add('emisionDeResiduos', EmisionDeResiduosType::class) ->add('riesgos', RiesgosType::class) ->add('dotacion', DotacionType::class) - ->add('localización', LocalizacionType::class) + ->add('localizacion', LocalizacionType::class) ->add('categoriaFinal', CategoriaFinalType::class) ; } diff --git a/src/AppBundle/Repository/FormularioA/UsoConformeDeSueloRepository.php b/src/AppBundle/Repository/FormularioA/UsoConformeSueloRepository.php similarity index 60% rename from src/AppBundle/Repository/FormularioA/UsoConformeDeSueloRepository.php rename to src/AppBundle/Repository/FormularioA/UsoConformeSueloRepository.php index 4e74f39..43f93f0 100644 --- a/src/AppBundle/Repository/FormularioA/UsoConformeDeSueloRepository.php +++ b/src/AppBundle/Repository/FormularioA/UsoConformeSueloRepository.php @@ -3,11 +3,11 @@ namespace AppBundle\Repository\FormularioA; /** - * UsoConformeDeSueloRepository + * UsoConformeSueloRepository * * This class was generated by the Doctrine ORM. Add your own custom * repository methods below. */ -class UsoConformeDeSueloRepository extends \Doctrine\ORM\EntityRepository +class UsoConformeSueloRepository extends \Doctrine\ORM\EntityRepository { } From 6f54f60310e816f8dfbd8fff7d2d9c2c9970945a Mon Sep 17 00:00:00 2001 From: Emma284 Date: Mon, 7 Oct 2019 12:58:09 -0300 Subject: [PATCH 10/23] msg --- app/Resources/views/plantilla/new.html.twig | 129 ++++++++++---------- nbproject/private/private.xml | 8 +- 2 files changed, 72 insertions(+), 65 deletions(-) diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index 55b95de..f18815f 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -7,15 +7,14 @@
-
+
- - -
-
- - + + + + +
@@ -44,10 +43,11 @@
- + +
SUB-RUTINA
-
+
@@ -126,7 +126,7 @@
ESTANDAR
-
+
@@ -224,12 +224,12 @@
 
- +

Formulario A

{{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
DOMICILIO LEGAL
-
+
@@ -239,7 +239,7 @@ {{ form_errors(form.formularioA.domicilioLegal.calle) }}
-
+
{{ form_label(form.formularioA.domicilioLegal.provincia) }} {{ form_widget(form.formularioA.domicilioLegal.provincia, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -247,7 +247,7 @@ {{ form_errors(form.formularioA.domicilioLegal.provincia) }}
-
+
{{ form_label(form.formularioA.domicilioLegal.departamento) }} {{ form_widget(form.formularioA.domicilioLegal.departamento, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -255,7 +255,7 @@ {{ form_errors(form.formularioA.domicilioLegal.departamento) }}
-
+
{{ form_label(form.formularioA.domicilioLegal.localidad) }} {{ form_widget(form.formularioA.domicilioLegal.localidad, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -263,7 +263,7 @@ {{ form_errors(form.formularioA.domicilioLegal.localidad) }}
-
+
{{ form_label(form.formularioA.domicilioLegal.cp) }} {{ form_widget(form.formularioA.domicilioLegal.cp, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -271,7 +271,7 @@ {{ form_errors(form.formularioA.domicilioLegal.cp) }}
-
+
{{ form_label(form.formularioA.domicilioLegal.email) }} {{ form_widget(form.formularioA.domicilioLegal.email, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -279,7 +279,7 @@ {{ form_errors(form.formularioA.domicilioLegal.email) }}
-
+
{{ form_label(form.formularioA.domicilioLegal.acepEmail) }} {{ form_widget(form.formularioA.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -291,9 +291,9 @@
DOMICILIO REAL
-
+
-
+
{{ form_label(form.formularioA.domicilioReal.calle) }} {{ form_widget(form.formularioA.domicilioReal.calle, {'attr': {'class': form_errors(form.formularioA.domicilioReal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -301,7 +301,7 @@ {{ form_errors(form.formularioA.domicilioReal.calle) }}
-
+
{{ form_label(form.formularioA.domicilioReal.localidad) }} {{ form_widget(form.formularioA.domicilioReal.localidad, {'attr': {'class': form_errors(form.formularioA.domicilioReal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -313,9 +313,9 @@
CONTRATO SOCIAL
-
+
-
+
{{ form_label(form.formularioA.contratoSocial.fojaN) }} {{ form_widget(form.formularioA.contratoSocial.fojaN, {'attr': {'class': form_errors(form.formularioA.contratoSocial.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -324,7 +324,7 @@
-
+
{{ form_label(form.formularioA.contratoSocial.poseeContrato) }} {{ form_widget(form.formularioA.contratoSocial.poseeContrato, {'attr': {'class': form_errors(form.formularioA.contratoSocial.poseeContrato) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -333,7 +333,7 @@
-
+
{{ form_label(form.formularioA.contratoSocial.unipersonal) }} {{ form_widget(form.formularioA.contratoSocial.unipersonal, {'attr': {'class': form_errors(form.formularioA.contratoSocial.unipersonal) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -341,7 +341,7 @@ {{ form_errors(form.formularioA.contratoSocial.unipersonal) }}
-
+
{{ form_label(form.formularioA.contratoSocial.titulares) }} {{ form_widget(form.formularioA.contratoSocial.titulares, {'attr': {'class': form_errors(form.formularioA.contratoSocial.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -349,7 +349,7 @@ {{ form_errors(form.formularioA.contratoSocial.titulares) }}
-
+
{{ form_label(form.formularioA.contratoSocial.vencido) }} {{ form_widget(form.formularioA.contratoSocial.vencido, {'attr': {'class': form_errors(form.formularioA.contratoSocial.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -357,7 +357,7 @@ {{ form_errors(form.formularioA.contratoSocial.vencido) }}
-
+
{{ form_label(form.formularioA.contratoSocial.verObjSoc) }} {{ form_widget(form.formularioA.contratoSocial.verObjSoc, {'attr': {'class': form_errors(form.formularioA.contratoSocial.verObjSoc) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -369,9 +369,9 @@
ACTA SOCIETARIA
-
+
-
+
{{ form_label(form.formularioA.actaSocietaria.fojaN) }} {{ form_widget(form.formularioA.actaSocietaria.fojaN, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -380,7 +380,7 @@
-
+
{{ form_label(form.formularioA.actaSocietaria.actaSocietaria) }} {{ form_widget(form.formularioA.actaSocietaria.actaSocietaria, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.actaSocietaria) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -388,7 +388,7 @@ {{ form_errors(form.formularioA.actaSocietaria.actaSocietaria) }}
-
+
{{ form_label(form.formularioA.actaSocietaria.titulares) }} {{ form_widget(form.formularioA.actaSocietaria.titulares, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -396,7 +396,7 @@ {{ form_errors(form.formularioA.actaSocietaria.titulares) }}
-
+
{{ form_label(form.formularioA.actaSocietaria.vencido) }} {{ form_widget(form.formularioA.actaSocietaria.vencido, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -404,7 +404,7 @@ {{ form_errors(form.formularioA.actaSocietaria.vencido) }}
-
+
{{ form_label(form.formularioA.actaSocietaria.verObjSoc) }} {{ form_widget(form.formularioA.actaSocietaria.verObjSoc, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -416,9 +416,9 @@
DNI
-
+
-
+
{{ form_label(form.formularioA.dni.dni) }} {{ form_widget(form.formularioA.dni.dni, {'attr': {'class': form_errors(form.formularioA.dni.dni) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -426,7 +426,7 @@ {{ form_errors(form.formularioA.dni.dni) }}
-
+
{{ form_label(form.formularioA.dni.verDni) }} {{ form_widget(form.formularioA.dni.verDni, {'attr': {'class': form_errors(form.formularioA.dni.verDni) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -434,7 +434,7 @@ {{ form_errors(form.formularioA.dni.verDni) }}
-
+
{{ form_label(form.formularioA.dni.apoderado) }} {{ form_widget(form.formularioA.dni.apoderado, {'attr': {'class': form_errors(form.formularioA.dni.apoderado) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -442,7 +442,7 @@ {{ form_errors(form.formularioA.dni.apoderado) }}
-
+
{{ form_label(form.formularioA.dni.verApoderado) }} {{ form_widget(form.formularioA.dni.verApoderado, {'attr': {'class': form_errors(form.formularioA.dni.verApoderado) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -454,9 +454,9 @@
AFIP
-
+
-
+
{{ form_label(form.formularioA.afip.constancia) }} {{ form_widget(form.formularioA.afip.constancia, {'attr': {'class': form_errors(form.formularioA.afip.constancia) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -464,7 +464,7 @@ {{ form_errors(form.formularioA.afip.constancia) }}
-
+
{{ form_label(form.formularioA.afip.fojaN) }} {{ form_widget(form.formularioA.afip.fojaN, {'attr': {'class': form_errors(form.formularioA.afip.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -472,28 +472,28 @@ {{ form_errors(form.formularioA.afip.fojaN) }}
-
+
{{ form_label(form.formularioA.afip.verFechIni) }} {{ form_widget(form.formularioA.afip.verFechIni, {'attr': {'class': form_errors(form.formularioA.afip.verFechIni) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioA.afip.verFechIni) }}
-
+
{{ form_label(form.formularioA.afip.verRazonSocial) }} {{ form_widget(form.formularioA.afip.verRazonSocial, {'attr': {'class': form_errors(form.formularioA.afip.verRazonSocial) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioA.afip.verRazonSocial) }}
-
+
{{ form_label(form.formularioA.afip.verCUIT) }} {{ form_widget(form.formularioA.afip.verCUIT, {'attr': {'class': form_errors(form.formularioA.afip.verCUIT) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioA.afip.verCUIT) }}
-
+
{{ form_label(form.formularioA.afip.verAct) }} {{ form_widget(form.formularioA.afip.verAct, {'attr': {'class': form_errors(form.formularioA.afip.verAct) ? 'form-control is-invalid' : 'form-control'}}) }}
@@ -504,9 +504,9 @@
API
-
+
-
+
{{ form_label(form.formularioA.api.preImpInmobiliario) }} {{ form_widget(form.formularioA.api.preImpInmobiliario, {'attr': {'class': form_errors(form.formularioA.api.preImpInmobiliario) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -515,7 +515,7 @@
-
+
{{ form_label(form.formularioA.api.fojaN) }} {{ form_widget(form.formularioA.api.fojaN, {'attr': {'class': form_errors(form.formularioA.api.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -523,7 +523,7 @@ {{ form_errors(form.formularioA.api.fojaN) }}
-
+
{{ form_label(form.formularioA.api.formPartida) }} {{ form_widget(form.formularioA.api.formPartida, {'attr': {'class': form_errors(form.formularioA.api.formPartida) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -531,7 +531,7 @@ {{ form_errors(form.formularioA.api.formPartida) }}
-
+
{{ form_label(form.formularioA.api.verNumPartida) }} {{ form_widget(form.formularioA.api.verNumPartida, {'attr': {'class': form_errors(form.formularioA.api.verNumPartida) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -539,7 +539,7 @@ {{ form_errors(form.formularioA.api.verNumPartida) }}
-
+
{{ form_label(form.formularioA.api.verPartidaCatastro) }} {{ form_widget(form.formularioA.api.verPartidaCatastro, {'attr': {'class': form_errors(form.formularioA.api.verPartidaCatastro) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -547,7 +547,7 @@ {{ form_errors(form.formularioA.api.verPartidaCatastro) }}
-
+
{{ form_label(form.formularioA.api.verTitularBoleta) }} {{ form_widget(form.formularioA.api.verTitularBoleta, {'attr': {'class': form_errors(form.formularioA.api.verTitularBoleta) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -555,7 +555,7 @@ {{ form_errors(form.formularioA.api.verTitularBoleta) }}
-
+
{{ form_label(form.formularioA.api.verIndTitular) }} {{ form_widget(form.formularioA.api.verIndTitular, {'attr': {'class': form_errors(form.formularioA.api.verIndTitular) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -563,7 +563,7 @@ {{ form_errors(form.formularioA.api.verIndTitular) }}
-
+
{{ form_label(form.formularioA.api.AcreDocUsoInmueble) }} {{ form_widget(form.formularioA.api.AcreDocUsoInmueble, {'attr': {'class': form_errors(form.formularioA.api.AcreDocUsoInmueble) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -575,9 +575,9 @@
USO CONFORME DE SUELO
-
+
-
+
{{ form_label(form.formularioA.usoConformeSuelo.usoConformeSuelo2) }} {{ form_widget(form.formularioA.usoConformeSuelo.usoConformeSuelo2, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.usoConformeSuelo2) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -585,7 +585,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.usoConformeSuelo2) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.fojaN) }} {{ form_widget(form.formularioA.usoConformeSuelo.fojaN, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -593,7 +593,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.fojaN) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.presentaHabilitacion) }} {{ form_widget(form.formularioA.usoConformeSuelo.presentaHabilitacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.presentaHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -601,7 +601,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.presentaHabilitacion) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) }} {{ form_widget(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -609,7 +609,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.fechaVencimiento) }} {{ form_widget(form.formularioA.usoConformeSuelo.fechaVencimiento, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fechaVencimiento) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -617,7 +617,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.fechaVencimiento) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.verActividad) }} {{ form_widget(form.formularioA.usoConformeSuelo.verActividad, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.verActividad) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -625,7 +625,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.verActividad) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.verLocalizacion) }} {{ form_widget(form.formularioA.usoConformeSuelo.verLocalizacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.verLocalizacion) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -634,6 +634,9 @@
+ + +

Formulario B

{{form_end(form)}}
{% endblock %} \ No newline at end of file diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index a9739dd..dc58a07 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,8 +3,12 @@ - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioB/FormularioBType.php - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioB/FormularioB.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Repository/FormularioA/UsoConformeSueloRepository.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/app/Resources/views/plantilla/new.html.twig + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioA/FormularioAType.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioA/UsoConformeSueloType.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioA/FormularioA.php From 24bac3c777fb419e4501ae0e84b73407641d3e6e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 8 Oct 2019 09:54:02 -0300 Subject: [PATCH 11/23] =?UTF-8?q?creaci=C3=B3n=20del=20login?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Resources/views/Checklist/login.html.twig | 25 +++++++++++++++++++ .../Controller/DefaultController.php | 8 ++++++ 2 files changed, 33 insertions(+) create mode 100644 app/Resources/views/Checklist/login.html.twig diff --git a/app/Resources/views/Checklist/login.html.twig b/app/Resources/views/Checklist/login.html.twig new file mode 100644 index 0000000..56e6eb8 --- /dev/null +++ b/app/Resources/views/Checklist/login.html.twig @@ -0,0 +1,25 @@ +{% extends '@STGTheme/Default/base.html.twig' %} +{# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} +{{ form_widget(form) }} +{{ form_end(form) }} #} + +{% block content %} + +
+ +
+ +
+ +
+
+ +
+ + + +
+ +
+ +{% endblock %} \ No newline at end of file diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index e73e16f..dadbe45 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -39,5 +39,13 @@ public function testFilterAction(Request $request) )); } + /** + * @Route("/login/",name="login") + */ + public function login(){ + + return $this->render('Checklist/login.html.twig', array( + )); + } } From be2d69f18a94f6980299c4aabd03e24caa7d87ee Mon Sep 17 00:00:00 2001 From: Emma284 Date: Tue, 8 Oct 2019 11:49:20 -0300 Subject: [PATCH 12/23] fin de maqueta de formulario --- app/Resources/views/plantilla/new.html.twig | 300 +++++++++++++++++- .../Form/FormularioB/CategoriaFinalType.php | 10 +- 2 files changed, 303 insertions(+), 7 deletions(-) diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index f18815f..6a8d406 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -224,9 +224,9 @@
 
-

Formulario A

+ {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} - +

Formulario A

DOMICILIO LEGAL
@@ -634,9 +634,301 @@
+ - -

Formulario B

+

Formulario B

+ +
+
+ {{ form_label(form.formularioB.estadoSoporteDigital) }} + {{ form_widget(form.formularioB.estadoSoporteDigital, {'attr': {'class': form_errors(form.formularioB.estadoSoporteDigital) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.estadoSoporteDigital) }} +
+
+
+
+
+ {{ form_label(form.formularioB.ingresarCodigoExcel) }} + {{ form_widget(form.formularioB.ingresarCodigoExcel, {'attr': {'class': form_errors(form.formularioB.ingresarCodigoExcel) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.ingresarCodigoExcel) }} +
+
+
+ + {#Seccion de emisión de residuos#} +
Emisión de residuos
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.residuosSolidosSemisolidos) }} + {{ form_widget(form.formularioB.emisionDeResiduos.residuosSolidosSemisolidos, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.residuosSolidosSemisolidos) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.residuosSolidosSemisolidos) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.rsu) }} + {{ form_widget(form.formularioB.emisionDeResiduos.rsu, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.rsu) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.rsu) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.rnp) }} + {{ form_widget(form.formularioB.emisionDeResiduos.rnp, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.rnp) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.rnp) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.tipoDeResiduo) }} + {{ form_widget(form.formularioB.emisionDeResiduos.tipoDeResiduo, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.tipoDeResiduo) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.tipoDeResiduo) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.rp) }} + {{ form_widget(form.formularioB.emisionDeResiduos.rp, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.rp) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.rp) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.definirCorrientesDeRP) }} + {{ form_widget(form.formularioB.emisionDeResiduos.definirCorrientesDeRP, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.definirCorrientesDeRP) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.definirCorrientesDeRP) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.valorResiduo) }} + {{ form_widget(form.formularioB.emisionDeResiduos.valorResiduo, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.valorResiduo) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.valorResiduo) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.efluentesYResiduosLiquidos) }} + {{ form_widget(form.formularioB.emisionDeResiduos.efluentesYResiduosLiquidos, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.efluentesYResiduosLiquidos) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.efluentesYResiduosLiquidos) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.aguaATemperaturaAmbiente) }} + {{ form_widget(form.formularioB.emisionDeResiduos.aguaATemperaturaAmbiente, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.aguaATemperaturaAmbiente) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.aguaATemperaturaAmbiente) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.efluentesSinRP) }} + {{ form_widget(form.formularioB.emisionDeResiduos.efluentesSinRP, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.efluentesSinRP) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.efluentesSinRP) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.efluentesConRP) }} + {{ form_widget(form.formularioB.emisionDeResiduos.efluentesConRP, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.efluentesConRP) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.efluentesConRP) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.valorEfluente) }} + {{ form_widget(form.formularioB.emisionDeResiduos.valorEfluente, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.valorEfluente) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.valorEfluente) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.emisionesGaseosas) }} + {{ form_widget(form.formularioB.emisionDeResiduos.emisionesGaseosas, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.emisionesGaseosas) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.emisionesGaseosas) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.componentesNaturalesDelAire) }} + {{ form_widget(form.formularioB.emisionDeResiduos.componentesNaturalesDelAire, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.componentesNaturalesDelAire) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.componentesNaturalesDelAire) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.combustionDeCombustiblesLiquidos) }} + {{ form_widget(form.formularioB.emisionDeResiduos.combustionDeCombustiblesLiquidos, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.combustionDeCombustiblesLiquidos) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.combustionDeCombustiblesLiquidos) }} +
+
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.noContempladosBool) }} + {{ form_widget(form.formularioB.emisionDeResiduos.noContempladosBool, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.noContempladosBool) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.noContempladosBool) }} +
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.noContempladosListado) }} + {{ form_widget(form.formularioB.emisionDeResiduos.noContempladosListado, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.noContempladosListado) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.noContempladosListado) }} +
+
+
+
+ {{ form_label(form.formularioB.emisionDeResiduos.valorEmisiones) }} + {{ form_widget(form.formularioB.emisionDeResiduos.valorEmisiones, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.valorEmisiones) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.emisionDeResiduos.valorEmisiones) }} +
+
+
+ + {#Seccion de riesgos#} +
Riesgos
+
+
+ {{ form_label(form.formularioB.riesgos.riesgosPresuntos) }} + {{ form_widget(form.formularioB.riesgos.riesgosPresuntos, {'attr': {'class': form_errors(form.formularioB.riesgos.riesgosPresuntos) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.riesgosPresuntos) }} +
+
+
+ {{ form_label(form.formularioB.riesgos.acustico) }} + {{ form_widget(form.formularioB.riesgos.acustico, {'attr': {'class': form_errors(form.formularioB.riesgos.acustico) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.acustico) }} +
+
+
+ {{ form_label(form.formularioB.riesgos.aparatosSometidosAPresion) }} + {{ form_widget(form.formularioB.riesgos.aparatosSometidosAPresion, {'attr': {'class': form_errors(form.formularioB.riesgos.aparatosSometidosAPresion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.aparatosSometidosAPresion) }} +
+
+
+ {{ form_label(form.formularioB.riesgos.sustanciasQuimicas) }} + {{ form_widget(form.formularioB.riesgos.sustanciasQuimicas, {'attr': {'class': form_errors(form.formularioB.riesgos.sustanciasQuimicas) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.sustanciasQuimicas) }} +
+
+
+ {{ form_label(form.formularioB.riesgos.explosion) }} + {{ form_widget(form.formularioB.riesgos.explosion, {'attr': {'class': form_errors(form.formularioB.riesgos.explosion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.explosion) }} +
+
+
+ {{ form_label(form.formularioB.riesgos.incendio) }} + {{ form_widget(form.formularioB.riesgos.incendio, {'attr': {'class': form_errors(form.formularioB.riesgos.incendio) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.incendio) }} +
+
+
+ {{ form_label(form.formularioB.riesgos.otrosBool) }} + {{ form_widget(form.formularioB.riesgos.otrosBool, {'attr': {'class': form_errors(form.formularioB.riesgos.otrosBool) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.otrosBool) }} +
+
+
+ {{ form_label(form.formularioB.riesgos.otrosListado) }} + {{ form_widget(form.formularioB.riesgos.otrosListado, {'attr': {'class': form_errors(form.formularioB.riesgos.otrosListado) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.riesgos.otrosListado) }} +
+
+
+ + + {#Seccion de dotacion#} +
Dotación
+
+
+ {{ form_label(form.formularioB.dotacion.dotacionDePersonal) }} + {{ form_widget(form.formularioB.dotacion.dotacionDePersonal, {'attr': {'class': form_errors(form.formularioB.dotacion.dotacionDePersonal) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.dotacion.dotacionDePersonal) }} +
+
+
+ {{ form_label(form.formularioB.dotacion.potenciaInstalada) }} + {{ form_widget(form.formularioB.dotacion.potenciaInstalada, {'attr': {'class': form_errors(form.formularioB.dotacion.potenciaInstalada) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.dotacion.potenciaInstalada) }} +
+
+
+ {{ form_label(form.formularioB.dotacion.superficieCubierta) }} + {{ form_widget(form.formularioB.dotacion.superficieCubierta, {'attr': {'class': form_errors(form.formularioB.dotacion.superficieCubierta) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.dotacion.superficieCubierta) }} +
+
+
+ + {#Seccion de localización#} +
Localización
+
+
+ {{ form_label(form.formularioB.localizacion.zonificacion) }} + {{ form_widget(form.formularioB.localizacion.zonificacion, {'attr': {'class': form_errors(form.formularioB.localizacion.zonificacion) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.localizacion.zonificacion) }} +
+
+
+ {{ form_label(form.formularioB.localizacion.aguaDeRed) }} + {{ form_widget(form.formularioB.localizacion.aguaDeRed, {'attr': {'class': form_errors(form.formularioB.localizacion.aguaDeRed) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.localizacion.aguaDeRed) }} +
+
+
+ {{ form_label(form.formularioB.localizacion.redCloacal) }} + {{ form_widget(form.formularioB.localizacion.redCloacal, {'attr': {'class': form_errors(form.formularioB.localizacion.redCloacal) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.localizacion.redCloacal) }} +
+
+
+ {{ form_label(form.formularioB.localizacion.energiaElectrica) }} + {{ form_widget(form.formularioB.localizacion.energiaElectrica, {'attr': {'class': form_errors(form.formularioB.localizacion.energiaElectrica) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.localizacion.energiaElectrica) }} +
+
+
+ {{ form_label(form.formularioB.localizacion.gas) }} + {{ form_widget(form.formularioB.localizacion.gas, {'attr': {'class': form_errors(form.formularioB.localizacion.gas) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.localizacion.gas) }} +
+
+
+ + {#Seccion de categoría final#} +
Categoría final
+
+
+ {{ form_label(form.formularioB.categoriaFinal.categoriaAsignada) }} + {{ form_widget(form.formularioB.categoriaFinal.categoriaAsignada, {'attr': {'class': form_errors(form.formularioB.categoriaFinal.categoriaAsignada) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.categoriaFinal.categoriaAsignada) }} +
+
{{form_end(form)}}
+ {% endblock %} \ No newline at end of file diff --git a/src/AppBundle/Form/FormularioB/CategoriaFinalType.php b/src/AppBundle/Form/FormularioB/CategoriaFinalType.php index dc21852..cd28348 100644 --- a/src/AppBundle/Form/FormularioB/CategoriaFinalType.php +++ b/src/AppBundle/Form/FormularioB/CategoriaFinalType.php @@ -5,7 +5,7 @@ use Symfony\Component\Form\FormBuilderInterface; use AppBundle\Entity\FormularioB\CategoriaFinal; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\Extension\Core\Type\NumberType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; @@ -14,8 +14,12 @@ class CategoriaFinalType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('categoriaAsignada', NumberType::class, ['label' => 'Categoría asignada: ', - ]) + ->add('categoriaAsignada', ChoiceType::class, ['label' => 'Categoría asignada: ', + 'choices' => [ + '1' => '1', + '2' => '2', + '3' => '3', + ],]) ; } From ff314ee6a1e4a16cf72434db18419be3f9617039 Mon Sep 17 00:00:00 2001 From: Emma284 Date: Wed, 9 Oct 2019 12:52:15 -0300 Subject: [PATCH 13/23] Formateado hasta el final del FormularioA, falta FormularioB y agregar un DatePicker para arreglar el llenado de fechas --- .../views/Default/base.html.twig | 4 +- app/Resources/views/plantilla/new.html.twig | 325 ++++++++---------- nbproject/private/private.xml | 9 +- .../Form/FormularioB/CategoriaFinalType.php | 2 +- .../Form/FormularioB/DotacionType.php | 6 +- .../FormularioB/EmisionDeResiduosType.php | 24 +- .../Form/FormularioB/LocalizacionType.php | 10 +- .../Form/FormularioB/RiesgosType.php | 14 +- 8 files changed, 176 insertions(+), 218 deletions(-) diff --git a/app/Resources/STGThemeBundle/views/Default/base.html.twig b/app/Resources/STGThemeBundle/views/Default/base.html.twig index c10909d..633b5f6 100644 --- a/app/Resources/STGThemeBundle/views/Default/base.html.twig +++ b/app/Resources/STGThemeBundle/views/Default/base.html.twig @@ -107,9 +107,9 @@
-

{{ datos_encabezado_title|default('Checklist Maker') }}

+ {#

{{ datos_encabezado_title|default('Checklist Maker') }}

-

{{ datos_encabezado_entity|default('Evaluaciones') }}

+

{{ datos_encabezado_entity|default('Evaluaciones') }}

#} {% block cover %}
diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index 6a8d406..5cf3176 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -6,40 +6,37 @@ {% block content %}
- +

CHECKLIST DE CATEGORIZACIÓN AMBIENTAL

- + - - -
-
- - + +
- - -
+ + -
- - -
-
- - + +
+
- - + + + + +
- - + + + + +
@@ -47,86 +44,70 @@
SUB-RUTINA
-
+
- - -
- -
- +
- - - -
- -
+
- - -
- -
- +
- - - -
- -
- - -
- -
ESTANDAR
-
+
@@ -138,9 +119,6 @@ -
- -
@@ -153,9 +131,6 @@ -
- -
@@ -168,9 +143,6 @@ -
- -
@@ -179,27 +151,21 @@ -
- -
+
-
- -
+
-
- -
+
@@ -212,9 +178,6 @@ -
- -
@@ -225,75 +188,70 @@
+ {#Si se quiere que todos los campos queden uno debajo de otro se debe quitar el row en las sentencias
#} + {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}

Formulario A

DOMICILIO LEGAL
-
- -
- - {{ form_label(form.formularioA.domicilioLegal.calle) }} - {{ form_widget(form.formularioA.domicilioLegal.calle, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.formularioA.domicilioLegal.calle) }} -
-
-
- - {{ form_label(form.formularioA.domicilioLegal.provincia) }} - {{ form_widget(form.formularioA.domicilioLegal.provincia, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.formularioA.domicilioLegal.provincia) }} -
-
-
- - {{ form_label(form.formularioA.domicilioLegal.departamento) }} - {{ form_widget(form.formularioA.domicilioLegal.departamento, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.formularioA.domicilioLegal.departamento) }} -
-
-
- - {{ form_label(form.formularioA.domicilioLegal.localidad) }} - {{ form_widget(form.formularioA.domicilioLegal.localidad, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.formularioA.domicilioLegal.localidad) }} -
-
-
- - {{ form_label(form.formularioA.domicilioLegal.cp) }} - {{ form_widget(form.formularioA.domicilioLegal.cp, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.formularioA.domicilioLegal.cp) }} -
-
-
- - {{ form_label(form.formularioA.domicilioLegal.email) }} - {{ form_widget(form.formularioA.domicilioLegal.email, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.formularioA.domicilioLegal.email) }} +
+
+ {{ form_label(form.formularioA.domicilioLegal.calle) }} + {{ form_widget(form.formularioA.domicilioLegal.calle, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioA.domicilioLegal.calle) }} +
+
+
+ {{ form_label(form.formularioA.domicilioLegal.provincia) }} + {{ form_widget(form.formularioA.domicilioLegal.provincia, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.provincia) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioA.domicilioLegal.provincia) }} +
+
+
+ {{ form_label(form.formularioA.domicilioLegal.departamento) }} + {{ form_widget(form.formularioA.domicilioLegal.departamento, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.departamento) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioA.domicilioLegal.departamento) }} +
+
+
+ {{ form_label(form.formularioA.domicilioLegal.localidad) }} + {{ form_widget(form.formularioA.domicilioLegal.localidad, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioA.domicilioLegal.localidad) }} +
+
+
+ {{ form_label(form.formularioA.domicilioLegal.cp) }} + {{ form_widget(form.formularioA.domicilioLegal.cp, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.cp) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioA.domicilioLegal.cp) }} +
+
+
+ {{ form_label(form.formularioA.domicilioLegal.email) }} + {{ form_widget(form.formularioA.domicilioLegal.email, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.email) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioA.domicilioLegal.email) }} +
+
+
+ {{ form_label(form.formularioA.domicilioLegal.acepEmail) }} + {{ form_widget(form.formularioA.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioA.domicilioLegal.acepEmail) }} +
+
-
- - {{ form_label(form.formularioA.domicilioLegal.acepEmail) }} - {{ form_widget(form.formularioA.domicilioLegal.acepEmail, {'attr': {'class': form_errors(form.formularioA.domicilioLegal.acepEmail) ? 'form-control is-invalid' : 'form-control'}}) }} -
- {{ form_errors(form.formularioA.domicilioLegal.acepEmail) }} -
-
-
+
DOMICILIO REAL
-
- -
+
+
{{ form_label(form.formularioA.domicilioReal.calle) }} {{ form_widget(form.formularioA.domicilioReal.calle, {'attr': {'class': form_errors(form.formularioA.domicilioReal.calle) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -301,21 +259,22 @@ {{ form_errors(form.formularioA.domicilioReal.calle) }}
-
- +
{{ form_label(form.formularioA.domicilioReal.localidad) }} {{ form_widget(form.formularioA.domicilioReal.localidad, {'attr': {'class': form_errors(form.formularioA.domicilioReal.localidad) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioA.domicilioReal.localidad) }}
+
+
CONTRATO SOCIAL
-
+
-
+
{{ form_label(form.formularioA.contratoSocial.fojaN) }} {{ form_widget(form.formularioA.contratoSocial.fojaN, {'attr': {'class': form_errors(form.formularioA.contratoSocial.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -324,7 +283,7 @@
-
+
{{ form_label(form.formularioA.contratoSocial.poseeContrato) }} {{ form_widget(form.formularioA.contratoSocial.poseeContrato, {'attr': {'class': form_errors(form.formularioA.contratoSocial.poseeContrato) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -333,7 +292,7 @@
-
+
{{ form_label(form.formularioA.contratoSocial.unipersonal) }} {{ form_widget(form.formularioA.contratoSocial.unipersonal, {'attr': {'class': form_errors(form.formularioA.contratoSocial.unipersonal) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -341,7 +300,7 @@ {{ form_errors(form.formularioA.contratoSocial.unipersonal) }}
-
+
{{ form_label(form.formularioA.contratoSocial.titulares) }} {{ form_widget(form.formularioA.contratoSocial.titulares, {'attr': {'class': form_errors(form.formularioA.contratoSocial.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -349,7 +308,7 @@ {{ form_errors(form.formularioA.contratoSocial.titulares) }}
-
+
{{ form_label(form.formularioA.contratoSocial.vencido) }} {{ form_widget(form.formularioA.contratoSocial.vencido, {'attr': {'class': form_errors(form.formularioA.contratoSocial.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -357,7 +316,7 @@ {{ form_errors(form.formularioA.contratoSocial.vencido) }}
-
+
{{ form_label(form.formularioA.contratoSocial.verObjSoc) }} {{ form_widget(form.formularioA.contratoSocial.verObjSoc, {'attr': {'class': form_errors(form.formularioA.contratoSocial.verObjSoc) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -369,9 +328,9 @@
ACTA SOCIETARIA
-
+
-
+
{{ form_label(form.formularioA.actaSocietaria.fojaN) }} {{ form_widget(form.formularioA.actaSocietaria.fojaN, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -380,7 +339,7 @@
-
+
{{ form_label(form.formularioA.actaSocietaria.actaSocietaria) }} {{ form_widget(form.formularioA.actaSocietaria.actaSocietaria, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.actaSocietaria) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -388,7 +347,7 @@ {{ form_errors(form.formularioA.actaSocietaria.actaSocietaria) }}
-
+
{{ form_label(form.formularioA.actaSocietaria.titulares) }} {{ form_widget(form.formularioA.actaSocietaria.titulares, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.titulares) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -396,7 +355,7 @@ {{ form_errors(form.formularioA.actaSocietaria.titulares) }}
-
+
{{ form_label(form.formularioA.actaSocietaria.vencido) }} {{ form_widget(form.formularioA.actaSocietaria.vencido, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -404,7 +363,7 @@ {{ form_errors(form.formularioA.actaSocietaria.vencido) }}
-
+
{{ form_label(form.formularioA.actaSocietaria.verObjSoc) }} {{ form_widget(form.formularioA.actaSocietaria.verObjSoc, {'attr': {'class': form_errors(form.formularioA.actaSocietaria.vencido) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -416,9 +375,9 @@
DNI
-
+
-
+
{{ form_label(form.formularioA.dni.dni) }} {{ form_widget(form.formularioA.dni.dni, {'attr': {'class': form_errors(form.formularioA.dni.dni) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -426,7 +385,7 @@ {{ form_errors(form.formularioA.dni.dni) }}
-
+
{{ form_label(form.formularioA.dni.verDni) }} {{ form_widget(form.formularioA.dni.verDni, {'attr': {'class': form_errors(form.formularioA.dni.verDni) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -434,7 +393,7 @@ {{ form_errors(form.formularioA.dni.verDni) }}
-
+
{{ form_label(form.formularioA.dni.apoderado) }} {{ form_widget(form.formularioA.dni.apoderado, {'attr': {'class': form_errors(form.formularioA.dni.apoderado) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -442,7 +401,7 @@ {{ form_errors(form.formularioA.dni.apoderado) }}
-
+
{{ form_label(form.formularioA.dni.verApoderado) }} {{ form_widget(form.formularioA.dni.verApoderado, {'attr': {'class': form_errors(form.formularioA.dni.verApoderado) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -454,9 +413,9 @@
AFIP
-
+
-
+
{{ form_label(form.formularioA.afip.constancia) }} {{ form_widget(form.formularioA.afip.constancia, {'attr': {'class': form_errors(form.formularioA.afip.constancia) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -464,7 +423,7 @@ {{ form_errors(form.formularioA.afip.constancia) }}
-
+
{{ form_label(form.formularioA.afip.fojaN) }} {{ form_widget(form.formularioA.afip.fojaN, {'attr': {'class': form_errors(form.formularioA.afip.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -472,28 +431,28 @@ {{ form_errors(form.formularioA.afip.fojaN) }}
-
+
{{ form_label(form.formularioA.afip.verFechIni) }} {{ form_widget(form.formularioA.afip.verFechIni, {'attr': {'class': form_errors(form.formularioA.afip.verFechIni) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioA.afip.verFechIni) }}
-
+
{{ form_label(form.formularioA.afip.verRazonSocial) }} {{ form_widget(form.formularioA.afip.verRazonSocial, {'attr': {'class': form_errors(form.formularioA.afip.verRazonSocial) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioA.afip.verRazonSocial) }}
-
+
{{ form_label(form.formularioA.afip.verCUIT) }} {{ form_widget(form.formularioA.afip.verCUIT, {'attr': {'class': form_errors(form.formularioA.afip.verCUIT) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioA.afip.verCUIT) }}
-
+
{{ form_label(form.formularioA.afip.verAct) }} {{ form_widget(form.formularioA.afip.verAct, {'attr': {'class': form_errors(form.formularioA.afip.verAct) ? 'form-control is-invalid' : 'form-control'}}) }}
@@ -504,9 +463,9 @@
API
-
+
-
+
{{ form_label(form.formularioA.api.preImpInmobiliario) }} {{ form_widget(form.formularioA.api.preImpInmobiliario, {'attr': {'class': form_errors(form.formularioA.api.preImpInmobiliario) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -515,7 +474,7 @@
-
+
{{ form_label(form.formularioA.api.fojaN) }} {{ form_widget(form.formularioA.api.fojaN, {'attr': {'class': form_errors(form.formularioA.api.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -523,7 +482,7 @@ {{ form_errors(form.formularioA.api.fojaN) }}
-
+
{{ form_label(form.formularioA.api.formPartida) }} {{ form_widget(form.formularioA.api.formPartida, {'attr': {'class': form_errors(form.formularioA.api.formPartida) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -531,7 +490,7 @@ {{ form_errors(form.formularioA.api.formPartida) }}
-
+
{{ form_label(form.formularioA.api.verNumPartida) }} {{ form_widget(form.formularioA.api.verNumPartida, {'attr': {'class': form_errors(form.formularioA.api.verNumPartida) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -539,7 +498,7 @@ {{ form_errors(form.formularioA.api.verNumPartida) }}
-
+
{{ form_label(form.formularioA.api.verPartidaCatastro) }} {{ form_widget(form.formularioA.api.verPartidaCatastro, {'attr': {'class': form_errors(form.formularioA.api.verPartidaCatastro) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -547,7 +506,7 @@ {{ form_errors(form.formularioA.api.verPartidaCatastro) }}
-
+
{{ form_label(form.formularioA.api.verTitularBoleta) }} {{ form_widget(form.formularioA.api.verTitularBoleta, {'attr': {'class': form_errors(form.formularioA.api.verTitularBoleta) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -555,7 +514,7 @@ {{ form_errors(form.formularioA.api.verTitularBoleta) }}
-
+
{{ form_label(form.formularioA.api.verIndTitular) }} {{ form_widget(form.formularioA.api.verIndTitular, {'attr': {'class': form_errors(form.formularioA.api.verIndTitular) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -563,7 +522,7 @@ {{ form_errors(form.formularioA.api.verIndTitular) }}
-
+
{{ form_label(form.formularioA.api.AcreDocUsoInmueble) }} {{ form_widget(form.formularioA.api.AcreDocUsoInmueble, {'attr': {'class': form_errors(form.formularioA.api.AcreDocUsoInmueble) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -575,9 +534,9 @@
USO CONFORME DE SUELO
-
+
-
+
{{ form_label(form.formularioA.usoConformeSuelo.usoConformeSuelo2) }} {{ form_widget(form.formularioA.usoConformeSuelo.usoConformeSuelo2, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.usoConformeSuelo2) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -585,7 +544,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.usoConformeSuelo2) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.fojaN) }} {{ form_widget(form.formularioA.usoConformeSuelo.fojaN, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fojaN) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -593,7 +552,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.fojaN) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.presentaHabilitacion) }} {{ form_widget(form.formularioA.usoConformeSuelo.presentaHabilitacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.presentaHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -601,7 +560,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.presentaHabilitacion) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) }} {{ form_widget(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -609,7 +568,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.fechaInicioHabilitacion) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.fechaVencimiento) }} {{ form_widget(form.formularioA.usoConformeSuelo.fechaVencimiento, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.fechaVencimiento) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -617,7 +576,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.fechaVencimiento) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.verActividad) }} {{ form_widget(form.formularioA.usoConformeSuelo.verActividad, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.verActividad) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -625,7 +584,7 @@ {{ form_errors(form.formularioA.usoConformeSuelo.verActividad) }}
-
+
{{ form_label(form.formularioA.usoConformeSuelo.verLocalizacion) }} {{ form_widget(form.formularioA.usoConformeSuelo.verLocalizacion, {'attr': {'class': form_errors(form.formularioA.usoConformeSuelo.verLocalizacion) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -659,7 +618,7 @@ {#Seccion de emisión de residuos#}
Emisión de residuos
-
+
{{ form_label(form.formularioB.emisionDeResiduos.residuosSolidosSemisolidos) }} {{ form_widget(form.formularioB.emisionDeResiduos.residuosSolidosSemisolidos, {'attr': {'class': form_errors(form.formularioB.emisionDeResiduos.residuosSolidosSemisolidos) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -792,7 +751,7 @@ {#Seccion de riesgos#}
Riesgos
-
+
{{ form_label(form.formularioB.riesgos.riesgosPresuntos) }} {{ form_widget(form.formularioB.riesgos.riesgosPresuntos, {'attr': {'class': form_errors(form.formularioB.riesgos.riesgosPresuntos) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -854,7 +813,7 @@ {#Seccion de dotacion#}
Dotación
-
+
{{ form_label(form.formularioB.dotacion.dotacionDePersonal) }} {{ form_widget(form.formularioB.dotacion.dotacionDePersonal, {'attr': {'class': form_errors(form.formularioB.dotacion.dotacionDePersonal) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -880,7 +839,7 @@ {#Seccion de localización#}
Localización
-
+
{{ form_label(form.formularioB.localizacion.zonificacion) }} {{ form_widget(form.formularioB.localizacion.zonificacion, {'attr': {'class': form_errors(form.formularioB.localizacion.zonificacion) ? 'form-control is-invalid' : 'form-control'}}) }} @@ -920,7 +879,7 @@ {#Seccion de categoría final#}
Categoría final
-
+
{{ form_label(form.formularioB.categoriaFinal.categoriaAsignada) }} {{ form_widget(form.formularioB.categoriaFinal.categoriaAsignada, {'attr': {'class': form_errors(form.formularioB.categoriaFinal.categoriaAsignada) ? 'form-control is-invalid' : 'form-control'}}) }} diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index dc58a07..03487b5 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,12 +3,11 @@ - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Repository/FormularioA/UsoConformeSueloRepository.php file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/app/Resources/views/plantilla/new.html.twig - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioA/UsoConformeSuelo.php - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioA/FormularioAType.php - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioA/UsoConformeSueloType.php - file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioA/FormularioA.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioB/DotacionType.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioB/CategoriaFinalType.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/PlantillaType.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioB/FormularioBType.php diff --git a/src/AppBundle/Form/FormularioB/CategoriaFinalType.php b/src/AppBundle/Form/FormularioB/CategoriaFinalType.php index cd28348..768adf4 100644 --- a/src/AppBundle/Form/FormularioB/CategoriaFinalType.php +++ b/src/AppBundle/Form/FormularioB/CategoriaFinalType.php @@ -15,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('categoriaAsignada', ChoiceType::class, ['label' => 'Categoría asignada: ', - 'choices' => [ + 'choices' => [ '' => null, '1' => '1', '2' => '2', '3' => '3', diff --git a/src/AppBundle/Form/FormularioB/DotacionType.php b/src/AppBundle/Form/FormularioB/DotacionType.php index 4def6bf..0c223a5 100644 --- a/src/AppBundle/Form/FormularioB/DotacionType.php +++ b/src/AppBundle/Form/FormularioB/DotacionType.php @@ -15,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('dotacionDePersonal', ChoiceType::class, ['label' => 'Dotación de Personal:', - 'choices' => [ + 'choices' => [ '' => null, '<15' => '<15', '16-50' => '16-50', '51-150' => '51-150', @@ -23,14 +23,14 @@ public function buildForm(FormBuilderInterface $builder, array $options) '>500' => '>500', ],]) ->add('potenciaInstalada', ChoiceType::class, ['label' => 'Potencia instalada:', - 'choices' => [ + 'choices' => [ '' => null, '<25' => '<25', '26-100' => '26-100', '101-500' => '101-500', '>500' => '>500', ],]) ->add('superficieCubierta', ChoiceType::class, ['label' => 'Superficie cubierta/superficie total:', - 'choices' => [ + 'choices' => [ '' => null, '<0.20' => '<0.20', '0.21-0.50' => '0.21-0.50', '0.51-0.80' => '0.51-0.80', diff --git a/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php b/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php index 7abdb5b..57aa7b9 100644 --- a/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php +++ b/src/AppBundle/Form/FormularioB/EmisionDeResiduosType.php @@ -18,24 +18,24 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('residuosSolidosSemisolidos', ChoiceType::class, ['label' => 'Residuos solidos y/o semisolidos:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('rsu', ChoiceType::class, ['label' => 'RSU:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('rnp', ChoiceType::class, ['label' => 'RNP:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('tipoDeResiduo', TextType::class, ['label' => 'Tipo de residuo:', ])//ver de hacer choice con los códigos ->add('rp', ChoiceType::class, ['label' => 'RP:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) @@ -44,44 +44,44 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('valorResiduo', NumberType::class, ['label' => 'Valor:', ]) ->add('efluentesYResiduosLiquidos', ChoiceType::class, ['label' => 'Efluentes y/o residuos líquidos:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('aguaATemperaturaAmbiente', ChoiceType::class, ['label' => 'Agua a temperatura ambiente:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('efluentesSinRP', ChoiceType::class, ['label' => 'Efluentes sin RP:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('efluentesConRP', ChoiceType::class, ['label' => 'Efluentes con RP:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('valorEfluente', TextType::class, ['label' => 'Valor:', ]) ->add('emisionesGaseosas', ChoiceType::class, ['label' => 'Emisiones gaseosas:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('componentesNaturalesDelAire', ChoiceType::class, ['label' => 'Componentes naturales del aire:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('combustionDeCombustiblesLiquidos', ChoiceType::class, ['label' => 'Combustión de combustibles líquidos:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('noContempladosBool', ChoiceType::class, ['label' => 'Los no contemplados anteriormente:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) diff --git a/src/AppBundle/Form/FormularioB/LocalizacionType.php b/src/AppBundle/Form/FormularioB/LocalizacionType.php index 2b95421..0bfcb7d 100644 --- a/src/AppBundle/Form/FormularioB/LocalizacionType.php +++ b/src/AppBundle/Form/FormularioB/LocalizacionType.php @@ -15,29 +15,29 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('zonificacion', ChoiceType::class, ['label' => 'Zonificación:', - 'choices' => [ + 'choices' => [ '' => null, 'Parque industrial' => 'Parque industrial', 'Industrial y rural' => 'Industrial y rural', 'Otros' => 'Otros', 'Urbana' => 'Urbana', ],]) ->add('aguaDeRed', ChoiceType::class, ['label' => 'Agua de red:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('redCloacal', ChoiceType::class, ['label' => 'Red cloacal:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('energiaElectrica', ChoiceType::class, ['label' => 'Energía electríca:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('gas', ChoiceType::class, ['label' => 'Gas:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ], diff --git a/src/AppBundle/Form/FormularioB/RiesgosType.php b/src/AppBundle/Form/FormularioB/RiesgosType.php index 41dff33..5b1fc76 100644 --- a/src/AppBundle/Form/FormularioB/RiesgosType.php +++ b/src/AppBundle/Form/FormularioB/RiesgosType.php @@ -17,37 +17,37 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('riesgosPresuntos', ChoiceType::class, ['label' => 'Riesgos presuntos:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('acustico', ChoiceType::class, ['label' => 'Acústico:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('aparatosSometidosAPresion', ChoiceType::class, ['label' => 'Aparatos sometidos a presión:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('sustanciasQuimicas', ChoiceType::class, ['label' => 'Sustancias químicas:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('explosion', ChoiceType::class, ['label' => 'Explosión:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('incendio', ChoiceType::class, ['label' => 'Incendio:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) ->add('otrosBool', ChoiceType::class, ['label' => 'Otros:', - 'choices' => [ + 'choices' => [ '' => null, 'Si' => true, 'No' => false, ],]) From 3e2cb8dccb0a94f414819b51fb0a22b8c91c2019 Mon Sep 17 00:00:00 2001 From: Emma284 Date: Thu, 10 Oct 2019 13:00:40 -0300 Subject: [PATCH 14/23] dejado lindo del formulario ^^ --- app/Resources/views/plantilla/new.html.twig | 619 ++++++++++-------- nbproject/private/private.xml | 4 - .../FormularioB/EmisionDeResiduosType.php | 5 +- .../Form/FormularioB/FormularioBType.php | 16 +- 4 files changed, 362 insertions(+), 282 deletions(-) diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index 5cf3176..ead25cd 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -1,3 +1,4 @@ + {% extends '@STGTheme/Default/base.html.twig' %} {# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} {{ form_widget(form) }} @@ -10,32 +11,32 @@
- + - +
- + - +
- + - +
- + - +
@@ -48,8 +49,8 @@
- - @@ -58,8 +59,8 @@
- - @@ -71,8 +72,8 @@
- - @@ -82,8 +83,8 @@
- - @@ -94,8 +95,8 @@
- - @@ -111,7 +112,7 @@
- + @@ -135,7 +136,7 @@
- + @@ -156,21 +157,21 @@
- +
- +
- + -
-
- -
+
+
+ + -
-{% endblock %} \ No newline at end of file +
+
+ +
+ +
+ +
+ +
+
+
+ {% endblock %} diff --git a/app/Resources/views/plantilla/listado.html.twig b/app/Resources/views/plantilla/listado.html.twig new file mode 100644 index 0000000..ea4f29a --- /dev/null +++ b/app/Resources/views/plantilla/listado.html.twig @@ -0,0 +1,50 @@ +{% extends '@STGTheme/Default/base.html.twig' %} +{# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} +{{ form_widget(form) }} +{{ form_end(form) }} #} + +{% block content %} + + +
+

MIS EVALUACIONES

+ +
+ + + + + + + + + + + + + + + {% for plantilla in plantillas %} + + + + + + + + {% else %} + + + + {% endfor %} + + +
Número de ExpedienteRazón SocialFecha Inicio ExpedienteEvaluadorAcción
{{ plantilla.numeroExpediente }}{{ plantilla.razonSocial }}{{ plantilla.fechaInicioExp }}{{ plantilla.evaluador }} + + + +
No tienes checklist.
+
+ +
+{% endblock %} \ No newline at end of file diff --git a/app/config/config.yml b/app/config/config.yml index d8dc975..d442d90 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -37,6 +37,8 @@ twig: strict_variables: '%kernel.debug%' form_themes: - '@LexikFormFilter/Form/form_div_layout.html.twig' + globals: + Img: 'Imagenes' # Doctrine Configuration doctrine: diff --git a/app/config/security.yml b/app/config/security.yml index 0e0b7cb..2a89f9f 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -22,3 +22,5 @@ security: # https://symfony.com/doc/current/security/form_login_setup.html #form_login: ~ + + diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index dadbe45..4d02521 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -7,6 +7,8 @@ use Symfony\Component\Routing\Annotation\Route; use AppBundle\Entity\FiltroResumen; use AppBundle\Form\FiltroResumenType; +use AppBundle\Entity\Usuario; +use AppBundle\Form\UsuarioType; class DefaultController extends Controller { @@ -42,10 +44,40 @@ public function testFilterAction(Request $request) /** * @Route("/login/",name="login") */ - public function login(){ + public function login(Request $request){ + + $usuario = new Usuario(); + + $entityManager = $this->getDoctrine()->getManager(); + + $form = $this->createForm(UsuarioType::class, $usuario); + + $form->handleRequest($request); + + if($form->isSubmitted() && $form->isValid()){ + + $usuario = $form->getData(); + + $entityManager->persist($usuario); + $entityManager->flush(); + + //return $this->redirectToRoute('listar_formularios'); + + } return $this->render('Checklist/login.html.twig', array( )); } + + + /** + * @Route("/accion-user/",name="accion") + */ + public function acciones(){ + + return $this->render('Checklist/AccionUser.html.twig', array( + )); + } + } diff --git a/src/AppBundle/Controller/PlantillaController.php b/src/AppBundle/Controller/PlantillaController.php index dacebeb..bdf6369 100644 --- a/src/AppBundle/Controller/PlantillaController.php +++ b/src/AppBundle/Controller/PlantillaController.php @@ -79,6 +79,20 @@ public function plantillaVer(Request $request, $id) } + /** + * @Route("/plantilla/listado/", name="listado_plantilla") + */ + public function buscar(Request $request){ + + $entityManager = $this->getDoctrine()->getManager(); + + $plantillas = $entityManager + ->getRepository(Plantilla::class) + ->findAll(); + + return $this->render('plantilla/listado.html.twig', array( + 'plantillas' => $plantillas)); + } /** * @Route("/plantilla/ver_2/", name="ver2_plantilla") diff --git a/src/AppBundle/Entity/Usuario.php b/src/AppBundle/Entity/Usuario.php new file mode 100644 index 0000000..3cfac0c --- /dev/null +++ b/src/AppBundle/Entity/Usuario.php @@ -0,0 +1,258 @@ +id; + } + + /** + * Set the value of id + * + * @param int $id + * + * @return self + */ + public function setId(int $id) + { + $this->id = $id; + + return $this; + } + + /** + * Get the value of nombre + * + * @return string + */ + public function getNombre() + { + return $this->nombre; + } + + /** + * Set the value of nombre + * + * @param string $nombre + * + * @return self + */ + public function setNombre(string $nombre) + { + $this->nombre = $nombre; + + return $this; + } + + /** + * Get the value of apellido + * + * @return string + */ + public function getApellido() + { + return $this->apellido; + } + + /** + * Set the value of apellido + * + * @param string $apellido + * + * @return self + */ + public function setApellido(string $apellido) + { + $this->apellido = $apellido; + + return $this; + } + + /** + * Get the value of email + * + * @return string + */ + public function getEmail() + { + return $this->email; + } + + /** + * Set the value of email + * + * @param string $email + * + * @return self + */ + public function setEmail(string $email) + { + $this->email = $email; + + return $this; + } + + /** + * Get the value of iup + * + * @return string + */ + public function getIup() + { + return $this->iup; + } + + /** + * Set the value of iup + * + * @param string $iup + * + * @return self + */ + public function setIup(string $iup) + { + $this->iup = $iup; + + return $this; + } + + /** + * Get the value of cuil + * + * @return string + */ + public function getCuil() + { + return $this->cuil; + } + + /** + * Set the value of cuil + * + * @param string $cuil + * + * @return self + */ + public function setDocumento(string $cuil) + { + $this->cuil = $cuil; + + return $this; + } + + /** + * Get the value of password + * + * @return string + */ + public function getPassword() + { + return $this->password; + } + + /** + * Set the value of password + * + * @param string $password + * + * @return self + */ + public function setPassword(string $password) + { + $this->password = $password; + + return $this; + } + + public function getUsername() + { + return $this->email; + } + + public function getSalt() + { + return null; + } + + public function getRoles() + { + // En este caso definimos un rol fijo, en el caso de que tengamos un campo role en la tabla de la BBDD tendríamos que hacer $this->getRole() + return array('ROLE_USER'); + } + + public function eraseCredentials() + { + } + +} diff --git a/src/AppBundle/Form/CategorizacionType.php b/src/AppBundle/Form/CategorizacionType.php index 118cef8..f078f48 100644 --- a/src/AppBundle/Form/CategorizacionType.php +++ b/src/AppBundle/Form/CategorizacionType.php @@ -19,12 +19,12 @@ class CategorizacionType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder + ->add('numeroExpediente', TextType::class, ['label' => 'Número Expediente: ']) ->add('razonSocial', TextType::class, ['label' => 'Razón Social: ']) ->add('categoria', IntegerType::class, ['label' => 'Categoria: ']) ->add('evaluador', TextType::class, ['label' => 'Evaluador: ']) ->add('estado', TextType::class, ['label' => 'Estado: ']) ->add('notificacion', TextType::class, ['label' => 'Notificacion: ']) - // ->add('numeroExpediente', TextType::class, ['label' => 'Número Expediente: ']) // ->add('fechaInicioExp', DateType::class, ['widget' => 'single_text', 'label' => 'Fecha Inicio Expediente: ']) // ->add('avance', IntegerType::class, ['label' => 'Avance: ']) // ->add('diasEv', TextType::class, ['label' => 'Días de Evaluación: ']) diff --git a/src/AppBundle/Form/UsuarioType.php b/src/AppBundle/Form/UsuarioType.php new file mode 100644 index 0000000..70c4b0d --- /dev/null +++ b/src/AppBundle/Form/UsuarioType.php @@ -0,0 +1,29 @@ +add('nombre', TextType::class,['label' => 'USUARIO (CUIL | EMAIL | IUP):']) + ->add('password', TextType::class,['label' => 'CONTRASEÑA:']) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => Usuario::class, + ]); + } + +} \ No newline at end of file diff --git a/src/AppBundle/Repository/UsuarioRepository.php b/src/AppBundle/Repository/UsuarioRepository.php new file mode 100644 index 0000000..b090b14 --- /dev/null +++ b/src/AppBundle/Repository/UsuarioRepository.php @@ -0,0 +1,13 @@ +f}{e{DH4(rOLr)>G>deD5>kRlE4`!$ONWa}Hw)}8rF5%w zzq`Npd4Ih9eD3GmGiT1+**P1A03H^+>Pd+~O2ABF zE7&mmC>#6eyTA1Dv+;5O6z$z@9XOstZC*L(IoR0yd-gfV007Ue=g$-kUSqcBLX#~V zf_wgQW21@bd*hrwH)LiPSf_WzjD3unS}tKJkCH2UesPLv+@9_{ zwl;*y6KN^Jl=p#G3lGWYA#UAs;G%!4URP*W9r;4PFMW289`o3Pt zLxmaqjo3<5-Xx=LvK z#^ZU?ZOBgRR~y5PcU#^fs`_EIM5z>*DjQ{&NSOhPh3V*aVZISN8lJqqpB5`_nujLR zq-Gqdimetzb9G{eY)yn!THe3>IX!HK04*Tms9`N1@!WcM_t)i<)^}v4(lNK!xEx=B zLiq`yis&sVHwV$}YB5eci$#0M*Y^l%5emy38ZDpEj4?s)v%__N)aTuIkBSo|03R|B zHx#UNGB=MkIB?r~sBM50e+t-8e0SFGhfKbRf+M<|)D2QL8KVSftss1g;u*iCZ|Tjo z#%ko0&CW%A(~lIz^D_HZq=T%V{c@(PQDd~AJ21I)w)J(>-1qKOe(<}qzV+Yz9-PR= z{`a3$4_scpD*su}2`WUoETWJLsNC9 z_U5R7cLr#3?kev^*_#0u?#=ruhedKWR`slPmw5woQa+9AHA@C95;sO%!$lkN@t@7a z6r~0yotb@zJTe$J^E8g#z4eMZN?_4Y`PmGN6w}c1d8lBHP>|HDi`BO~G@nJ7l($e3 zD_Tt8mzg918U$KQheRYcY*LuWN3C}B0ygopQtKX&?DN|6UAuBu*%w99%uxdWDpwBz zNqOgI-JGwe4-0f+yYDh{xTcsvNamG_2SW4vmfkii$nI%C0-b#aa-5Kiy`QWJj=kdc ztOcKD8vc9jY_DAv8+TEB&o#UallFTrkBp#mf+{@9Q`Vi^;nP`oQtXd1dvF%i*9@}Z z!>!S)t#UC>rhOAMg^74|D*GEzv`xQG#U?Cf0=K*w71#hIs?djB=h#E(#hN`H=z=R< z0^B#78Xie#E#w=_vp}><@GlL9j{nv+ncQ{7i$awQb)^?rEcm`KI6r2(IK4x->xVK6 zlBwhk?ISeHaw817z`ui7#MBFmK# z3x#c+sUeAHlLu??8=J?IrMIoVTB0_mc`eYxf0^QHiD(60uRyjvbgQB*+MU`}{oU(c zM=)s+R2!Z%T2xcJ4V~DyPAU#e3eX~eS>IrX*M2jt$;uN_jwbI3qXYo_>C`%EjOQ?0 z)-4XAE+-pDt(WTpI<)l#bwtT1a-%#|orivYqYnqP@Fs#loBrYSq2OINv@9KGrG0QO z!9gL%HCjTc7ass#pz+sHDW@8-H_wYdlMGl%nHDqrXPyRHVt8A%f#S4NN`|6lmc?)1 z%K%fNihPvst!by*NX9>s=3E92kh1!Gjk^n*Hl*zDfvI0+h0j438~7#Vqu%t6zS=_~ zsCct#ebK>zA6#qAUiI33%ul;|V&Rfz>XTf9HqdRI8TeeTvRplYCQYOvOgwAs+dv5g zxVp|Dvs+RC@DBZniIX;>GRD_#U+ zZyP)Wdf-$fOi%Yi3=}_% z3a7Uxj>nRkc9GSMPm0=5LnB2faQXb$^QVdHQ39{CBHmiee+ zRx-2ibamr%y!S}r>xqGQXPd>BZtAp!DP!)V>RoJ{j(GPKe!g%mtW%zk0DV?^9#BXX zKE42bU6F#rrHIAfKcgjWLq$bMQCf2pUo9o!#>dZf(Ibj{?Ekvs=z4&0?#N=e0pib? zSOjC(Jz@PhJv6ci&PrWj3V8fzs&*Ry$Ex5&Kq(yi=P#oTg%BJQVSB0!?4}gVsm~yp z2n7HmsAqc%mn$9WK^6d@1Z*fYkkTrMECK~Zg&E{sQ0x}@uYOpRK;1cK2^sKWjvm3` zidS%JI0tNiT1N^S3LwlvTU-A=*p+)2r7SU^qRWLHQm|hd9+e_{A~YZ12BB1egZ~Dv1jNUEyKmK+k(6 z@jtmk&Hq$z)O65RfPzj4PFHKAbdbACuq6ewNm<85aUo?gKEOc(!SVb-DT1PbRya=d z(O`2O9^QY{1Q+)=I0Z|d;v^*baO$JMb}S*@9n43-Nzw1$*`OZ-9c8UE(V94e)b*gm zRd6@Du){>EmmN-gUx_Yt{HeC4lS2e3uH^yT9u7X+7b(`^A+Qd=FWt z(pVSNP*5T)%)^VWtr~o%H-xXyA=;9D{oC*m<<~AU%+6Ps)Z+`0R-MUXt2aB8KjzH? zSp*4=f66yEKMv!4a6`(`#l)2&aNjlZp{!ldEWoi~@0@&+8%cAtZ)g8E&dU(nrR|^r z+F_VG z6hwcrQ%!;w_Pi_aVGFEZ3AJkeN8aGmN8ez-p?90&PZVX=*?O#8S;wC~)=lJ+5R3wI zXu?YC!0j6OgO}9w8TpKQ@n^Px^<*jdwco2_v8!f-*q#1#K2&dv%WW%Y!1^esFBU4@ z60#6ML@`%tst>%m{Iv{y+62>Pb{&ZV!-q^4t`;$F3T{PB>2!lj<1ijDFS z_)vBa3sd{9Vqj{}-qqzfsz?6l)n?K`em?3Nn{mF|D*o^9_7=TfNnXHa`MXYc^+v1N zp7{+w#5r5DiPv+k-~Ka9e}gs5_VVXOtV{>&uc|7=(qjvDiPkQ7SAM$8cxTWR$tFeDD&rG}D!*=Yswj$!_75QpEhMK!is{fTt=b^CU zIfWUTP3NJ%_CN%~`s=Y&!Ja0i=Xv|;#Vl*eWA(OacB%2N$CsPZs81_JstmX?CnOsE z@6YvdlFh8h5kouEs|@P-zrA^<$d{feFjS3d5{x@PmLFA87`Z=R?KRuDGxLpP@Shf) zMPFZX|IvutYbAk7$F(5Y;d!K(@!so%Br;4&wRW~5%dxVq8)ZN_iZ~-*5(e~qQ@`b8@sLY zBVpz5WPv1Rss!gl6BXN^x3OR75pc<~*L?Y8J{3)xMBYv{j&1gNb_RQ$yDhio-9zuCl^&d$)PEaJ9Fe?Le`&KowC#G8%=Csac|KQHF8 z=qlFRs3am>UQ=VTba+_;P5!QnA~&%vv>K;kJ&w4c`y@YU!E2!E?M26N=XJ|Fyy<>f zVumJuM%&MG$h(QBb>~a3^RB}Ve;9a}`bw9p-#fgBfjS_{u1%J|hPg3amD!{6VIyW- zK`WmHuP-|S_hc(fGd9Kh;ffZKQyy0i(&JPD;-pShQuli}DZJFOx%9QNqDMggue#hm z5?7%4e&BtyHG)Z0kriBTZDBp$DIlg~0oLyzR6j>onKyl=bajr|thQ)nSrB4C5nCws zdj)v%r{7uwGV6^DQ?uz?WOS<3mZTd!iNx<3HO?n$zGFlfG`vB_F?_fc+-ZP z32X5Ey=u(cYxh{ld=W`>ieSyRZ;6WwRiBdU$tW9CURl=Dn>6#b&w^*}8k5%MUtel1 z<0+oAX7b);$fZ>4=W8C5xcQ~$v#1p278(1_{!=5b2=ZUsAIu@3dbLmU9;-8Cs5F-L zb@8Av?n>WNeh!7}l^g9y9qdb~9&kqbkFcnSmAPmXt1V=&25shG-Z$13!3sddxqGBgGplT4SbposYjsHbE+}5IyvI^M~Z7 z_3dnnKJi(PLeCmSOBiWfz&);C0h?O!eN?~Y;Mn_B`|_@lDb}u(GS9d zb0H_V-;`T zX5TXkFZskb!WkG0dnp`Th@y(@JL?gvFf&=~J~(aK11%R!y|Am>;~W{Tw@v&$GeW51 zxi7g{-t^~JUW(`61sYAs%sJ;im+bp!5vw$?1oPuDJy~|ON_O}bGO^b9e2@11%`_;z zxNFnT^_=4y+i#+o_Ms#}@(M+&PdB{%E*t*(6qMQLRre{}Pur9AwKk|hRqa4x@88n& z>vh_tU1mx1Etk&igee9+Fk02WfiR%~AANU9p=r*v@!xyJV#CMA$eIa}wKAsVf|iEX z&E(n9%-xXt;;bE7HgBaK!OcdZ`s^aex45`}Y`HDtuQ7S1#?Q!aW9DYOpA3J~r?1zI z=(g`yX?*nL<9xk*c(jy#?Idw`yH7F8{D+1REyILO#uEDPDXKYNgY5LG!P6dbupssq z8`(quCq_$>2cw@l){6SSj=7yTWob@Jgj_^dk3=SQ(#k5Ve7>{hQ)X!237L>As8bq6 zMpKAfe-vhZ1AEq})9Br5-#4yyZz`LhScTHvCwZhFHo7KF)}#SfYF6vh5HwAaJ#(}p z`(ZhipH5*{nuyh6EO9q1^i1_{M|2xv^aH5eS~j{}hDR%MY*dg`cC_WeKnf6t*K55!rv-NG)En8mu{+>1+6?`l@V96wa++u?<(GtxD zWkCw^FW1U{V@+H>^_}H=-P~)R{cM4N9ZhA%;j2MeLf)_igEpe{rATyFeBBM^UQtBOR@KZc@qguyjn2%g_*DO;VR5l%mO^q+^{-xh^2Z# zIp##Z5qd4bt4rARgJ$O7$)yydn!u~9g|JG;ZQA9fINjG}VcbU5y?fY9_)OrlhInYo?ZDlupk+6tVPv=_W61~S^DCiCZ!7Uzbz{Lr6m@bX zG_xKuW4jh6!@3yc2i8zc#B4XBnT4Q;mc_(b!jD9e7(DwcBX{JNFJqtBGqRR!fX_wLpT{5`MDqEp3Wq(!N zcU3?CThx!C2AFo6(CpVMD+jXTrx8Cz}eZfX*_WD8M!w2+iRbm{EHlDuw zD(yFPJ8e@e7f-GoT#rd+rS(;-3^~Z#wWbK4A+Kz+btvQ&t9ns{AF!!* z?(F&FAH!Q$d2S{%lbphdK*{|Rdk>?=SHpUeSmV%R<0cNJiYoG@liY6?GbAlB$^2g9 z8+3}TRX5EVN{76$nUN*&GW1E6RhpEKNOO@#=~%B17XhI6MN>9pwG#ukimj=kWD2Ih zM&|6!@AX#ewmOjl>)}3}jihF}qcsFl9;F9-`Xk=b(E@hURPuK!Aj+4YT8hUG$5tcp zfk!pYW{_t3mXH3EXgODnd*eddMqW|L7Ny+~wq>hoHUqFuCQ1$*{PH^7)9rvtP|kj- zG(yg72pkK9nVX#v*_b+>(+llIzFBH+6T z>d41}bs{`)W@W7@w_D6Ot*(DV-ejo1i`#$9f)e-}P#946cQeI@j~#X>xoaJ@mr}iK zJ1g50_0;lswn2)8D4U^%)g+i`mFXf zOn0-ZP;>J2P`7x+n&kzx5e*;H(ZJ-%pCZroj+3wK73k7keXGEi>}x;q$uLxW)%u;m z=)`8J-6qC{bH|*Q-Y6)&aCBm}gvlix9$A<>{D&$1q zHtz<@r?sYy1l~_QKIJ5C2em`befelM$V^|Omj2v>n>IafNjlHmOe^nVeRQ@v-V3`N zX{q71Y!R7J0LwCI8}Ee&?%C)&4Ry1w{~Ad+5BMiuYfJ;^M9 zgiUaXhh}|6n*uDC^ivQ%nbz0#*?AMrcAaC;I8T|8nw)5}LJue~3FnJ_TdUtub7-Bu ztfeB>@Sn(S%erI)IKo|^KZ-5JjXoTh^N0B z3;lBeE9_qkdk8lLYL!Zk)kdWb5)e21Lt5ung>EIRl)hJSh70pC?Bb=TRGnm$_mn#? zb;!yb#hIS3Fgd=tkG-g>>Ge2!S6$XomJyP+pITJx9;jPhvCmpxXJPrXMBi;9T-wfs zefHZ-h#qazjpy%|Jex#W{LDVqtq0bW`CW@_-Q&irPH)v-t_a!${)r0MP#o4sU9FM* zG?~A)KjYA~@dRzbq4v)uJ&|38c1wpZ@jZmNgs?AGf!7RB2(ouhGN@;^eCs}A==V=y zTmCVrd9#Se5wlx(0a4hDn%`fQLnA@$osA!iEQM(#m2Hp>J!+MQ(#%Z;4FIjts2rBm zG%2Gs-Bb085bUw_&JJ;StGT2E&4*f|u-C6!{0GXa-Qv-tSPqXhBzfbuIz^r7O@Jf9 znB<(=IJA|%shEygbmjXh5m@5lhIMN%fZl}ye*#9w*Jnhe*`i%$l88#A>w_m1>c-^3|&`}-21Mbwg zk?6@M6u3yHj246C%p%=6Y6)+i(%9Xi{&hq!@Tk_2E^*Py7d!o6pJ13(kG2JSsPWX# z&Uk0ovl`F-$7$y!i)chB;)DTFO0uU}h!IF^6Qs0cHij(a5QKkoV45JM&P&^`xzxIi zl>ZSjrO7rpXrumz_sPV`Lb{1btCumgWoNa)H`5GdIf~x2QId~XleHASFg*OE zGn-SfUw2$*1<}bf-rSXJ*37?gb;coWf8NfS%dPSQYfa6fe%tZQNPKi{yT_N7t=vNG z&YlMMW*$GLqtIY%D=IQ_Z!rgWOk6E&9_7RloA`Z_6Ht&>F9`)tvp|<-O6|@rog6n1 zCf8eLU)VKdH)D930|00Clj%9FwR0wL6hrnMu&?C6@{Kb82B5$m<3LVpgGIC9CWR1u zsNGRuYFiBA5&sqXbX_G9J^BI-tv>&c}uZoJfljlA1+sW(2$a;`c8h z6K5Ul?GiLr7OzwE4dl*e0u*TOCaRUxff=dQR-6L}MO2@vu>z36Myg*oqViw1|x>0D# z?#jj%U$^kh3y-{a*QnF|Nxta(rO3t1>%i`?fE9<~_$mYuDb^>l5jIkBDz(bt+I%9x zjEKx(;)Awk!jzS!nR$ai#DBe}X;Vrh8s|I0U|BqD9ztf;MG(EeHbGjQm%T3`4q|3) zFM=+&90^s^=bJKBy1?prZ__7lV$|e{doibZ8=2{a)RVIqs{&41C$uGqqrdlIXKy-# zt1Keh3+B$N(?toN6(u^Im?g|Y;=1DnJe&jdI9PwhLR zr!R4RZxHvvmGyV{QO*zkHzsT$AU+0ISKFSE7+2FNz&C~RUZm;V>AUcBZ8=HYmd&9V zk9IXjgV=>0HTJ_Kj0S1=&Sonv9!)YE3xCpF(@_0tlm(wqRCzJz z2LTU|w~;!&X^=t?fv7F}H@7!NYJk&q#^8L6LNp@3AEyjsB34UtOQkaNK4ANXMDgcCQb3ibPchcMZ1wn*p@0FYC)N7suRB7^*A zk5}1K5GW27>7qv0ISKEw_pknaGxVd!^2H6SfWeL9lMJhnG(Dr5ew4reUN|=je(j$@ z!;>%aOr*L3GjptV-<2-gN(yGKHG5q)vG;dv`tn)1&hl2<#c+7(qz<**H3O}Pi)A0mAZ^<~HPc_2oQN6JAo50H4?k|>VZ{%_b{ zobLEH15Rb`^d-z#EU4?EYh7R0>(tI<@P7HN4~x6z*#~+=Z+f`$+S+dBNc+E`oRcUj zK{L&JO%K1|=|%}uO0Mr@HZaSFpqOJCQc*vcRJ5TE~er;)s7=g660VzH&H|biFh^`L^HYFpVVt#kKgcEu5)yU&E+8 zS{&-p5iec7e^+Q`L(!x8RZj+Y-g!*Rk_$VCX_|qH=yeM*OjuRG!VE03ltzH)A#kFC z4@=ij)i3qw;`pofky&(z!$!) z>8N<`S7c^^pG--WAeLJP6|@}y@E0C~az({Pa=NyXY&+hnEF|OujE!iN5Ze=qbciYf zL*8kvvnM51O7)}wZCwkgA8Ok@oE!UjAk6&5E$` z`+GB;AGrTi<>rU(*oc+Ea4?I9R8hXUy>x)P z4W(C4(8}6Hbk3fCK%~LMS5yOp4OKG#+nm#sGGs~a{X`nWB)&i%p;%!L}A3p8Y`B=crmRxH+^SSz)z11KC#d5F?oc5+IHqnb9f+sPQ@a>LNwVkYbD^ zl2Ab5@zWX1lWr%1u#BTo!YC*|Qji|pA+?RBr&aT&=@DPx9-F|T=uOTj=r#&!^4OCF z(Dvol0{`fX)dM^Qr6)PJ$w0XhK&^f10}j_J(!JkhZg?+H9c>lrBD9EE@CZ7sh!k5w z?TD7r0T2OFvvWV+1Wn>(Rd6G>$u{tn?jfO8pw<$`my}*T_2O7yn{6`+WnOuY-;0O# zux1!iaL6VuciYe=P9`~6r9*6xwx)@DspFln)mMgV&Xlk=K`tF4Cdj+=S3H_c?FVJp zX*RKu*?wC>b~%;+TZ)q$XeM5>54`67dEe&P0V}n}$4Px1&IV zn)rIkWGviQ@ZzkV9JXq+N&Wvmwfp~_WdCcSF2LhfSkekl7YlCexw7`N>ZjHb{{u$H Bty=&9 literal 0 HcmV?d00001 diff --git a/web/css/root.css b/web/css/root.css new file mode 100644 index 0000000..ea440fa --- /dev/null +++ b/web/css/root.css @@ -0,0 +1,135 @@ +:root { + --input-padding-x: 1.5rem; + --input-padding-y: .75rem; + } + + body { + background: #007bff; + background: linear-gradient(to right, #0062E6, #33AEFF); + } + + .card-signin { + border: 0; + border-radius: 1rem; + box-shadow: 0 0.5rem 1rem 0 rgba(0, 0, 0, 0.1); + } + + .card-signin .card-title { + margin-bottom: 2rem; + font-weight: 300; + font-size: 1.5rem; + } + + .card-signin .card-body { + padding: 2rem; + } + + .form-signin { + width: 100%; + } + + .form-signin .btn { + font-size: 80%; + border-radius: 5rem; + letter-spacing: .1rem; + font-weight: bold; + padding: 1rem; + transition: all 0.2s; + } + + .form-label-group { + position: relative; + margin-bottom: 1rem; + } + + .form-label-group input { + height: auto; + border-radius: 2rem; + } + + .form-label-group>input, + .form-label-group>label { + padding: var(--input-padding-y) var(--input-padding-x); + } + + .form-label-group>label { + position: absolute; + top: 0; + left: 0; + display: block; + width: 100%; + margin-bottom: 0; + /* Override default `
diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index 89b4d16..1f21ff0 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -3,7 +3,7 @@ {# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} {{ form_widget(form) }} {{ form_end(form) }} #} - + {% block content %}
@@ -49,7 +49,7 @@
- + + - +
+ +
+
+ +
- +
+ +
+
+ +
- +
+ +
+
+ +
- +
+ +
@@ -609,7 +629,7 @@
- +
@@ -661,7 +681,7 @@
- +
@@ -741,7 +761,7 @@
- +
@@ -755,7 +775,7 @@
- +
@@ -870,7 +890,7 @@
- +
@@ -906,7 +926,7 @@
- +
@@ -1058,9 +1078,14 @@ {% block javascript %} {{ parent() }} + {#seguir aca#} + {% endblock %} \ No newline at end of file diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index cd55242..1632970 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -4,6 +4,8 @@ file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/app/Resources/views/plantilla/new.html.twig + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/Plantilla.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/app/Resources/STGThemeBundle/views/Default/base.html.twig From 0a28ec042691dddef88f8f950472c3369c5099d7 Mon Sep 17 00:00:00 2001 From: Emma284 Date: Thu, 17 Oct 2019 16:23:22 -0300 Subject: [PATCH 18/23] =?UTF-8?q?Cambios=20en=20padding=20y=20agregada=20d?= =?UTF-8?q?in=C3=A1mica=20de=20algunos=20botones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Resources/views/plantilla/new.html.twig | 169 ++++++++++++++---- nbproject/private/private.xml | 3 + .../Entity/FormularioB/FormularioB.php | 4 + .../Form/FormularioB/FormularioBType.php | 2 + 4 files changed, 141 insertions(+), 37 deletions(-) diff --git a/app/Resources/views/plantilla/new.html.twig b/app/Resources/views/plantilla/new.html.twig index 1f21ff0..1270038 100644 --- a/app/Resources/views/plantilla/new.html.twig +++ b/app/Resources/views/plantilla/new.html.twig @@ -5,7 +5,11 @@ {{ form_end(form) }} #} {% block content %} - +

CHECKLIST DE CATEGORIZACIÓN AMBIENTAL

@@ -60,17 +64,17 @@
- - - + + -
+
-
+
@@ -78,34 +82,34 @@
- -
+
-
+
- -
+
-
+
@@ -113,14 +117,14 @@
- -
+
@@ -132,8 +136,8 @@
- - @@ -144,8 +148,8 @@
- - @@ -156,8 +160,8 @@
- - @@ -169,7 +173,7 @@
- + @@ -177,22 +181,22 @@
- - + +
- - + +
- - @@ -619,18 +623,24 @@

Formulario B

-
+
{{ form_label(form.formularioB.estadoSoporteDigital) }}
-
+
{{ form_widget(form.formularioB.estadoSoporteDigital, {'attr': {'class': form_errors(form.formularioB.estadoSoporteDigital) ? 'form-control is-invalid' : 'form-control'}}) }}
{{ form_errors(form.formularioB.estadoSoporteDigital) }}
-
+
+
+ {{ form_widget(form.formularioB.observacionSoporteDigital, {'attr': {'class': form_errors(form.formularioB.observacionSoporteDigital) ? 'form-control is-invalid' : 'form-control'}}) }} +
+ {{ form_errors(form.formularioB.observacionSoporteDigital) }} +
+
@@ -1078,14 +1088,99 @@ {% block javascript %} {{ parent() }} - {#seguir aca#} - {% endblock %} \ No newline at end of file diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 1632970..297a493 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -5,7 +5,10 @@ file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/app/Resources/views/plantilla/new.html.twig file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/Plantilla.php + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Form/FormularioB/FormularioBType.php file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/app/Resources/STGThemeBundle/views/Default/base.html.twig + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/web/bundles/stgtheme/css/custom.css + file:/E:/Users/MODERNIZACION02/Documents/NetBeansProjects/ChecklistMaker/src/AppBundle/Entity/FormularioB/FormularioB.php diff --git a/src/AppBundle/Entity/FormularioB/FormularioB.php b/src/AppBundle/Entity/FormularioB/FormularioB.php index bc688e3..1cf6653 100644 --- a/src/AppBundle/Entity/FormularioB/FormularioB.php +++ b/src/AppBundle/Entity/FormularioB/FormularioB.php @@ -28,6 +28,10 @@ class FormularioB */ private $estadoSoporteDigital; + /** + * @ORM\Column(name="observacionSoporteDigital", type="string") + */ + private $observacionSoporteDigital; /** * * @ORM\Column(name="codigoExcel", type="string") diff --git a/src/AppBundle/Form/FormularioB/FormularioBType.php b/src/AppBundle/Form/FormularioB/FormularioBType.php index 0786b83..c4417c5 100644 --- a/src/AppBundle/Form/FormularioB/FormularioBType.php +++ b/src/AppBundle/Form/FormularioB/FormularioBType.php @@ -11,6 +11,7 @@ use AppBundle\Form\FormularioB\RiesgosType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; class FormularioBType extends AbstractType @@ -25,6 +26,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'EN BLANCO' => 'EN BLANCO', 'NO PRESENTA' => 'NO PRESENTA', ],]) + ->add('observacionSoporteDigital', TextareaType::class) ->add('ingresarCodigoExcel', ChoiceType::class, ['label' => 'Ingresar código en excel:', 'choices' => [ '' => null, 'HECHO' => 'HECHO', From 6b0e7aa30133bf14d3a5681e25023d14bd20dcc9 Mon Sep 17 00:00:00 2001 From: Emma284 Date: Fri, 18 Oct 2019 13:05:17 -0300 Subject: [PATCH 19/23] Agregados popovers y el estilo al twig de base --- .../views/Default/base.html.twig | 9 + app/Resources/views/plantilla/new.html.twig | 162 ++++++++++++++---- .../FormularioB/EmisionDeResiduosType.php | 48 +++--- .../Form/FormularioB/LocalizacionType.php | 16 +- .../Form/FormularioB/RiesgosType.php | 28 +-- 5 files changed, 184 insertions(+), 79 deletions(-) diff --git a/app/Resources/STGThemeBundle/views/Default/base.html.twig b/app/Resources/STGThemeBundle/views/Default/base.html.twig index 6b57ae3..860c08f 100644 --- a/app/Resources/STGThemeBundle/views/Default/base.html.twig +++ b/app/Resources/STGThemeBundle/views/Default/base.html.twig @@ -27,6 +27,14 @@ {% block nav %} +