Commit 9a871b71d0068f16384fce7294a4b4e0850788f3
1 parent
79fb73363e
Exists in
master
añadido la fecha de ingreso a ubv al formulario, entidad adscripcion, y registrationController
Showing
6 changed files
with
50 additions
and
6 deletions
Show diff stats
.gitignore
app/sessions/sess_bgvgescqjdgk1dlrb0koron6v2
1 | -_sf2_attributes|a:4:{s:15:"_csrf/solicitar";s:43:"RLF62VSfJLAlMnifYVXncsvGx3ZFbTP1frw4-tY49t8";s:18:"_csrf/authenticate";s:43:"kGpdaDAMIF5qk2UnjTTFudnDG6lv5qI1e0IiAS8qsfE";s:14:"_security_main";s:387:"C:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":299:{a:3:{i:0;N;i:1;s:4:"main";i:2;s:259:"a:4:{i:0;C:25:"AppBundle\Entity\Usuarios":106:{a:3:{i:0;i:11;i:1;s:8:"wramones";i:2;s:60:"$2y$13$UN60aw0H6QLaO5k.ghyvIOrQjW1UPt210b6ReDJUgQGZ7VK9SwoeK";}}i:1;b:1;i:2;a:1:{i:0;C:21:"AppBundle\Entity\Role":38:{a:2:{i:0;i:3;i:1;s:12:"ROLE_DOCENTE";}}}i:3;a:0:{}}";}}";s:10:"_csrf/user";s:43:"8jwP_9MNqXeJDV5zeplCA4ORQkAKirc090Ms8MMTxNM";}_sf2_flashes|a:0:{}_sf2_meta|a:3:{s:1:"u";i:1467903770;s:1:"c";i:1467903769;s:1:"l";s:1:"0";} | ||
2 | \ No newline at end of file | 1 | \ No newline at end of file |
2 | +_sf2_attributes|a:4:{s:15:"_csrf/solicitar";s:43:"RLF62VSfJLAlMnifYVXncsvGx3ZFbTP1frw4-tY49t8";s:18:"_csrf/authenticate";s:43:"kGpdaDAMIF5qk2UnjTTFudnDG6lv5qI1e0IiAS8qsfE";s:14:"_security_main";s:387:"C:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":299:{a:3:{i:0;N;i:1;s:4:"main";i:2;s:259:"a:4:{i:0;C:25:"AppBundle\Entity\Usuarios":106:{a:3:{i:0;i:11;i:1;s:8:"wramones";i:2;s:60:"$2y$13$UN60aw0H6QLaO5k.ghyvIOrQjW1UPt210b6ReDJUgQGZ7VK9SwoeK";}}i:1;b:1;i:2;a:1:{i:0;C:21:"AppBundle\Entity\Role":38:{a:2:{i:0;i:3;i:1;s:12:"ROLE_DOCENTE";}}}i:3;a:0:{}}";}}";s:10:"_csrf/user";s:43:"8jwP_9MNqXeJDV5zeplCA4ORQkAKirc090Ms8MMTxNM";}_sf2_flashes|a:0:{}_sf2_meta|a:3:{s:1:"u";i:1467905617;s:1:"c";i:1467903769;s:1:"l";s:1:"0";} | ||
3 | \ No newline at end of file | 3 | \ No newline at end of file |
src/AppBundle/Controller/RegistrationController.php
@@ -79,6 +79,7 @@ class RegistrationController extends Controller | @@ -79,6 +79,7 @@ class RegistrationController extends Controller | ||
79 | $adscripcion->setTrabajo($nombreTrabajo); | 79 | $adscripcion->setTrabajo($nombreTrabajo); |
80 | $adscripcion->setPregrado($nombrePregrado); | 80 | $adscripcion->setPregrado($nombrePregrado); |
81 | $adscripcion->setIdRolInstitucion($this->getUser()->getIdRolInstitucion()); | 81 | $adscripcion->setIdRolInstitucion($this->getUser()->getIdRolInstitucion()); |
82 | + $adscripcion->setFechaIngreso($form->get('fecha_ingreso')->getData()); | ||
82 | 83 | ||
83 | 84 | ||
84 | if ($form->get('escala')->getData()){ | 85 | if ($form->get('escala')->getData()){ |
src/AppBundle/Entity/Adscripcion.php
@@ -43,6 +43,12 @@ class Adscripcion | @@ -43,6 +43,12 @@ class Adscripcion | ||
43 | * }) | 43 | * }) |
44 | */ | 44 | */ |
45 | protected $idRolInstitucion; | 45 | protected $idRolInstitucion; |
46 | + | ||
47 | + /** @ORM\Column(type="date", nullable=false, options={"comment" = "Fecha de de Ingreso a la Institucion"}) | ||
48 | + /** | ||
49 | + * @Assert\Date() | ||
50 | + */ | ||
51 | + private $fecha_ingreso; | ||
46 | 52 | ||
47 | 53 | ||
48 | /** | 54 | /** |
@@ -361,6 +367,28 @@ class Adscripcion | @@ -361,6 +367,28 @@ class Adscripcion | ||
361 | } | 367 | } |
362 | 368 | ||
363 | 369 | ||
370 | + /** | ||
371 | + * Set fecha_escala | ||
372 | + * | ||
373 | + * @param \DateTime $fecha_escala | ||
374 | + * @return Comment | ||
375 | + */ | ||
376 | + public function setFechaIngreso($fecha_ingreso) | ||
377 | + { | ||
378 | + $this->fecha_ingreso = $fecha_ingreso; | ||
379 | + | ||
380 | + return $this; | ||
381 | + } | ||
382 | + | ||
383 | + /** | ||
384 | + * Get fecha_escala | ||
385 | + * | ||
386 | + * @return \DateTime | ||
387 | + */ | ||
388 | + public function getFechaIngreso() | ||
389 | + { | ||
390 | + return $this->fecha_ingreso; | ||
391 | + } | ||
364 | 392 | ||
365 | 393 | ||
366 | } | 394 | } |
src/AppBundle/Entity/DocenteEscala.php
@@ -42,6 +42,7 @@ class DocenteEscala | @@ -42,6 +42,7 @@ class DocenteEscala | ||
42 | */ | 42 | */ |
43 | protected $idRolInstitucion; | 43 | protected $idRolInstitucion; |
44 | 44 | ||
45 | + | ||
45 | /** | 46 | /** |
46 | * @var \AppBundle\Entity\Escalafones | 47 | * @var \AppBundle\Entity\Escalafones |
47 | * | 48 | * |
@@ -144,6 +145,17 @@ class DocenteEscala | @@ -144,6 +145,17 @@ class DocenteEscala | ||
144 | } | 145 | } |
145 | 146 | ||
146 | /** | 147 | /** |
148 | + * Get fecha_creacion | ||
149 | + * | ||
150 | + * @return \DateTime | ||
151 | + */ | ||
152 | +public function getFechaCreacion() | ||
153 | +{ | ||
154 | + return $this->fecha_creacion; | ||
155 | +} | ||
156 | + | ||
157 | + | ||
158 | + /** | ||
147 | * Set fecha_escala | 159 | * Set fecha_escala |
148 | * | 160 | * |
149 | * @param \DateTime $fecha_escala | 161 | * @param \DateTime $fecha_escala |
@@ -163,9 +175,10 @@ public function setFechaEscala($fecha_escala) | @@ -163,9 +175,10 @@ public function setFechaEscala($fecha_escala) | ||
163 | */ | 175 | */ |
164 | public function getFechaEscala() | 176 | public function getFechaEscala() |
165 | { | 177 | { |
166 | - return $this->postedon; | 178 | + return $this->fecha_escala; |
167 | } | 179 | } |
168 | 180 | ||
181 | + | ||
169 | /** | 182 | /** |
170 | * Set idRolInstitucion | 183 | * Set idRolInstitucion |
171 | * | 184 | * |
src/AppBundle/Form/UserType.php
1 | <?php | 1 | <?php |
2 | /** | 2 | /** |
3 | - * Created by PhpStorm. | ||
4 | - * User: ubv-cipee | 3 | + * Created by Netbeans. |
4 | + * User: Wilmer Ramones | ||
5 | * Date: 29/06/16 | 5 | * Date: 29/06/16 |
6 | * Time: 09:07 AM | 6 | * Time: 09:07 AM |
7 | + * Modificado: 07/07/2016 | ||
7 | */ | 8 | */ |
8 | 9 | ||
9 | namespace AppBundle\Form; | 10 | namespace AppBundle\Form; |
@@ -28,9 +29,9 @@ class UserType extends AbstractType | @@ -28,9 +29,9 @@ class UserType extends AbstractType | ||
28 | public function buildForm(FormBuilderInterface $builder, array $options) | 29 | public function buildForm(FormBuilderInterface $builder, array $options) |
29 | { | 30 | { |
30 | $builder | 31 | $builder |
31 | - /* ->add('fecha_ingreso', BirthdayType::class, array( | 32 | + ->add('fecha_ingreso', BirthdayType::class, array( |
32 | 'label' => 'Fecha de Ingreso UBV', | 33 | 'label' => 'Fecha de Ingreso UBV', |
33 | - ))*/ | 34 | + )) |
34 | ->add('trabajo', FileType::class, array( | 35 | ->add('trabajo', FileType::class, array( |
35 | 'label' => 'Digital Constancia Trabajo', | 36 | 'label' => 'Digital Constancia Trabajo', |
36 | 'constraints' => array( | 37 | 'constraints' => array( |