diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 9d840c4..0000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "web/assets/vendor/" -} \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index a5f7624..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -sym_cea \ No newline at end of file diff --git a/app/Resources/views/solicitudes/register.html.twig~ b/app/Resources/views/solicitudes/register.html.twig~ deleted file mode 100644 index 2da806d..0000000 --- a/app/Resources/views/solicitudes/register.html.twig~ +++ /dev/null @@ -1,44 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - {% form_theme form 'bootstrap_3_horizontal_layout.html.twig' %} - {{ form_start(form) }} - {{ form_widget(form) }} - - -{% endblock %} - -{% block stylesheets %} - {{ parent() }} - -{% endblock %} - - -{% block javascripts %} - {{ parent() }} - -{% endblock %} diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep deleted file mode 100755 index e69de29..0000000 diff --git a/app/config/parameters.yml~ b/app/config/parameters.yml~ deleted file mode 100644 index 524562b..0000000 --- a/app/config/parameters.yml~ +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated during the composer install -parameters: - adscripcion_directory: '%kernel.root_dir%/../web/uploads/solicitudes' - database_host: 127.0.0.1 - database_port: null - database_name: cea_db_sym - database_user: wilmer - database_password: 17135525 - mailer_transport: gmail - mailer_host: smtp.gmail.com - mailer_user: wilmer.ramones@gmail.com - mailer_password: 07102009RR - secret: as47d657ew8r74654j8974k51sd4fg65a4s984 diff --git a/app/config/security.yml~ b/app/config/security.yml~ deleted file mode 100644 index 792d5ab..0000000 --- a/app/config/security.yml~ +++ /dev/null @@ -1,39 +0,0 @@ -# To get started with security, check out the documentation: -# http://symfony.com/doc/current/book/security.html -security: - encoders: - AppBundle\Entity\Usuarios: - algorithm: bcrypt - - # http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers - providers: - our_db_provider: - entity: - class: AppBundle:Usuarios - property: username - - firewalls: - main: - anonymous: ~ - http_basic: ~ - provider: our_db_provider - form_login: - login_path: /login - check_path: /login - csrf_token_generator: security.csrf.token_manager - logout: - path: /logout - target: / - - - # activate different ways to authenticate - - # http_basic: ~ - # http://symfony.com/doc/current/book/security.html#a-configuring-how-your-users-will-authenticate - - # form_login: ~ - # http://symfony.com/doc/current/cookbook/security/form_login_setup.html - access_control: - - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/admin, roles: ROLE_ADMINISTRADOR } - - { path: ^/, roles: IS_AUTHENTICATED_ANONYMOUSLY } diff --git a/app/logs/.gitkeep b/app/logs/.gitkeep deleted file mode 100755 index e69de29..0000000 diff --git a/src/AppBundle/Controller/DefaultController.php~ b/src/AppBundle/Controller/DefaultController.php~ deleted file mode 100644 index 5d797a2..0000000 --- a/src/AppBundle/Controller/DefaultController.php~ +++ /dev/null @@ -1,137 +0,0 @@ -createForm('AppBundle\Form\SolicitarType'); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - - //1. obtener el rol-institucion-persona - $rol = $this->getDoctrine()->getRepository( - 'AppBundle:RolInstitucion')->findOneByIdRol( - $this->getDoctrine()->getRepository( - 'AppBundle:Rol')->findOneByIdPersona( - $this->getDoctrine()->getRepository('AppBundle:Persona') - ->findOneByCedulaPasaporte($form->get('cedula')->getData())->getId())); - - //si no existe el rol del docente, enviar correo al encargado de la región para verificar. - if (!$rol) { - throw $this->createNotFoundException( - 'No product found for id '. $form->get('cedula')->getData() - ); - } - - //si el docente existe, crea el nombre de usuario. - $usuario = mb_strtolower($rol->getIdRol()->getIdPersona()->getPrimerNombre()[0] .$rol->getIdRol()->getIdPersona()->getPrimerApellido()); - //busca en la base de datos para ver si ese nombre de usuario ya existe - $credenciales = $this->getDoctrine()->getRepository('AppBundle:Usuarios')->findOneByUsername($usuario); - if(!$credenciales){ //si no existe, procede a crear usuario y contraseña. - $login = new Usuarios(); - $login->setUsername($usuario); - $login->setPlainPassword($form->get('cedula')->getData()); - $password = $this->get('security.password_encoder') - ->encodePassword($login, $login->getPlainPassword()); //encripta la contraseña - $login->setPassword($password); - $login->setIdRolInstitucion($rol); - $permiso = $this->getDoctrine()->getRepository('AppBundle:Role')->findOneById(3); - $login->addRol($permiso); //le añade la permisología básica de docente - $em = $this->getDoctrine()->getManager(); - $em->persist($login); - $em->flush(); //guarda en la base de datos - - - $message = \Swift_Message::newInstance() - ->setSubject('Bienvenido al sistema CEA@UBV') - ->setFrom('wilmer.ramones@gmail.com') - ->setTo($form->get('correo')->getData()) - ->setBody( - $this->renderView( - 'correos/solicitud_adscripcion.html.twig', - array( - 'nombres' => $form->get('nombres')->getData(), - 'apellidos' => $form->get('apellidos')->getData(), - 'usuario' => $login->getUsername(), - 'contra' => $login->getPlainPassword(), - - ) - ), - 'text/html' - ) - /* - * If you also want to include a plaintext version of the message - ->addPart( - $this->renderView( - 'Emails/registration.txt.twig', - array('name' => $name) - ), - 'text/plain' - ) - */ - ; - $this->get('mailer')->send($message); - - - - }else{ - throw $this->createNotFoundException( - 'Ya tiene usuario y contraseña '. $form->get('cedula')->getData() - ); - } - throw $this->createNotFoundException( - 'Docente Encontrado '. $form->get('cedula')->getData() - ); - - - - $message = \Swift_Message::newInstance() - ->setSubject('Hello Email') - ->setFrom('send@example.com') - ->setTo('wilmer.ramones@gmail.com') - ->setBody( - $this->renderView( - 'correos/solicitud_adscripcion.html.twig', - array( - 'nombres' => $form->get('nombres')->getData(), - 'apellidos' => $form->get('apellidos')->getData(), - - ) - ), - 'text/html' - ) - /* - * If you also want to include a plaintext version of the message - ->addPart( - $this->renderView( - 'Emails/registration.txt.twig', - array('name' => $name) - ), - 'text/plain' - ) - */ - ; - //$this->get('mailer')->send($message); - - //$request->getSession()->getFlashBag()->add('success', 'Your email has been sent! Thanks!'); - } - - // replace this example code with whatever you need - return $this->render('default/index.html.twig', array( - 'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'), - 'form' => $form->createView(), - )); - } -} diff --git a/src/AppBundle/Controller/RegistrationController.php~ b/src/AppBundle/Controller/RegistrationController.php~ deleted file mode 100644 index 746f003..0000000 --- a/src/AppBundle/Controller/RegistrationController.php~ +++ /dev/null @@ -1,92 +0,0 @@ -createForm('AppBundle\Form\UserType'); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - //var_dump($user = $this->getUser()->getIdRolInstitucion()->getId()); exit; - // $file stores the uploaded PDF file - /** @var Symfony\Component\HttpFoundation\File\UploadedFile $file */ - $constanciaTrabajo = $form->get('trabajo')->getData(); - $constanciaPregrado = $form->get('pregrado')->getData(); - - - - // Generate a unique name for the file before saving it - $nombreTrabajo = md5(uniqid()).'.'.$constanciaTrabajo->guessExtension(); - $nombrePregrado = md5(uniqid()).'.'.$constanciaPregrado->guessExtension(); - - // Move the file to the directory where brochures are stored - $constanciaTrabajo->move( - $this->container->getParameter('adscripcion_directory'), - $nombreTrabajo - ); - - $constanciaPregrado->move( - $this->container->getParameter('adscripcion_directory'), - $nombrePregrado - ); - - if($form->get('postgrado')->getData()) { - $constanciaPostgrado = $form->get('postgrado')->getData(); - $nombrePostgrado = md5(uniqid()).'.'.$constanciaPregrado->guessExtension(); - $constanciaPostgrado->move( - $this->container->getParameter('adscripcion_directory'), - $nombrePostgrado - ); - } - - // Update the 'brochure' property to store the PDF file name - // instead of its contents - $adscripcion->setTrabajo($nombreTrabajo); - $adscripcion->setPregrado($nombrePregrado); - $adscripcion->setIdRolInstitucion($this->getUser()->getIdRolInstitucion()); - $escala->setIdRolInstitucion($this->getUser()->getIdRolInstitucion()); - $escala->setFechaEscala($form->get('fecha_oposicion')->getData()); - - - - $em = $this->getDoctrine()->getManager(); - $em->persist($adscripcion); - $em->persist($escala); - - $em->flush(); //guarda en la base de datos - - - - - //return $this->redirect($this->generateUrl('app_product_list')); - } - - return $this->render( - 'registration/register.html.twig', - array('form' => $form->createView()) - ); - } -} diff --git a/src/AppBundle/Entity/ActividadDocente.php~ b/src/AppBundle/Entity/ActividadDocente.php~ deleted file mode 100644 index 78e21ee..0000000 --- a/src/AppBundle/Entity/ActividadDocente.php~ +++ /dev/null @@ -1,111 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return ActividadDocente - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } - - - /** - * Get toString - * - * @return string - */ - public function __toString() { - return $this->getNombre(); - } -} diff --git a/src/AppBundle/Entity/Adscripcion.php~ b/src/AppBundle/Entity/Adscripcion.php~ deleted file mode 100644 index 2e3a18a..0000000 --- a/src/AppBundle/Entity/Adscripcion.php~ +++ /dev/null @@ -1,461 +0,0 @@ -trabajo; - } - - public function setTrabajo($trabajo) - { - $this->trabajo = $trabajo; - - return $this; - } - - public function getPregrado() - { - return $this->pregrado; - } - - public function setPregrado($pregrado) - { - $this->pregrado = $pregrado; - - return $this; - } - - public function getPostgrado() - { - return $this->postgrado; - } - - public function setPostgrado($postgrado) - { - $this->postgrado = $postgrado; - - return $this; - } - - public function getAsistente() - { - return $this->asistente; - } - - public function setAsistente($asistente) - { - $this->asistente = $asistente; - - return $this; - } - - /** - * @return mixed - */ - public function getOposicion() - { - return $this->oposicion; - } - - /** - * @param mixed $oposicion - */ - public function setOposicion($oposicion) - { - $this->oposicion = $oposicion; - } - - /** - * @return mixed - */ - public function getAsociado() - { - return $this->asociado; - } - - /** - * @param mixed $asociado - */ - public function setAsociado($asociado) - { - $this->asociado = $asociado; - } - - /** - * @return mixed - */ - public function getAgreado() - { - return $this->agreado; - } - - /** - * @param mixed $agreado - */ - public function setAgreado($agreado) - { - $this->agreado = $agreado; - } - - /** - * @return mixed - */ - public function getTitular() - { - return $this->titular; - } - - /** - * @param mixed $titular - */ - public function setTitular($titular) - { - $this->titular = $titular; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - - /** - * Set idRolInstitucion - * - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion - * @return Usuarios - */ - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion = null) - { - $this->idRolInstitucion = $idRolInstitucion; - - return $this; - } - - /** - * Get idRolInstitucion - * - * @return \AppBundle\Entity\RolInstitucion - */ - public function getIdRolInstitucion() - { - return $this->idRolInstitucion; - } - - - - /** - * Set idLineaInvestigacion - * - * @param \AppBundle\Entity\LineasInvestigacion $idLineaInvestigacion - * @return LineasInvestigacion - */ - public function setIdLineaInvestigacion(\AppBundle\Entity\LineasInvestigacion $idLineaInvestigacion = null) - { - $this->idLineaInvestigacion = $idLineaInvestigacion; - - return $this; - } - - /** - * Get idLineaIvestigacion - * - * @return \AppBundle\Entity\LineasInvestigacion - */ - public function getIdLineaInvestigacion() - { - return $this->idLineaInvestigacion; - } - - - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return Estatus - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus = null) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } - - - - /** - * @ORM\PrePersist - */ - public function setFechaCreacion() - { - $this->fecha_creacion = new \DateTime(); - $this->fecha_ultima_actualizacion = new \DateTime(); - } - - public function getFechaCreacion() - { - return $this->fecha_creacion; - - } - - - /** - * @ORM\PreUpdate - */ - public function setFechaUltimaActualizacion() - { - $this->fecha_utlima_actualizacion = new \DateTime(); - } - - - - /** - * @return mixed - */ - public function getTituloTrabajo() - { - return $this->tituloTrabajo; - } - - - /** - * @param mixed $tituloTrabajo - */ - public function setTituloTrabajo($tituloTrabajo) - { - $this->tituloTrabajo = $tituloTrabajo; - } - - - /** - * Set fecha_escala - * - * @param \DateTime $fecha_escala - * @return Comment - */ - public function setFechaIngreso($fecha_ingreso) - { - $this->fecha_ingreso = $fecha_ingreso; - - return $this; - } - - /** - * Get fecha_escala - * - * @return \DateTime - */ - public function getFechaIngreso() - { - return $this->fecha_ingreso; - } - - - - - - /** - * Get fecha_ultima_actualizacion - * - * @return \DateTime - */ - public function getFechaUltimaActualizacion() - { - return $this->fecha_ultima_actualizacion; - } -} diff --git a/src/AppBundle/Entity/AdscripcionPida.php~ b/src/AppBundle/Entity/AdscripcionPida.php~ deleted file mode 100644 index 96f79cb..0000000 --- a/src/AppBundle/Entity/AdscripcionPida.php~ +++ /dev/null @@ -1,315 +0,0 @@ -id; - } - - - /** - * Set idRolInstitucion - * - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion - * @return Usuarios - */ - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion = null) - { - $this->idRolInstitucion = $idRolInstitucion; - - return $this; - } - - /** - * Get idRolInstitucion - * - * @return \AppBundle\Entity\RolInstitucion - */ - public function getIdRolInstitucion() - { - return $this->idRolInstitucion; - } - - - - - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return Estatus - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus = null) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } - - - - /** - * @ORM\PrePersist - */ - public function setFechaCreacion() - { - $this->fecha_creacion = new \DateTime(); - $this->fecha_ultima_actualizacion = new \DateTime(); - } - - public function getFechaCreacion() - { - return $this->fecha_creacion; - - } - - - /** - * @ORM\PreUpdate - */ - public function setFechaUltimaActualizacion() - { - $this->fecha_utlima_actualizacion = new \DateTime(); - } - - - /** - * Get fecha_ultima_actualizacion - * - * @return \DateTime - */ - public function getFechaUltimaActualizacion() - { - return $this->fecha_ultima_actualizacion; - } - - /** - * Set idPlanHistoricoNacionalEstrategico - * - * @param \AppBundle\Entity\PlanHistoricoNacionalEstrategico $idPlanHistoricoNacionalEstrategico - * @return AdscripcionPida - */ - public function setIdPlanHistoricoNacionalEstrategico(\AppBundle\Entity\PlanHistoricoNacionalEstrategico $idPlanHistoricoNacionalEstrategico = null) - { - $this->idPlanHistoricoNacionalEstrategico = $idPlanHistoricoNacionalEstrategico; - - return $this; - } - - /** - * Get idPlanHistoricoNacionalEstrategico - * - * @return \AppBundle\Entity\PlanHistoricoNacionalEstrategico - */ - public function getIdPlanHistoricoNacionalEstrategico() - { - return $this->idPlanHistoricoNacionalEstrategico; - } - - /** - * Set idActividadDocente - * - * @param \AppBundle\Entity\ActividadDocente $idActividadDocente - * @return AdscripcionPida - */ - public function setIdActividadDocente(\AppBundle\Entity\ActividadDocente $idActividadDocente = null) - { - $this->idActividadDocente = $idActividadDocente; - - return $this; - } - - /** - * Get idActividadDocente - * - * @return \AppBundle\Entity\ActividadDocente - */ - public function getIdActividadDocente() - { - return $this->idActividadDocente; - } - - - - - /** - * Set idPidaPlazo - * - * @param \AppBundle\Entity\PidaPlazo $idPidaPlazo - * @return AdscripcionPida - */ - public function setIdPidaPlazo(\AppBundle\Entity\PidaPlazo $idPidaPlazo = null) - { - $this->idPidaPlazo = $idPidaPlazo; - - return $this; - } - - /** - * Get idPidaPlazo - * - * @return \AppBundle\Entity\PidaPlazo - */ - public function getIdPidaPlazo() - { - return $this->idPidaPlazo; - } - - /** - * Set idPidaEstatus - * - * @param \AppBundle\Entity\PidaEstatus $idPidaEstatus - * @return AdscripcionPida - */ - public function setIdPidaEstatus(\AppBundle\Entity\PidaEstatus $idPidaEstatus) - { - $this->idPidaEstatus = $idPidaEstatus; - - return $this; - } - - /** - * Get idPidaEstatus - * - * @return \AppBundle\Entity\PidaEstatus - */ - public function getIdPidaEstatus() - { - return $this->idPidaEstatus; - } -} diff --git a/src/AppBundle/Entity/Ascenso.php~ b/src/AppBundle/Entity/Ascenso.php~ deleted file mode 100644 index 224535b..0000000 --- a/src/AppBundle/Entity/Ascenso.php~ +++ /dev/null @@ -1,623 +0,0 @@ -fecha_creacion = new \DateTime(); - $this->fecha_ultima_actualizacion = new \DateTime(); - } - - public function getFechaCreacion() - { - return $this->fecha_creacion; - - } - - - /** - * @ORM\PreUpdate - */ - public function setFechaUltimaActualizacion() - { - $this->fecha_utlima_actualizacion = new \DateTime(); - } - - - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set trabajo - * - * @param string $trabajo - * @return Ascenso - */ - public function setTrabajo($trabajo) - { - $this->trabajo = $trabajo; - - return $this; - } - - /** - * Get trabajo - * - * @return string - */ - public function getTrabajo() - { - return $this->trabajo; - } - - /** - * Set expediente - * - * @param string $expediente - * @return Ascenso - */ - public function setExpediente($expediente) - { - $this->expediente = $expediente; - - return $this; - } - - /** - * Get expediente - * - * @return string - */ - public function getExpediente() - { - return $this->expediente; - } - - /** - * Set pida - * - * @param string $pida - * @return Ascenso - */ - public function setPida($pida) - { - $this->pida = $pida; - - return $this; - } - - /** - * Get pida - * - * @return string - */ - public function getPida() - { - return $this->pida; - } - - /** - * Set nai - * - * @param string $nai - * @return Ascenso - */ - public function setNai($nai) - { - $this->nai = $nai; - - return $this; - } - - /** - * Get nai - * - * @return string - */ - public function getNai() - { - return $this->nai; - } - - /** - * Set investigacion - * - * @param string $investigacion - * @return Ascenso - */ - public function setInvestigacion($investigacion) - { - $this->investigacion = $investigacion; - - return $this; - } - - /** - * Get investigacion - * - * @return string - */ - public function getInvestigacion() - { - return $this->investigacion; - } - - /** - * Set pertinencia - * - * @param string $pertinencia - * @return Ascenso - */ - public function setPertinencia($pertinencia) - { - $this->pertinencia = $pertinencia; - - return $this; - } - - /** - * Get pertinencia - * - * @return string - */ - public function getPertinencia() - { - return $this->pertinencia; - } - - /** - * Set tituloTrabajo - * - * @param string $tituloTrabajo - * @return Ascenso - */ - public function setTituloTrabajo($tituloTrabajo) - { - $this->tituloTrabajo = $tituloTrabajo; - - return $this; - } - - /** - * Get tituloTrabajo - * - * @return string - */ - public function getTituloTrabajo() - { - return $this->tituloTrabajo; - } - - /** - * Set observacion - * - * @param string $observacion - * @return Ascenso - */ - public function setObservacion($observacion) - { - $this->observacion = $observacion; - - return $this; - } - - /** - * Get observacion - * - * @return string - */ - public function getObservacion() - { - return $this->observacion; - } - - /** - * Get fecha_ultima_actualizacion - * - * @return \DateTime - */ - public function getFechaUltimaActualizacion() - { - return $this->fecha_ultima_actualizacion; - } - - /** - * Set idRolInstitucion - * - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion - * @return Ascenso - */ - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion) - { - $this->idRolInstitucion = $idRolInstitucion; - - return $this; - } - - /** - * Get idRolInstitucion - * - * @return \AppBundle\Entity\RolInstitucion - */ - public function getIdRolInstitucion() - { - return $this->idRolInstitucion; - } - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return Ascenso - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } - - - - - - /** - * Set idEscalafones - * - * @param \AppBundle\Entity\Escalafones $idEscalafones - * @return Ascenso - */ - public function setIdEscalafones(\AppBundle\Entity\Escalafones $idEscalafones) - { - $this->idEscalafones = $idEscalafones; - - return $this; - } - - /** - * Get idEscalafones - * - * @return \AppBundle\Entity\Escalafones - */ - public function getIdEscalafones() - { - return $this->idEscalafones; - } - - - - /** - * Constructor - */ - public function __construct() - { - $this->tutoresAscenso = new \Doctrine\Common\Collections\ArrayCollection(); - } - - /** - * Add tutoresAscenso - * - * @param \AppBundle\Entity\TutoresAscenso $tutoresAscenso - * @return Ascenso - */ - public function addTutoresAscenso(\AppBundle\Entity\TutoresAscenso $tutoresAscenso) - { - $this->tutoresAscenso[] = $tutoresAscenso; - - return $this; - } - - /** - * Remove tutoresAscenso - * - * @param \AppBundle\Entity\TutoresAscenso $tutoresAscenso - */ - public function removeTutoresAscenso(\AppBundle\Entity\TutoresAscenso $tutoresAscenso) - { - $this->tutoresAscenso->removeElement($tutoresAscenso); - } - - /** - * Get tutoresAscenso - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getTutoresAscenso() - { - return $this->tutoresAscenso; - } - - /** - * - * @return string - */ - - public function __toString() - { - return $this->getIdRolInstitucion()->getIdRol()->getIdPersona()->getPrimerNombre(); - } - - /** - * Set aprobacion - * - * @param string $aprobacion - * @return Ascenso - */ - public function setAprobacion($aprobacion) - { - $this->aprobacion = $aprobacion; - - return $this; - } - - /** - * Get aprobacion - * - * @return string - */ - public function getAprobacion() - { - return $this->aprobacion; - } - - /** - * Set nombreNucelo - * - * @param string $nombreNucelo - * @return Ascenso - */ - public function setNombreNucelo($nombreNucelo) - { - $this->nombreNucelo = $nombreNucelo; - - return $this; - } - - /** - * Get nombreNucelo - * - * @return string - */ - public function getNombreNucelo() - { - return $this->nombreNucelo; - } - - /** - * Set curriculo - * - * @param string $curriculo - * @return Ascenso - */ - public function setCurriculo($curriculo) - { - $this->curriculo = $curriculo; - - return $this; - } - - /** - * Get curriculo - * - * @return string - */ - public function getCurriculo() - { - return $this->curriculo; - } -} diff --git a/src/AppBundle/Entity/CrearAdscripcion.php~ b/src/AppBundle/Entity/CrearAdscripcion.php~ deleted file mode 100644 index 759c854..0000000 --- a/src/AppBundle/Entity/CrearAdscripcion.php~ +++ /dev/null @@ -1,89 +0,0 @@ -trabajo; - } - - public function setBrochure($trabajo) - { - $this->trabajo = $trabajo; - - return $this; - } - - - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Get nombre - * - * @return string - */ - public function __toString() - { - return $this->trabajo; - } - - -} diff --git a/src/AppBundle/Entity/DocenteEscala.php~ b/src/AppBundle/Entity/DocenteEscala.php~ deleted file mode 100644 index 09f7ea7..0000000 --- a/src/AppBundle/Entity/DocenteEscala.php~ +++ /dev/null @@ -1,185 +0,0 @@ -idEscala = $idEscala; - - return $this; - } - - /** - * Get idEscala - * - * @return \AppBundle\Entity\Escalafones - */ - public function getidEscala() - { - return $this->idEscala; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - - /** - * @ORM\PrePersist - */ - public function setFechaCreacion() - { - $this->fecha_creacion = new \DateTime(); - } - - /** - * Set fecha_escala - * - * @param \DateTime $fecha_escala - * @return Comment - */ -public function setFechaEscala($fecha_escala) -{ - $this->fecha_escala = $fecha_escala; - - return $this; -} - -/** - * Get fecha_escala - * - * @return \DateTime - */ -public function getFechaEscala() -{ - return $this->postedon; -} - - /** - * Set idRolInstitucion - * - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion - * @return Usuarios - */ - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion = null) - { - $this->idRolInstitucion = $idRolInstitucion; - - return $this; - } - - /** - * Get idRolInstitucion - * - * @return \AppBundle\Entity\RolInstitucion - */ - public function getIdRolInstitucion() - { - return $this->idRolInstitucion; - } - - - - /** - * Set idEscala - * - * @param \AppBundle\Entity\Escalafones $idEscala - * @return Usuarios - */ - public function setIdEscala(\AppBundle\Entity\Escalafones $idEscala = null) - { - $this->idEscala = $idEscala; - - return $this; - } - - /** - * Get idEscala - * - * @return \AppBundle\Entity\Escalafones - */ - public function getidEscala() - { - return $this->idEscala; - } - - - - -} diff --git a/src/AppBundle/Entity/DocenteServicio.php~ b/src/AppBundle/Entity/DocenteServicio.php~ deleted file mode 100644 index 6a9a52c..0000000 --- a/src/AppBundle/Entity/DocenteServicio.php~ +++ /dev/null @@ -1,194 +0,0 @@ -. - */ - -namespace AppBundle\Entity; -use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Validator\Constraints as Assert; - -/** - * DocenteServicio - * - * @ORM\Table(name="docente_servicio" ) - * @ORM\Entity - * @ORM\HasLifecycleCallbacks() - */ -class DocenteServicio { - - /** - * @var integer - * - * @ORM\Column(name="id", type="integer", nullable=false, options={"comment" = "Identificador de la Adscripcion"}) - * @ORM\Id - * @ORM\GeneratedValue(strategy="IDENTITY") - * @ORM\SequenceGenerator(sequenceName="adscripcion_id_seq", allocationSize=1, initialValue=1) - */ - private $id; - - - - /** - * @var \AppBundle\Entity\RolInstitucion - * - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\RolInstitucion") - * @ORM\JoinColumns({ - * @ORM\JoinColumn(name="id_rol_institucion", referencedColumnName="id", nullable=false) - * }) - */ - protected $idRolInstitucion; - - - /** - * @var \AppBundle\Entity\ServiciosCe - * - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\ServiciosCe") - * @ORM\JoinColumns({ - * @ORM\JoinColumn(name="id_servicio_ce", referencedColumnName="id", nullable=false) - * }) - */ - protected $idServicioCe; - - /** @ORM\Column(type="date", nullable=false, options={"comment" = "Fecha de creación de la solicitud"}) - /** - * @Assert\Date() - */ - private $fechaSolicitud; - - /** @ORM\Column(type="date", nullable=false, options={"comment" = "Fecha de actualizada la solicitud"}) - /** - * @Assert\Date() - */ - private $fechaUltimaActualizacion; - - - /** - * @var \AppBundle\Entity\Estatus - * - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Estatus") - * @ORM\JoinColumns({ - * @ORM\JoinColumn(name="id_estatus", referencedColumnName="id", nullable=false) - * }) - */ - protected $idEstatus; - - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - - /** - * Set idRolInstitucion - * - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion - * @return Usuarios - */ - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion = null) - { - $this->idRolInstitucion = $idRolInstitucion; - - return $this; - } - - /** - * Get idRolInstitucion - * - * @return \AppBundle\Entity\RolInstitucion - */ - public function getIdRolInstitucion() - { - return $this->idRolInstitucion; - } - - - /** - * @ORM\PrePersist - */ - public function setFechaSolicitud() - { - $this->fecha_solicitud = new \DateTime(); - $this->fecha_ultima_actualizacion = new \DateTime(); - } - - public function getFechaSolicitud() - { - return $this->fecha_solicitud; - } - - /** - * @ORM\PreUpdate - */ - public function setFechaUltimaActualizacion() - { - $this->fecha_utlima_actualizacion = new \DateTime(); - } - - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return Estatus - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus = null) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } - - - /** - * Set $idServicioCe - * - * @param \AppBundle\Entity\ServiciosCe $idEstatus - * @return ServicioCe - */ - public function setIdServicioCe(\AppBundle\Entity\ServiciosCe $idServicioCe = null) - { - $this->idServicioCe = $idServicioCe; - - return $this; - } - - /** - * Get $idServicioCe - * - * @return \AppBundle\Entity\ServiciosCe - */ - public function getIdServicioCe() - { - return $this->idServicioCe; - } -} diff --git a/src/AppBundle/Entity/Escala.php~ b/src/AppBundle/Entity/Escala.php~ deleted file mode 100644 index 00c22de..0000000 --- a/src/AppBundle/Entity/Escala.php~ +++ /dev/null @@ -1,45 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Get nombre - * - * @return string - */ - public function __toString() - { - return $this->nombre; - } - - - - -} diff --git a/src/AppBundle/Entity/EstadoAcademico.php~ b/src/AppBundle/Entity/EstadoAcademico.php~ deleted file mode 100644 index 1d66588..0000000 --- a/src/AppBundle/Entity/EstadoAcademico.php~ +++ /dev/null @@ -1,88 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Get nombre - * - * @return string - */ - public function __toString() - { - return $this->nombre; - } - - -} \ No newline at end of file diff --git a/src/AppBundle/Entity/GradoAcademico.php~ b/src/AppBundle/Entity/GradoAcademico.php~ deleted file mode 100644 index 8da5128..0000000 --- a/src/AppBundle/Entity/GradoAcademico.php~ +++ /dev/null @@ -1,96 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Set abreviacion - * - * @param string $abreviacion - * @return GradoAcademico - */ - public function setAbreviacion($abreviacion) - { - $this->abreviacion = $abreviacion; - - return $this; - } - - /** - * Get abreviacion - * - * @return string - */ - public function getAbreviacion() - { - return $this->abreviacion; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } -} \ No newline at end of file diff --git a/src/AppBundle/Entity/Inscripcion.php~ b/src/AppBundle/Entity/Inscripcion.php~ deleted file mode 100644 index 9a8eb52..0000000 --- a/src/AppBundle/Entity/Inscripcion.php~ +++ /dev/null @@ -1,171 +0,0 @@ -created = new \DateTime(); - $this->modified = new \DateTime(); - - } - - - /** - * @ORM\PreUpdate - */ - public function preUpdate() - { - $this->modified = new \DateTime(); - - } - - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set idEstadoAcademico - * - * @param \AppBundle\Entity\EstadoAcademico $idEstadoAcademico - * @return Inscripcion - */ - public function setIdEstadoAcademico(\AppBundle\Entity\EstadoAcademico $idEstadoAcademico = null) - { - $this->idEstadoAcademico = $idEstadoAcademico; - - return $this; - } - - /** - * Get idEstadoAcademico - * - * @return \AppBundle\Entity\EstadoAcademico - */ - public function getIdEstadoAcademico() - { - return $this->idEstadoAcademico; - } - - /** - * Set idSeccion - * - * @param \AppBundle\Entity\Seccion $idSeccion - * @return Inscripcion - */ - public function setIdSeccion(\AppBundle\Entity\Seccion $idSeccion = null) - { - $this->idSeccion = $idSeccion; - - return $this; - } - - /** - * Get idSeccion - * - * @return \AppBundle\Entity\Seccion - */ - public function getIdSeccion() - { - return $this->idSeccion; - } - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return Inscripcion - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } -} diff --git a/src/AppBundle/Entity/InscripcionCalificacion.php~ b/src/AppBundle/Entity/InscripcionCalificacion.php~ deleted file mode 100644 index 65438f8..0000000 --- a/src/AppBundle/Entity/InscripcionCalificacion.php~ +++ /dev/null @@ -1,113 +0,0 @@ -id; - } - - /** - * Set idInscripcion - * - * @param \AppBundle\Entity\Inscripcion $idInscripcion - * @return InscripcionCalificacion - */ - public function setIdInscripcion(\AppBundle\Entity\Inscripcion $idInscripcion = null) - { - $this->idInscripcion = $idInscripcion; - - return $this; - } - - /** - * Get idInscripcion - * - * @return \AppBundle\Entity\Inscripcion - */ - public function getIdInscripcion() - { - return $this->idInscripcion; - } - - /** - * Set idCalificacion - * - * @param \AppBundle\Entity\Calificacion $idCalificacion - * @return InscripcionCalificacion - */ - public function setIdCalificacion(\AppBundle\Entity\Calificacion $idCalificacion = null) - { - $this->idCalificacion = $idCalificacion; - - return $this; - } - - /** - * Get idCalificacion - * - * @return \AppBundle\Entity\Calificacion - */ - public function getIdCalificacion() - { - return $this->idCalificacion; - } -} \ No newline at end of file diff --git a/src/AppBundle/Entity/MallaCurricular.php~ b/src/AppBundle/Entity/MallaCurricular.php~ deleted file mode 100644 index 773a479..0000000 --- a/src/AppBundle/Entity/MallaCurricular.php~ +++ /dev/null @@ -1,61 +0,0 @@ -seccion = new \Doctrine\Common\Collections\ArrayCollection(); - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set idMallaCurricularUc - * - * @param \AppBundle\Entity\MallaCurricularUc $idMallaCurricularUc - * @return OfertaAcademica - */ - public function setIdMallaCurricularUc(\AppBundle\Entity\MallaCurricularUc $idMallaCurricularUc) - { - $this->idMallaCurricularUc = $idMallaCurricularUc; - - return $this; - } - - /** - * Get idMallaCurricularUc - * - * @return \AppBundle\Entity\MallaCurricularUc - */ - public function getIdMallaCurricularUc() - { - return $this->idMallaCurricularUc; - } - - /** - * Add seccion - * - * @param \AppBundle\Entity\Seccion $seccion - * @return OfertaAcademica - */ - public function addSeccion(\AppBundle\Entity\Seccion $seccion) - { - $this->seccion[] = $seccion; - - return $this; - } - - /** - * Remove seccion - * - * @param \AppBundle\Entity\Seccion $seccion - */ - public function removeSeccion(\AppBundle\Entity\Seccion $seccion) - { - $this->seccion->removeElement($seccion); - } - - /** - * Get seccion - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getSeccion() - { - return $this->seccion; - } - - /** - * Set idOfertaMallaCurricular - * - * @param \AppBundle\Entity\OfertaMallaCurricular $idOfertaMallaCurricular - * @return OfertaAcademica - */ - public function setIdOfertaMallaCurricular(\AppBundle\Entity\OfertaMallaCurricular $idOfertaMallaCurricular) - { - $this->idOfertaMallaCurricular = $idOfertaMallaCurricular; - - return $this; - } - - /** - * Get idOfertaMallaCurricular - * - * @return \AppBundle\Entity\OfertaMallaCurricular - */ - public function getIdOfertaMallaCurricular() - { - return $this->idOfertaMallaCurricular; - } - - - /** - * @ORM\PrePersist() - */ - public function prePersist() - { - $this->fechaCreacion = new \DateTime(); - $this->fechaActualizacion = new \DateTime(); - } - - - /** - * @ORM\PreUpdate() - */ - public function preUpdate() - { - $this->fechaActualizacion = new \DateTime(); - } - - - public function __toString() { - return $this->getIdMallaCurricularUc()->getIdUnidadCurricularVolumen()->getIdUnidadCurricular()->getNombre(); - } -} diff --git a/src/AppBundle/Entity/OfertaMallaCurricular.php~ b/src/AppBundle/Entity/OfertaMallaCurricular.php~ deleted file mode 100644 index ee9af52..0000000 --- a/src/AppBundle/Entity/OfertaMallaCurricular.php~ +++ /dev/null @@ -1,46 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return Periodo - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } - - public function __toString() { - return $this->getNombre(); - } -} diff --git a/src/AppBundle/Entity/Pfg.php~ b/src/AppBundle/Entity/Pfg.php~ deleted file mode 100644 index 1132a99..0000000 --- a/src/AppBundle/Entity/Pfg.php~ +++ /dev/null @@ -1,126 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Set codigo - * - * @param string $codigo - * @return Pfg - */ - public function setCodigo($codigo) - { - $this->codigo = $codigo; - - return $this; - } - - /** - * Get codigo - * - * @return string - */ - public function getCodigo() - { - return $this->codigo; - } - - /** - * Set carreraUbv - * - * @param boolean $carreraUbv - * @return Pfg - */ - public function setCarreraUbv($carreraUbv) - { - $this->carreraUbv = $carreraUbv; - - return $this; - } - - /** - * Get carreraUbv - * - * @return boolean - */ - public function getCarreraUbv() - { - return $this->carreraUbv; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } -} \ No newline at end of file diff --git a/src/AppBundle/Entity/PlanHistoricoNacional.php~ b/src/AppBundle/Entity/PlanHistoricoNacional.php~ deleted file mode 100644 index e75ca4c..0000000 --- a/src/AppBundle/Entity/PlanHistoricoNacional.php~ +++ /dev/null @@ -1,53 +0,0 @@ -nombre; - } - - -} \ No newline at end of file diff --git a/src/AppBundle/Entity/PlanificacionCalificacion.php~ b/src/AppBundle/Entity/PlanificacionCalificacion.php~ deleted file mode 100644 index c66bc9a..0000000 --- a/src/AppBundle/Entity/PlanificacionCalificacion.php~ +++ /dev/null @@ -1,172 +0,0 @@ -id; - } - - /** - * Set idPlanificacionSeccion - * - * @param \AppBundle\Entity\PlanificacionSeccion $idPlanificacionSeccion - * @return PlanificacionCalificacion - */ - public function setIdPlanificacionSeccion(\AppBundle\Entity\PlanificacionSeccion $idPlanificacionSeccion) - { - $this->idPlanificacionSeccion = $idPlanificacionSeccion; - - return $this; - } - - /** - * Get idPlanificacionSeccion - * - * @return \AppBundle\Entity\PlanificacionSeccion - */ - public function getIdPlanificacionSeccion() - { - return $this->idPlanificacionSeccion; - } - - /** - * Set idInscripcion - * - * @param \AppBundle\Entity\Inscripcion $idInscripcion - * @return PlanificacionCalificacion - */ - public function setIdInscripcion(\AppBundle\Entity\Inscripcion $idInscripcion) - { - $this->idInscripcion = $idInscripcion; - - return $this; - } - - /** - * Get idInscripcion - * - * @return \AppBundle\Entity\Inscripcion - */ - public function getIdInscripcion() - { - return $this->idInscripcion; - } - - /** - * Set idCalificacion - * - * @param \AppBundle\Entity\Calificacion $idCalificacion - * @return PlanificacionCalificacion - */ - public function setIdCalificacion(\AppBundle\Entity\Calificacion $idCalificacion) - { - $this->idCalificacion = $idCalificacion; - - return $this; - } - - /** - * Get idCalificacion - * - * @return \AppBundle\Entity\Calificacion - */ - public function getIdCalificacion() - { - return $this->idCalificacion; - } - - /** - * Set idEstatusNota - * - * @param \AppBundle\Entity\EstatusNota $idEstatusNota - * @return PlanificacionCalificacion - */ - public function setIdEstatusNota(\AppBundle\Entity\EstatusNota $idEstatusNota) - { - $this->idEstatusNota = $idEstatusNota; - - return $this; - } - - /** - * Get idEstatusNota - * - * @return \AppBundle\Entity\EstatusNota - */ - public function getIdEstatusNota() - { - return $this->idEstatusNota; - } -} diff --git a/src/AppBundle/Entity/PlanificacionSeccion.php~ b/src/AppBundle/Entity/PlanificacionSeccion.php~ deleted file mode 100644 index 3e924ad..0000000 --- a/src/AppBundle/Entity/PlanificacionSeccion.php~ +++ /dev/null @@ -1,406 +0,0 @@ -objetivoEspecifico = new \Doctrine\Common\Collections\ArrayCollection(); - $this->contenido = new \Doctrine\Common\Collections\ArrayCollection(); - $this->estrategia = new \Doctrine\Common\Collections\ArrayCollection(); - $this->evaluacion = new \Doctrine\Common\Collections\ArrayCollection(); - $this->hasCalificacion = new \Doctrine\Common\Collections\ArrayCollection(); - } - - - - /** - * Set observacion - * - * @param string $observacion - * @return PlanificacionSeccion - */ - public function setObservacion($observacion) - { - $this->observacion = $observacion; - - return $this; - } - - /** - * Get observacion - * - * @return string - */ - public function getObservacion() - { - return $this->observacion; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set idtemaUc - * - * @param \AppBundle\Entity\UnidadCurricularVolumenTema $idtemaUc - * @return PlanificacionSeccion - */ - public function setIdtemaUc(\AppBundle\Entity\UnidadCurricularVolumenTema $idtemaUc) - { - $this->idtemaUc = $idtemaUc; - - return $this; - } - - /** - * Get idtemaUc - * - * @return \AppBundle\Entity\UnidadCurricularVolumenTema - */ - public function getIdtemaUc() - { - return $this->idtemaUc; - } - - - - /** - * Add contenido - * - * @param \AppBundle\Entity\PlanificacionSeccionContenido $contenido - * @return PlanificacionSeccion - */ - public function addContenido(\AppBundle\Entity\PlanificacionSeccionContenido $contenido) - { - $contenido->setPlanificacionSeccionId($this); - $this->contenido[] = $contenido; - - - return $this; - } - - /** - * Remove contenido - * - * @param \AppBundle\Entity\PlanificacionSeccionContenido $contenido - */ - public function removeContenido(\AppBundle\Entity\PlanificacionSeccionContenido $contenido) - { - $this->contenido->removeElement($contenido); - } - - /** - * Get contenido - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getContenido() - { - return $this->contenido; - } - - /** - * Add estrategia - * - * @param \AppBundle\Entity\PlanificacionSeccionEstrategia $estrategia - * @return PlanificacionSeccion - */ - public function addEstrategium(\AppBundle\Entity\PlanificacionSeccionEstrategia $estrategia) - { - $this->estrategia[] = $estrategia; - - return $this; - } - - /** - * Remove estrategia - * - * @param \AppBundle\Entity\PlanificacionSeccionEstrategia $estrategia - */ - public function removeEstrategium(\AppBundle\Entity\PlanificacionSeccionEstrategia $estrategia) - { - $this->estrategia->removeElement($estrategia); - } - - /** - * Get estrategia - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getEstrategia() - { - return $this->estrategia; - } - - /** - * Add evaluacion - * - * @param \AppBundle\Entity\PlanificacionSeccionEvaluacion $evaluacion - * @return PlanificacionSeccion - */ - public function addEvaluacion(\AppBundle\Entity\PlanificacionSeccionEvaluacion $evaluacion) - { - $this->evaluacion[] = $evaluacion; - - return $this; - } - - /** - * Remove evaluacion - * - * @param \AppBundle\Entity\PlanificacionSeccionEvaluacion $evaluacion - */ - public function removeEvaluacion(\AppBundle\Entity\PlanificacionSeccionEvaluacion $evaluacion) - { - $this->evaluacion->removeElement($evaluacion); - } - - /** - * Get evaluacion - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getEvaluacion() - { - return $this->evaluacion; - } - - /** - * Set seccion - * - * @param \AppBundle\Entity\Seccion $seccion - * @return PlanificacionSeccion - */ - public function setSeccion(\AppBundle\Entity\Seccion $seccion = null) - { - $this->seccion = $seccion; - - return $this; - } - - /** - * Get seccion - * - * @return \AppBundle\Entity\Seccion - */ - public function getSeccion() - { - return $this->seccion; - } - - /** - * @ORM\PrePersist() - */ - public function prePersist() - { - $this->fechaCreacion = new \DateTime(); - $this->fechaUltimaActualizacion = new \DateTime(); - } - - - /** - * @ORM\PreUpdate() - */ - public function preUpdate() - { - $this->fechaUltimaActualizacion = new \DateTime(); - } - - /** - * Get fechaCreacion - * - * @return \DateTime - */ - public function getFechaCreacion() - { - return $this->fechaCreacion; - } - - - /** - * Set fechaCreacion - * - * @param \DateTime $fechaCreacion - * @return PlanificacionSeccion - */ - public function setFechaCreacion($fechaCreacion) - { - $this->fechaCreacion = $fechaCreacion; - - return $this; - } - - /** - * Set fechaUltimaActualizacion - * - * @param \DateTime $fechaUltimaActualizacion - * @return PlanificacionSeccion - */ - public function setFechaUltimaActualizacion($fechaUltimaActualizacion) - { - $this->fechaUltimaActualizacion = $fechaUltimaActualizacion; - - return $this; - } - - /** - * Get fechaUltimaActualizacion - * - * @return \DateTime - */ - public function getFechaUltimaActualizacion() - { - return $this->fechaUltimaActualizacion; - } - - /** - * Add objetivoEspecifico - * - * @param \AppBundle\Entity\PlanificacionSeccionEspecifico $objetivoEspecifico - * @return PlanificacionSeccion - */ - public function addObjetivoEspecifico(\AppBundle\Entity\PlanificacionSeccionEspecifico $objetivoEspecifico) - { - $this->objetivoEspecifico[] = $objetivoEspecifico; - - return $this; - } - - /** - * Remove objetivoEspecifico - * - * @param \AppBundle\Entity\PlanificacionSeccionEspecifico $objetivoEspecifico - */ - public function removeObjetivoEspecifico(\AppBundle\Entity\PlanificacionSeccionEspecifico $objetivoEspecifico) - { - $this->objetivoEspecifico->removeElement($objetivoEspecifico); - } - - /** - * Get objetivoEspecifico - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getObjetivoEspecifico() - { - return $this->objetivoEspecifico; - } - - public function __toString() { - return $this->getSeccion()->getNombre(); - } -} diff --git a/src/AppBundle/Entity/PlanificacionSeccionContenido.php~ b/src/AppBundle/Entity/PlanificacionSeccionContenido.php~ deleted file mode 100644 index 2d7f322..0000000 --- a/src/AppBundle/Entity/PlanificacionSeccionContenido.php~ +++ /dev/null @@ -1,140 +0,0 @@ -conceptual = $conceptual; - - return $this; - } - - /** - * Get conceptual - * - * @return string - */ - public function getConceptual() - { - return $this->conceptual; - } - - /** - * Set procedimental - * - * @param string $procedimental - * @return PlanificacionSeccionContenido - */ - public function setProcedimental($procedimental) - { - $this->procedimental = $procedimental; - - return $this; - } - - /** - * Get procedimental - * - * @return string - */ - public function getProcedimental() - { - return $this->procedimental; - } - - /** - * Set actitudinal - * - * @param string $actitudinal - * @return PlanificacionSeccionContenido - */ - public function setActitudinal($actitudinal) - { - $this->actitudinal = $actitudinal; - - return $this; - } - - /** - * Get actitudinal - * - * @return string - */ - public function getActitudinal() - { - return $this->actitudinal; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - - -} diff --git a/src/AppBundle/Entity/PlanificacionSeccionEspecifico.php~ b/src/AppBundle/Entity/PlanificacionSeccionEspecifico.php~ deleted file mode 100644 index cf9c49c..0000000 --- a/src/AppBundle/Entity/PlanificacionSeccionEspecifico.php~ +++ /dev/null @@ -1,44 +0,0 @@ -id; - } - - /** - * Set tipoInstrumentoEvaluacion - * - * @param string $tipoInstrumentoEvaluacion - * @return PlanificacionSeccionEvaluacion - */ - public function setTipoInstrumentoEvaluacion($tipoInstrumentoEvaluacion) - { - $this->tipoInstrumentoEvaluacion = $tipoInstrumentoEvaluacion; - - return $this; - } - - /** - * Get tipoInstrumentoEvaluacion - * - * @return string - */ - public function getTipoInstrumentoEvaluacion() - { - return $this->tipoInstrumentoEvaluacion; - } - - /** - * Set ponderacion - * - * @param integer $ponderacion - * @return PlanificacionSeccionEvaluacion - */ - public function setPonderacion($ponderacion) - { - $this->ponderacion = $ponderacion; - - return $this; - } - - /** - * Get ponderacion - * - * @return integer - */ - public function getPonderacion() - { - return $this->ponderacion; - } - - /** - * Set fechaEvaluacion - * - * @param \DateTime $fechaEvaluacion - * @return PlanificacionSeccionEvaluacion - */ - public function setFechaEvaluacion($fechaEvaluacion) - { - $this->fechaEvaluacion = $fechaEvaluacion; - - return $this; - } - - /** - * Get fechaEvaluacion - * - * @return \DateTime - */ - public function getFechaEvaluacion() - { - return $this->fechaEvaluacion; - } - - - - /** - * Set idTipoEvaluacion - * - * @param \AppBundle\Entity\TipoEvaluacion $idTipoEvaluacion - * @return PlanificacionSeccionEvaluacion - */ - public function setIdTipoEvaluacion(\AppBundle\Entity\TipoEvaluacion $idTipoEvaluacion) - { - $this->idTipoEvaluacion = $idTipoEvaluacion; - - return $this; - } - - /** - * Get idTipoEvaluacion - * - * @return \AppBundle\Entity\TipoEvaluacion - */ - public function getIdTipoEvaluacion() - { - return $this->idTipoEvaluacion; - } - - /** - * Set idEstatus - * - * @param \AppBundle\Entity\Estatus $idEstatus - * @return PlanificacionSeccionEvaluacion - */ - public function setIdEstatus(\AppBundle\Entity\Estatus $idEstatus) - { - $this->idEstatus = $idEstatus; - - return $this; - } - - /** - * Get idEstatus - * - * @return \AppBundle\Entity\Estatus - */ - public function getIdEstatus() - { - return $this->idEstatus; - } - - /** - * Set idPlanificacionEvaluacion - * - * @param \AppBundle\Entity\PlanificacionSeccion $idPlanificacionEvaluacion - * @return PlanificacionSeccionEvaluacion - */ - public function setIdPlanificacionEvaluacion(\AppBundle\Entity\PlanificacionSeccion $idPlanificacionEvaluacion = null) - { - $this->idPlanificacionEvaluacion = $idPlanificacionEvaluacion; - - return $this; - } - - /** - * Get idPlanificacionEvaluacion - * - * @return \AppBundle\Entity\PlanificacionSeccion - */ - public function getIdPlanificacionEvaluacion() - { - return $this->idPlanificacionEvaluacion; - } - - /** - * Set planificacionSeccionId - * - * @param \AppBundle\Entity\PlanificacionSeccion $planificacionSeccionId - * @return PlanificacionSeccionEvaluacion - */ - public function setPlanificacionSeccionId(\AppBundle\Entity\PlanificacionSeccion $planificacionSeccionId = null) - { - $this->planificacionSeccionId = $planificacionSeccionId; - - return $this; - } - - /** - * Get planificacionSeccionId - * - * @return \AppBundle\Entity\PlanificacionSeccion - */ - public function getPlanificacionSeccionId() - { - return $this->planificacionSeccionId; - } -} diff --git a/src/AppBundle/Entity/RecursosPlanificacion.php~ b/src/AppBundle/Entity/RecursosPlanificacion.php~ deleted file mode 100644 index 5d7302d..0000000 --- a/src/AppBundle/Entity/RecursosPlanificacion.php~ +++ /dev/null @@ -1,46 +0,0 @@ -hasInscripcion = new \Doctrine\Common\Collections\ArrayCollection(); - $this->planificacion = new \Doctrine\Common\Collections\ArrayCollection(); - } - - /** - * Set nombre - * - * @param string $nombre - * @return Seccion - */ - public function setNombre($nombre) - { - $this->nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Set aula - * - * @param string $aula - * @return Seccion - */ - public function setAula($aula) - { - $this->aula = $aula; - - return $this; - } - - /** - * Get aula - * - * @return string - */ - public function getAula() - { - return $this->aula; - } - - /** - * Set cupo - * - * @param string $cupo - * @return Seccion - */ - public function setCupo($cupo) - { - $this->cupo = $cupo; - - return $this; - } - - /** - * Get cupo - * - * @return string - */ - public function getCupo() - { - return $this->cupo; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Add hasInscripcion - * - * @param \AppBundle\Entity\Inscripcion $hasInscripcion - * @return Seccion - */ - public function addHasInscripcion(\AppBundle\Entity\Inscripcion $hasInscripcion) - { - $this->hasInscripcion[] = $hasInscripcion; - - return $this; - } - - /** - * Remove hasInscripcion - * - * @param \AppBundle\Entity\Inscripcion $hasInscripcion - */ - public function removeHasInscripcion(\AppBundle\Entity\Inscripcion $hasInscripcion) - { - $this->hasInscripcion->removeElement($hasInscripcion); - } - - /** - * Get hasInscripcion - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getHasInscripcion() - { - return $this->hasInscripcion; - } - - /** - * Set idTurno - * - * @param \AppBundle\Entity\Turno $idTurno - * @return Seccion - */ - public function setIdTurno(\AppBundle\Entity\Turno $idTurno) - { - $this->idTurno = $idTurno; - - return $this; - } - - /** - * Get idTurno - * - * @return \AppBundle\Entity\Turno - */ - public function getIdTurno() - { - return $this->idTurno; - } - - /** - * Set idRolInstitucion - * - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion - * @return Seccion - */ - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion) - { - $this->idRolInstitucion = $idRolInstitucion; - - return $this; - } - - /** - * Get idRolInstitucion - * - * @return \AppBundle\Entity\RolInstitucion - */ - public function getIdRolInstitucion() - { - return $this->idRolInstitucion; - } - - /** - * Set ofertaAcademica - * - * @param \AppBundle\Entity\OfertaAcademica $ofertaAcademica - * @return Seccion - */ - public function setOfertaAcademica(\AppBundle\Entity\OfertaAcademica $ofertaAcademica = null) - { - $this->ofertaAcademica = $ofertaAcademica; - - return $this; - } - - /** - * Get ofertaAcademica - * - * @return \AppBundle\Entity\OfertaAcademica - */ - public function getOfertaAcademica() - { - return $this->ofertaAcademica; - } - - /** - * - * @return string - */ - - public function __toString() - { - return $this->getNombre(); - } -} diff --git a/src/AppBundle/Entity/TecnicasPlanificacion.php~ b/src/AppBundle/Entity/TecnicasPlanificacion.php~ deleted file mode 100644 index adde6af..0000000 --- a/src/AppBundle/Entity/TecnicasPlanificacion.php~ +++ /dev/null @@ -1,43 +0,0 @@ -nombre; - } - - -} \ No newline at end of file diff --git a/src/AppBundle/Entity/TipoInstrumentoEvaluacion.php~ b/src/AppBundle/Entity/TipoInstrumentoEvaluacion.php~ deleted file mode 100644 index 5f6af00..0000000 --- a/src/AppBundle/Entity/TipoInstrumentoEvaluacion.php~ +++ /dev/null @@ -1,55 +0,0 @@ -nombre; - } - - - - -} diff --git a/src/AppBundle/Entity/Tramo.php~ b/src/AppBundle/Entity/Tramo.php~ deleted file mode 100644 index dbb49f3..0000000 --- a/src/AppBundle/Entity/Tramo.php~ +++ /dev/null @@ -1,75 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * - * @return string - */ - - public function __toString() { - return $this->getNombre(); - } -} \ No newline at end of file diff --git a/src/AppBundle/Entity/Trayecto.php~ b/src/AppBundle/Entity/Trayecto.php~ deleted file mode 100644 index d60eda9..0000000 --- a/src/AppBundle/Entity/Trayecto.php~ +++ /dev/null @@ -1,75 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * - * @return string - */ - - public function __toString() { - return $this->getNombre(); - } -} \ No newline at end of file diff --git a/src/AppBundle/Entity/TrayectoTramoModalidad.php~ b/src/AppBundle/Entity/TrayectoTramoModalidad.php~ deleted file mode 100644 index df364b5..0000000 --- a/src/AppBundle/Entity/TrayectoTramoModalidad.php~ +++ /dev/null @@ -1,58 +0,0 @@ -id; - } - - /** - * Set idTrayecto - * - * @param \AppBundle\Entity\Trayecto $idTrayecto - * @return TrayectoTramoModalidadTipo - */ - public function setIdTrayecto(\AppBundle\Entity\Trayecto $idTrayecto) - { - $this->idTrayecto = $idTrayecto; - - return $this; - } - - /** - * Get idTrayecto - * - * @return \AppBundle\Entity\Trayecto - */ - public function getIdTrayecto() - { - return $this->idTrayecto; - } - - /** - * Set idTramo - * - * @param \AppBundle\Entity\Tramo $idTramo - * @return TrayectoTramoModalidadTipo - */ - public function setIdTramo(\AppBundle\Entity\Tramo $idTramo) - { - $this->idTramo = $idTramo; - - return $this; - } - - /** - * Get idTramo - * - * @return \AppBundle\Entity\Tramo - */ - public function getIdTramo() - { - return $this->idTramo; - } - - /** - * Set idModalidad - * - * @param \AppBundle\Entity\Modalidad $idModalidad - * @return TrayectoTramoModalidadTipo - */ - public function setIdModalidad(\AppBundle\Entity\Modalidad $idModalidad) - { - $this->idModalidad = $idModalidad; - - return $this; - } - - /** - * Get idModalidad - * - * @return \AppBundle\Entity\Modalidad - */ - public function getIdModalidad() - { - return $this->idModalidad; - } - - /** - * Set idTipoUc - * - * @param \AppBundle\Entity\TipoUc $idTipoUc - * @return TrayectoTramoModalidadTipo - */ - public function setIdTipoUc(\AppBundle\Entity\TipoUc $idTipoUc) - { - $this->idTipoUc = $idTipoUc; - - return $this; - } - - /** - * Get idTipoUc - * - * @return \AppBundle\Entity\TipoUc - */ - public function getIdTipoUc() - { - return $this->idTipoUc; - } -} diff --git a/src/AppBundle/Entity/UnidadCurricular.php~ b/src/AppBundle/Entity/UnidadCurricular.php~ deleted file mode 100644 index d4b3000..0000000 --- a/src/AppBundle/Entity/UnidadCurricular.php~ +++ /dev/null @@ -1,135 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Set codigo - * - * @param string $codigo - * @return UnidadCurricular - */ - public function setCodigo($codigo) - { - $this->codigo = $codigo; - - return $this; - } - - /** - * Get codigo - * - * @return string - */ - public function getCodigo() - { - return $this->codigo; - } - - /** - * Set horas - * - * @param string $horas - * @return UnidadCurricular - */ - public function setHoras($horas) - { - $this->horas = $horas; - - return $this; - } - - /** - * Get horas - * - * @return string - */ - public function getHoras() - { - return $this->horas; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } -} \ No newline at end of file diff --git a/src/AppBundle/Entity/UnidadCurricularVolumen.php~ b/src/AppBundle/Entity/UnidadCurricularVolumen.php~ deleted file mode 100644 index a97150e..0000000 --- a/src/AppBundle/Entity/UnidadCurricularVolumen.php~ +++ /dev/null @@ -1,154 +0,0 @@ -id; - } - - /** - * Set idVolumen - * - * @param \AppBundle\Entity\Volumen $idVolumen - * @return UnidadCurricularVolumen - */ - public function setIdVolumen(\AppBundle\Entity\Volumen $idVolumen) - { - $this->idVolumen = $idVolumen; - - return $this; - } - - /** - * Get idVolumen - * - * @return \AppBundle\Entity\Volumen - */ - public function getIdVolumen() - { - return $this->idVolumen; - } - - /** - * Set idUnidadCurricular - * - * @param \AppBundle\Entity\UnidadCurricular $idUnidadCurricular - * @return UnidadCurricularVolumen - */ - public function setIdUnidadCurricular(\AppBundle\Entity\UnidadCurricular $idUnidadCurricular) - { - $this->idUnidadCurricular = $idUnidadCurricular; - - return $this; - } - - /** - * Get idUnidadCurricular - * - * @return \AppBundle\Entity\UnidadCurricular - */ - public function getIdUnidadCurricular() - { - return $this->idUnidadCurricular; - } - - public function __toString() { - return $this->getIdUnidadCurricular(); - } - /** - * Constructor - */ - public function __construct() - { - $this->temas = new \Doctrine\Common\Collections\ArrayCollection(); - } - - /** - * Add temas - * - * @param \AppBundle\Entity\UnidadCurricularVolumenTema $temas - * @return UnidadCurricularVolumen - */ - public function addTema(\AppBundle\Entity\UnidadCurricularVolumenTema $temas) - { - $this->temas[] = $temas; - - return $this; - } - - /** - * Remove temas - * - * @param \AppBundle\Entity\UnidadCurricularVolumenTema $temas - */ - public function removeTema(\AppBundle\Entity\UnidadCurricularVolumenTema $temas) - { - $this->temas->removeElement($temas); - } - - /** - * Get temas - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getTemas() - { - return $this->temas; - } -} diff --git a/src/AppBundle/Entity/UnidadCurricularVolumenTema.php~ b/src/AppBundle/Entity/UnidadCurricularVolumenTema.php~ deleted file mode 100644 index 3809db1..0000000 --- a/src/AppBundle/Entity/UnidadCurricularVolumenTema.php~ +++ /dev/null @@ -1,181 +0,0 @@ -nombre; - } - - - - - - /** - * Set nombre - * - * @param string $nombre - * @return UnidadCurricularVolumenTema - */ - public function setNombre($nombre) - { - $this->nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set idUnidadCurricularVolumen - * - * @param \AppBundle\Entity\UnidadCurricularVolumen $idUnidadCurricularVolumen - * @return UnidadCurricularVolumenTema - */ - public function setIdUnidadCurricularVolumen(\AppBundle\Entity\UnidadCurricularVolumen $idUnidadCurricularVolumen = null) - { - $this->idUnidadCurricularVolumen = $idUnidadCurricularVolumen; - - return $this; - } - - /** - * Get idUnidadCurricularVolumen - * - * @return \AppBundle\Entity\UnidadCurricularVolumen - */ - public function getIdUnidadCurricularVolumen() - { - return $this->idUnidadCurricularVolumen; - } - - /** - * Set objetivoGeneral - * - * @param string $objetivoGeneral - * @return UnidadCurricularVolumenTema - */ - public function setObjetivoGeneral($objetivoGeneral) - { - $this->objetivoGeneral = $objetivoGeneral; - - return $this; - } - - /** - * Get objetivoGeneral - * - * @return string - */ - public function getObjetivoGeneral() - { - return $this->objetivoGeneral; - } - - /** - * Set orden - * - * @param integer $orden - * @return UnidadCurricularVolumenTema - */ - public function setOrden($orden) - { - $this->orden = $orden; - - return $this; - } - - /** - * Get orden - * - * @return integer - */ - public function getOrden() - { - return $this->orden; - } - - -} diff --git a/src/AppBundle/Entity/Usuarios.php~ b/src/AppBundle/Entity/Usuarios.php~ deleted file mode 100644 index caee48b..0000000 --- a/src/AppBundle/Entity/Usuarios.php~ +++ /dev/null @@ -1,274 +0,0 @@ -rol = new \Doctrine\Common\Collections\ArrayCollection(); - } - - - /** - * Set username - * - * @param string $username - * @return Usuarios - */ - public function setUsername($username) - { - $this->username = $username; - - return $this; - } - - /** - * Get username - * - * @return string - */ - public function getUsername() - { - return $this->username; - } - - /** - * Set password - * - * @param string $password - * @return Usuarios - */ - public function setPassword($password) - { - $this->password = $password; - - return $this; - } - - /** - * Get password - * - * @return string - */ - public function getPassword() - { - return $this->password; - } - - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * Set idRolInstitucion - * - * @param \AppBundle\Entity\RolInstitucion $idRolInstitucion - * @return Usuarios - */ - public function setIdRolInstitucion(\AppBundle\Entity\RolInstitucion $idRolInstitucion = null) - { - $this->idRolInstitucion = $idRolInstitucion; - - return $this; - } - - /** - * Get idRolInstitucion - * - * @return \AppBundle\Entity\RolInstitucion - */ - public function getIdRolInstitucion() - { - return $this->idRolInstitucion; - } - - /** - * Add rol - * - * @param \AppBundle\Entity\Role $rol - * @return Role - */ - public function addRol(\AppBundle\Entity\Role $rol) - { - $this->rol[] = $rol; - - return $this; - } - - /** - * Remove rol - * - * @param \AppBundle\Entity\Role $rol - */ - public function removeRol(\AppBundle\Entity\Role $rol) - { - $this->rol->removeElement($rol); - } - - /** - * Get rol - * - * @return \Doctrine\Common\Collections\Collection - */ - public function getRol() - { - return $this->rol; - } - - - public function getRoles() - { - return $this->rol->toArray(); /*IMPORTANTE: el mecanismo de seguridad de Sf2 requiere ésto como un array*/ - } - - public function equals(UserInterface $user) { - return md5($this->getUsername()) == md5($user->getUsername()); - - } - - /** - * Erases the user credentials. - */ - public function eraseCredentials() { - - } - - public function serialize() - { - /* - * ! Don't serialize $roles field ! - */ - return \serialize(array( - $this->id, - $this->username, - $this->password, - )); - } - - /** - * @see \Serializable::unserialize() - */ - public function unserialize($serialized) - { - list ( - $this->id, - $this->username, - $this->password, - ) = \unserialize($serialized); - } - - public function __toString() { - return $this->getuserName(); - } - - public function getPlainPassword() - { - return $this->plainPassword; - } - - public function setPlainPassword($password) - { - $this->plainPassword = $password; - } - - - /** - * Returns the salt that was originally used to encode the password. - * - * This can return null if the password was not encoded using a salt. - * - * @return string|null The salt - */ - public function getSalt() - { - // TODO: Implement getSalt() method. - } -} \ No newline at end of file diff --git a/src/AppBundle/Entity/Volumen.php~ b/src/AppBundle/Entity/Volumen.php~ deleted file mode 100644 index d1cc814..0000000 --- a/src/AppBundle/Entity/Volumen.php~ +++ /dev/null @@ -1,75 +0,0 @@ -nombre = $nombre; - - return $this; - } - - /** - * Get nombre - * - * @return string - */ - public function getNombre() - { - return $this->nombre; - } - - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - - /** - * - * @return string - */ - - public function __toString() { - return $this->getNombre(); - } -} \ No newline at end of file diff --git a/src/AppBundle/Form/UserType.php~ b/src/AppBundle/Form/UserType.php~ deleted file mode 100644 index e9a5ca3..0000000 --- a/src/AppBundle/Form/UserType.php~ +++ /dev/null @@ -1,154 +0,0 @@ -add('fecha_ingreso', BirthdayType::class, array( - 'label' => 'Fecha de Ingreso UBV', - ))*/ - ->add('trabajo', FileType::class, array('label' => 'Digital Constancia Trabajo')) - ->add('pregrado', FileType::class, array('label' => 'Digital Título de Pregrado')) - - ->add('postgrado', FileType::class, array('label' => 'Digital Título de Postgrado','required' => false)) - /*->add('oposicion', CheckboxType::class, array( - 'label' => '¿Tiene Concurso de Oposición?', - 'required' => false, - ))*/ - ->add('escala', EntityType::class, array( - 'label' => false, - 'placeholder' => 'Seleccione escala a la que concurso', - 'required' => false, - /*'attr' => array( - 'class' => 'esc_oposicion' - ),*/ - 'class' => 'AppBundle:Escalafones', - 'choice_label' => 'getNombre', - )) - ->add('fecha_oposicion', BirthdayType::class, array( - 'label' => 'fecha Concurso', - 'label_attr' => array( 'class' => 'esc_oposicion'), - 'required' => false, - /* 'attr' => array( - 'class' => 'esc_oposicion' - )*/ - )) - /*->add('documento_oposicion', FileType::class, array( - 'label' => 'Digital Documento Oposición', - 'label_attr' => array( 'class' => 'esc_oposicion'), - 'required' => false, - 'attr' => array( - 'style' => 'display:none;', - 'class' => 'esc_oposicion' - ) - )) - ->add('area_investigacion', EntityType::class, array( - 'label' => false, - 'attr' => array( - 'class' => 'esc_oposicion' - ), - 'placeholder' => 'Seleccione Area de Investigacion', - 'required' => false, - 'class' => 'AppBundle:AreasInvestigacion', - 'choice_label' => 'getNombre', - )) - ->add('ascenso', CheckboxType::class, array( - 'label' => '¿Ha tenido Ascenso luego del Concurso?', - 'label_attr' => array( 'class' => 'esc_oposicion'), - 'required' => false, - 'attr' => array( - 'class' => 'esc_oposicion' - ) - )) - //Ascensos: - //Asistente - ->add('fecha_ascenso_asistente', BirthdayType::class, array( - 'label' => 'fecha ascenso ASISTENTE', - 'required' => false, - 'label_attr' => array( 'class' => 'esc_asistente'), - 'attr' => array( - 'class' => 'esc_asistente' - ) - )) - - ->add('documento_asistente', FileType::class, array( - 'label' => 'Digital Documento Asistente', - 'label_attr' => array( 'class' => 'esc_asistente'), - 'required' => false, - 'attr' => array( - 'style' => 'display:none;', - 'class' => 'esc_asistente' - ) - )) - - ->add('ascenso2', CheckboxType::class, array( - 'label' => '¿otro Ascenso?', - 'label_attr' => array( 'class' => 'esc_asistente'), - 'required' => false, - 'attr' => array( - 'class' => 'esc_asistente' - ) - )) - - //Agregado - ->add('fecha_ascenso_agregado', BirthdayType::class, array( - 'label' => 'fecha ascenso AGREGADO', - 'label_attr' => array( 'class' => 'esc_agregado'), - 'required' => false, - 'attr' => array( - 'class' => 'esc_agregado' - ) - )) - - ->add('documento_agregado', FileType::class, array( - 'label' => 'Digital Documento agregado', - 'label_attr' => array( 'class' => 'esc_agregado'), - 'required' => false, - 'attr' => array( - 'style' => 'display:none;', - 'class' => 'esc_agregado' - ) - )) - - ->add('ascenso3', CheckboxType::class, array( - 'label' => '¿Otro Ascenso?', - 'label_attr' => array( 'class' => 'esc_agregado'), - 'required' => false, - 'attr' => array( - 'class' => 'esc_agregado' - ) - ))*/ - - ->add('send', SubmitType::class, array('label' => 'Enviar Solicitud')); - - - ; - - - } - - - - -} diff --git a/web/assets/vendor/animate.css/.bower.json b/web/assets/vendor/animate.css/.bower.json deleted file mode 100644 index 902be22..0000000 --- a/web/assets/vendor/animate.css/.bower.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "animate.css", - "main": "./animate.css", - "ignore": [ - ".*", - "*.yml", - "Gemfile", - "Gemfile.lock", - "*.md" - ], - "homepage": "https://github.com/daneden/animate.css", - "version": "3.5.2", - "_release": "3.5.2", - "_resolution": { - "type": "version", - "tag": "3.5.2", - "commit": "dac3dab7b59cb6072b5d0fe23eae3805e370a58c" - }, - "_source": "https://github.com/daneden/animate.css.git", - "_target": "^3.5.2", - "_originalSource": "animate.css", - "_direct": true -} \ No newline at end of file diff --git a/web/assets/vendor/bootstrap/.bower.json b/web/assets/vendor/bootstrap/.bower.json deleted file mode 100644 index d35965f..0000000 --- a/web/assets/vendor/bootstrap/.bower.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "bootstrap", - "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "keywords": [ - "css", - "js", - "less", - "mobile-first", - "responsive", - "front-end", - "framework", - "web" - ], - "homepage": "http://getbootstrap.com", - "license": "MIT", - "moduleType": "globals", - "main": [ - "less/bootstrap.less", - "dist/js/bootstrap.js" - ], - "ignore": [ - "/.*", - "_config.yml", - "CNAME", - "composer.json", - "CONTRIBUTING.md", - "docs", - "js/tests", - "test-infra" - ], - "dependencies": { - "jquery": "1.9.1 - 2" - }, - "version": "3.3.6", - "_release": "3.3.6", - "_resolution": { - "type": "version", - "tag": "v3.3.6", - "commit": "81df608a40bf0629a1dc08e584849bb1e43e0b7a" - }, - "_source": "https://github.com/twbs/bootstrap.git", - "_target": "^3.3.6", - "_originalSource": "bootstrap", - "_direct": true -} \ No newline at end of file diff --git a/web/assets/vendor/bootstrap/grunt/.jshintrc b/web/assets/vendor/bootstrap/grunt/.jshintrc deleted file mode 100644 index 0ea0495..0000000 --- a/web/assets/vendor/bootstrap/grunt/.jshintrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends" : "../js/.jshintrc", - "asi" : false, - "browser" : false, - "es3" : false, - "node" : true -} diff --git a/web/assets/vendor/bootstrap/js/.jscsrc b/web/assets/vendor/bootstrap/js/.jscsrc deleted file mode 100644 index 9544d2d..0000000 --- a/web/assets/vendor/bootstrap/js/.jscsrc +++ /dev/null @@ -1,42 +0,0 @@ -{ - "disallowEmptyBlocks": true, - "disallowKeywords": ["with"], - "disallowMixedSpacesAndTabs": true, - "disallowMultipleLineStrings": true, - "disallowMultipleVarDecl": true, - "disallowQuotedKeysInObjects": "allButReserved", - "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], - "disallowSpaceBeforeBinaryOperators": [","], - "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true }, - "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true }, - "disallowSpacesInsideArrayBrackets": true, - "disallowSpacesInsideParentheses": true, - "disallowTrailingComma": true, - "disallowTrailingWhitespace": true, - "requireCamelCaseOrUpperCaseIdentifiers": true, - "requireCapitalizedConstructors": true, - "requireCommaBeforeLineBreak": true, - "requireDollarBeforejQueryAssignment": true, - "requireDotNotation": true, - "requireLineFeedAtFileEnd": true, - "requirePaddingNewLinesAfterUseStrict": true, - "requirePaddingNewLinesBeforeExport": true, - "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], - "requireSpaceAfterLineComment": true, - "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], - "requireSpaceBetweenArguments": true, - "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true }, - "requireSpacesInConditionalExpression": true, - "requireSpacesInForStatement": true, - "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true }, - "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, - "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true }, - "requireSpacesInsideObjectBrackets": "allButNested", - "validateAlignedFunctionParameters": true, - "validateIndentation": 2, - "validateLineBreaks": "LF", - "validateNewlineAfterArrayElements": true, - "validateQuoteMarks": "'" -} diff --git a/web/assets/vendor/bootstrap/js/.jshintrc b/web/assets/vendor/bootstrap/js/.jshintrc deleted file mode 100644 index a59e1d0..0000000 --- a/web/assets/vendor/bootstrap/js/.jshintrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "asi" : true, - "browser" : true, - "eqeqeq" : false, - "eqnull" : true, - "es3" : true, - "expr" : true, - "jquery" : true, - "latedef" : true, - "laxbreak" : true, - "nonbsp" : true, - "strict" : true, - "undef" : true, - "unused" : true -} diff --git a/web/assets/vendor/bootstrap/less/.csscomb.json b/web/assets/vendor/bootstrap/less/.csscomb.json deleted file mode 100644 index 40695a4..0000000 --- a/web/assets/vendor/bootstrap/less/.csscomb.json +++ /dev/null @@ -1,304 +0,0 @@ -{ - "always-semicolon": true, - "block-indent": 2, - "color-case": "lower", - "color-shorthand": true, - "element-case": "lower", - "eof-newline": true, - "leading-zero": false, - "remove-empty-rulesets": true, - "space-after-colon": 1, - "space-after-combinator": 1, - "space-before-selector-delimiter": 0, - "space-between-declarations": "\n", - "space-after-opening-brace": "\n", - "space-before-closing-brace": "\n", - "space-before-colon": 0, - "space-before-combinator": 1, - "space-before-opening-brace": 1, - "strip-spaces": true, - "unitless-zero": true, - "vendor-prefix-align": true, - "sort-order": [ - [ - "position", - "top", - "right", - "bottom", - "left", - "z-index", - "display", - "float", - "width", - "min-width", - "max-width", - "height", - "min-height", - "max-height", - "-webkit-box-sizing", - "-moz-box-sizing", - "box-sizing", - "-webkit-appearance", - "padding", - "padding-top", - "padding-right", - "padding-bottom", - "padding-left", - "margin", - "margin-top", - "margin-right", - "margin-bottom", - "margin-left", - "overflow", - "overflow-x", - "overflow-y", - "-webkit-overflow-scrolling", - "-ms-overflow-x", - "-ms-overflow-y", - "-ms-overflow-style", - "clip", - "clear", - "font", - "font-family", - "font-size", - "font-style", - "font-weight", - "font-variant", - "font-size-adjust", - "font-stretch", - "font-effect", - "font-emphasize", - "font-emphasize-position", - "font-emphasize-style", - "font-smooth", - "-webkit-hyphens", - "-moz-hyphens", - "hyphens", - "line-height", - "color", - "text-align", - "-webkit-text-align-last", - "-moz-text-align-last", - "-ms-text-align-last", - "text-align-last", - "text-emphasis", - "text-emphasis-color", - "text-emphasis-style", - "text-emphasis-position", - "text-decoration", - "text-indent", - "text-justify", - "text-outline", - "-ms-text-overflow", - "text-overflow", - "text-overflow-ellipsis", - "text-overflow-mode", - "text-shadow", - "text-transform", - "text-wrap", - "-webkit-text-size-adjust", - "-ms-text-size-adjust", - "letter-spacing", - "-ms-word-break", - "word-break", - "word-spacing", - "-ms-word-wrap", - "word-wrap", - "-moz-tab-size", - "-o-tab-size", - "tab-size", - "white-space", - "vertical-align", - "list-style", - "list-style-position", - "list-style-type", - "list-style-image", - "pointer-events", - "-ms-touch-action", - "touch-action", - "cursor", - "visibility", - "zoom", - "flex-direction", - "flex-order", - "flex-pack", - "flex-align", - "table-layout", - "empty-cells", - "caption-side", - "border-spacing", - "border-collapse", - "content", - "quotes", - "counter-reset", - "counter-increment", - "resize", - "-webkit-user-select", - "-moz-user-select", - "-ms-user-select", - "-o-user-select", - "user-select", - "nav-index", - "nav-up", - "nav-right", - "nav-down", - "nav-left", - "background", - "background-color", - "background-image", - "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient", - "filter:progid:DXImageTransform.Microsoft.gradient", - "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", - "filter", - "background-repeat", - "background-attachment", - "background-position", - "background-position-x", - "background-position-y", - "-webkit-background-clip", - "-moz-background-clip", - "background-clip", - "background-origin", - "-webkit-background-size", - "-moz-background-size", - "-o-background-size", - "background-size", - "border", - "border-color", - "border-style", - "border-width", - "border-top", - "border-top-color", - "border-top-style", - "border-top-width", - "border-right", - "border-right-color", - "border-right-style", - "border-right-width", - "border-bottom", - "border-bottom-color", - "border-bottom-style", - "border-bottom-width", - "border-left", - "border-left-color", - "border-left-style", - "border-left-width", - "border-radius", - "border-top-left-radius", - "border-top-right-radius", - "border-bottom-right-radius", - "border-bottom-left-radius", - "-webkit-border-image", - "-moz-border-image", - "-o-border-image", - "border-image", - "-webkit-border-image-source", - "-moz-border-image-source", - "-o-border-image-source", - "border-image-source", - "-webkit-border-image-slice", - "-moz-border-image-slice", - "-o-border-image-slice", - "border-image-slice", - "-webkit-border-image-width", - "-moz-border-image-width", - "-o-border-image-width", - "border-image-width", - "-webkit-border-image-outset", - "-moz-border-image-outset", - "-o-border-image-outset", - "border-image-outset", - "-webkit-border-image-repeat", - "-moz-border-image-repeat", - "-o-border-image-repeat", - "border-image-repeat", - "outline", - "outline-width", - "outline-style", - "outline-color", - "outline-offset", - "-webkit-box-shadow", - "-moz-box-shadow", - "box-shadow", - "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity", - "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha", - "opacity", - "-ms-interpolation-mode", - "-webkit-transition", - "-moz-transition", - "-ms-transition", - "-o-transition", - "transition", - "-webkit-transition-delay", - "-moz-transition-delay", - "-ms-transition-delay", - "-o-transition-delay", - "transition-delay", - "-webkit-transition-timing-function", - "-moz-transition-timing-function", - "-ms-transition-timing-function", - "-o-transition-timing-function", - "transition-timing-function", - "-webkit-transition-duration", - "-moz-transition-duration", - "-ms-transition-duration", - "-o-transition-duration", - "transition-duration", - "-webkit-transition-property", - "-moz-transition-property", - "-ms-transition-property", - "-o-transition-property", - "transition-property", - "-webkit-transform", - "-moz-transform", - "-ms-transform", - "-o-transform", - "transform", - "-webkit-transform-origin", - "-moz-transform-origin", - "-ms-transform-origin", - "-o-transform-origin", - "transform-origin", - "-webkit-animation", - "-moz-animation", - "-ms-animation", - "-o-animation", - "animation", - "-webkit-animation-name", - "-moz-animation-name", - "-ms-animation-name", - "-o-animation-name", - "animation-name", - "-webkit-animation-duration", - "-moz-animation-duration", - "-ms-animation-duration", - "-o-animation-duration", - "animation-duration", - "-webkit-animation-play-state", - "-moz-animation-play-state", - "-ms-animation-play-state", - "-o-animation-play-state", - "animation-play-state", - "-webkit-animation-timing-function", - "-moz-animation-timing-function", - "-ms-animation-timing-function", - "-o-animation-timing-function", - "animation-timing-function", - "-webkit-animation-delay", - "-moz-animation-delay", - "-ms-animation-delay", - "-o-animation-delay", - "animation-delay", - "-webkit-animation-iteration-count", - "-moz-animation-iteration-count", - "-ms-animation-iteration-count", - "-o-animation-iteration-count", - "animation-iteration-count", - "-webkit-animation-direction", - "-moz-animation-direction", - "-ms-animation-direction", - "-o-animation-direction", - "animation-direction" - ] - ] -} diff --git a/web/assets/vendor/bootstrap/less/.csslintrc b/web/assets/vendor/bootstrap/less/.csslintrc deleted file mode 100644 index 005b862..0000000 --- a/web/assets/vendor/bootstrap/less/.csslintrc +++ /dev/null @@ -1,19 +0,0 @@ -{ - "adjoining-classes": false, - "box-sizing": false, - "box-model": false, - "compatible-vendor-prefixes": false, - "floats": false, - "font-sizes": false, - "gradients": false, - "important": false, - "known-properties": false, - "outline-none": false, - "qualified-headings": false, - "regex-selectors": false, - "shorthand": false, - "text-indent": false, - "unique-headings": false, - "universal-selector": false, - "unqualified-attributes": false -} diff --git a/web/assets/vendor/font-awesome/.bower.json b/web/assets/vendor/font-awesome/.bower.json deleted file mode 100644 index 223ed83..0000000 --- a/web/assets/vendor/font-awesome/.bower.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "font-awesome", - "description": "Font Awesome", - "keywords": [], - "homepage": "http://fontawesome.io", - "dependencies": {}, - "devDependencies": {}, - "license": [ - "OFL-1.1", - "MIT", - "CC-BY-3.0" - ], - "main": [ - "less/font-awesome.less", - "scss/font-awesome.scss" - ], - "ignore": [ - "*/.*", - "*.json", - "src", - "*.yml", - "Gemfile", - "Gemfile.lock", - "*.md" - ], - "version": "4.6.3", - "_release": "4.6.3", - "_resolution": { - "type": "version", - "tag": "v4.6.3", - "commit": "0f618911b105195c931ec5d5bef425a2a2806cab" - }, - "_source": "https://github.com/FortAwesome/Font-Awesome.git", - "_target": "^4.6.3", - "_originalSource": "fontawesome", - "_direct": true -} \ No newline at end of file diff --git a/web/assets/vendor/font-awesome/.npmignore b/web/assets/vendor/font-awesome/.npmignore deleted file mode 100644 index 54a691f..0000000 --- a/web/assets/vendor/font-awesome/.npmignore +++ /dev/null @@ -1,42 +0,0 @@ -*.pyc -*.egg-info -*.db -*.db.old -*.swp -*.db-journal - -.coverage -.DS_Store -.installed.cfg -_gh_pages/* - -.idea/* -.svn/* -src/website/static/* -src/website/media/* - -bin -cfcache -develop-eggs -dist -downloads -eggs -parts -tmp -.sass-cache -node_modules - -src/website/settingslocal.py -stunnel.log - -.ruby-version - -# don't need these in the npm package. -src/ -_config.yml -bower.json -component.json -composer.json -CONTRIBUTING.md -Gemfile -Gemfile.lock diff --git a/web/assets/vendor/jquery/.bower.json b/web/assets/vendor/jquery/.bower.json deleted file mode 100644 index a3604d5..0000000 --- a/web/assets/vendor/jquery/.bower.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "jquery", - "main": "dist/jquery.js", - "license": "MIT", - "ignore": [ - "package.json" - ], - "keywords": [ - "jquery", - "javascript", - "browser", - "library" - ], - "homepage": "https://github.com/jquery/jquery-dist", - "version": "2.2.4", - "_release": "2.2.4", - "_resolution": { - "type": "version", - "tag": "2.2.4", - "commit": "c0185ab7c75aab88762c5aae780b9d83b80eda72" - }, - "_source": "https://github.com/jquery/jquery-dist.git", - "_target": "1.9.1 - 2", - "_originalSource": "jquery" -} \ No newline at end of file diff --git a/web/assets/vendor/jquery/src/.jshintrc b/web/assets/vendor/jquery/src/.jshintrc deleted file mode 100644 index ea3549d..0000000 --- a/web/assets/vendor/jquery/src/.jshintrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "boss": true, - "curly": true, - "eqeqeq": true, - "eqnull": true, - "expr": true, - "immed": true, - "noarg": true, - "quotmark": "double", - "undef": true, - "unused": true, - - "sub": true, - - // Support: IE < 10, Android < 4.1 - // The above browsers are failing a lot of tests in the ES5 - // test suite at http://test262.ecmascript.org. - "es3": true, - - "globals": { - "window": true, - "JSON": false, - - "jQuery": true, - "define": true, - "module": true, - "noGlobal": true - } -} diff --git a/web/assets/vendor/lightbox2/.bower.json b/web/assets/vendor/lightbox2/.bower.json deleted file mode 100644 index 99d3d5d..0000000 --- a/web/assets/vendor/lightbox2/.bower.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "lightbox2", - "homepage": "http://lokeshdhakar.com/projects/lightbox2/", - "authors": [ - "Lokesh Dhakar " - ], - "description": "The original Lightbox script. Uses jQuery.", - "main": [ - "./dist/js/lightbox.js", - "./dist/css/lightbox.css", - "./dist/images/close.png", - "./dist/images/loading.gif", - "./dist/images/next.png", - "./dist/images/prev.png" - ], - "keywords": [ - "lightbox", - "lightbox2", - "overlay", - "gallery", - "slideshow", - "images" - ], - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "bower_components" - ], - "dependencies": { - "jquery": "~2" - }, - "version": "2.8.2", - "_release": "2.8.2", - "_resolution": { - "type": "version", - "tag": "v2.8.2", - "commit": "2eedbf5c740e530e7abc78db6cf0ecec408f6512" - }, - "_source": "https://github.com/lokesh/lightbox2.git", - "_target": "^2.8.2", - "_originalSource": "lightbox", - "_direct": true -} \ No newline at end of file diff --git a/web/assets/vendor/select2/.editorconfig b/web/assets/vendor/select2/.editorconfig deleted file mode 100644 index 54f4d3b..0000000 --- a/web/assets/vendor/select2/.editorconfig +++ /dev/null @@ -1,6 +0,0 @@ -[*] -indent_style = space -end_of_line = lf - -[*.js] -indent_size = 2 diff --git a/web/assets/vendor/select2/.jshintignore b/web/assets/vendor/select2/.jshintignore deleted file mode 100644 index ba5a30f..0000000 --- a/web/assets/vendor/select2/.jshintignore +++ /dev/null @@ -1,4 +0,0 @@ -src/js/banner.*.js -src/js/wrapper.*.js -tests/vendor/*.js -tests/helpers.js diff --git a/web/assets/vendor/select2/.jshintrc b/web/assets/vendor/select2/.jshintrc deleted file mode 100644 index 9429926..0000000 --- a/web/assets/vendor/select2/.jshintrc +++ /dev/null @@ -1,25 +0,0 @@ -{ - "bitwise": true, - "camelcase": true, - "curly": true, - "es3": true, - "eqnull": true, - "freeze": true, - "globals": { - "console": false, - "define": false, - "document": false, - "MockContainer": false, - "module": false, - "QUnit": false, - "require": false, - "test": false, - "window": false - }, - "indent": 2, - "maxlen": 80, - "noarg": true, - "nonew": true, - "quotmark": "single", - "undef": true -} diff --git a/web/assets/vendor/select2/.travis.yml b/web/assets/vendor/select2/.travis.yml deleted file mode 100644 index 0af4c69..0000000 --- a/web/assets/vendor/select2/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: node_js - -sudo: false - -node_js: - - 0.10 - -env: - global: - - secure: XMNK8GVxkwKa6oLl7nJwgg/wmY1YDk5rrMd+UXz26EDCsMDbiy1P7GhN2fEiBSLaQ7YfEuvaDcmzQxTrT0YTHp1PDzb2o9J4tIDdEkqPcv1y8xMaYDfmsN0rBPdBwZEg9H5zUgi7OdUbrGswSYxsKCE3x8EOqK89104HyOo1LN4= - - secure: BU5BPRx6H4O3WJ509YPixjUxg+hDF3z2BVJX6NiGmKWweqvCEYFfiiHLwDEgp/ynRcF9vGVi1V4Ly1jq7f8NIajbDZ5q443XchZFYFg78K/EwD5mK6LYt16zb7+Jn0KbzwHeGRGzc9AvcEYlW6i634cSCm4n3BnqtF5PpogSzdw= - -script: - - grunt ci - -notifications: - email: false - irc: - channels: - - "chat.freenode.net#select2" - on_success: change - on_failure: always diff --git a/web/assets/vendor/smooth-scroll/.bower.json b/web/assets/vendor/smooth-scroll/.bower.json deleted file mode 100644 index d1b5203..0000000 --- a/web/assets/vendor/smooth-scroll/.bower.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "smooth-scroll", - "homepage": "https://github.com/cferdinandi/smooth-scroll", - "version": "9.1.4", - "_release": "9.1.4", - "_resolution": { - "type": "version", - "tag": "v9.1.4", - "commit": "d22c49f83c83c809f6806d6a5824f6191e801eea" - }, - "_source": "https://github.com/cferdinandi/smooth-scroll.git", - "_target": "^9.1.4", - "_originalSource": "https://github.com/cferdinandi/smooth-scroll.git", - "_direct": true -} \ No newline at end of file diff --git a/web/assets/vendor/smooth-scroll/.travis.yml b/web/assets/vendor/smooth-scroll/.travis.yml deleted file mode 100755 index 11842a6..0000000 --- a/web/assets/vendor/smooth-scroll/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: node_js -node_js: - - "0.10" -before_script: - - npm install -g gulp -script: gulp test \ No newline at end of file