Commit 92ab0f314df643cb94efe98c96e35f9e1722bc74
1 parent
c7533e4636
Exists in
master
se añada el tiempo necesario de espera entre escalafones
Showing
2 changed files
with
34 additions
and
46 deletions
Show diff stats
src/AppBundle/Entity/Escalafones.php
| @@ -35,6 +35,13 @@ class Escalafones | @@ -35,6 +35,13 @@ class Escalafones | ||
| 35 | */ | 35 | */ |
| 36 | private $id; | 36 | private $id; |
| 37 | 37 | ||
| 38 | + /** | ||
| 39 | + * @var integer | ||
| 40 | + * | ||
| 41 | + * @ORM\Column(name="tiempo", type="integer", nullable=false, options={"comment" = "Tiempo necesario para obtener la escala"}) | ||
| 42 | + */ | ||
| 43 | + private $tiempo; | ||
| 44 | + | ||
| 38 | 45 | ||
| 39 | 46 | ||
| 40 | 47 | ||
| @@ -83,6 +90,26 @@ class Escalafones | @@ -83,6 +90,26 @@ class Escalafones | ||
| 83 | } | 90 | } |
| 84 | 91 | ||
| 85 | 92 | ||
| 93 | + /** | ||
| 94 | + * Set tiempo | ||
| 95 | + * | ||
| 96 | + * @param integer $tiempo | ||
| 97 | + * @return Escalafones | ||
| 98 | + */ | ||
| 99 | + public function setTiempo($tiempo) | ||
| 100 | + { | ||
| 101 | + $this->tiempo = $tiempo; | ||
| 86 | 102 | ||
| 103 | + return $this; | ||
| 104 | + } | ||
| 87 | 105 | ||
| 106 | + /** | ||
| 107 | + * Get tiempo | ||
| 108 | + * | ||
| 109 | + * @return integer | ||
| 110 | + */ | ||
| 111 | + public function getTiempo() | ||
| 112 | + { | ||
| 113 | + return $this->tiempo; | ||
| 114 | + } | ||
| 88 | } | 115 | } |
src/AppBundle/Entity/Escalafones.php~
| @@ -36,19 +36,14 @@ class Escalafones | @@ -36,19 +36,14 @@ class Escalafones | ||
| 36 | private $id; | 36 | private $id; |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | - * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Adscripcion", inversedBy="escala") | ||
| 40 | - * @ORM\JoinColumn(name="adscripcion_id", referencedColumnName="id") | ||
| 41 | - */ | ||
| 42 | - protected $docente; | ||
| 43 | - | ||
| 44 | - /** | ||
| 45 | - * Constructor | 39 | + * @var integer |
| 40 | + * | ||
| 41 | + * @ORM\Column(name="tiempo", type="integer", nullable=false, options={"comment" = "Tiempo necesario para obtener la escala"}) | ||
| 46 | */ | 42 | */ |
| 47 | - public function __construct() | ||
| 48 | - { | ||
| 49 | - $this->docente = new \Doctrine\Common\Collections\ArrayCollection(); | ||
| 50 | - } | ||
| 51 | - | 43 | + private $tiempo; |
| 44 | + | ||
| 45 | + | ||
| 46 | + | ||
| 52 | 47 | ||
| 53 | 48 | ||
| 54 | /** | 49 | /** |
| @@ -94,40 +89,6 @@ class Escalafones | @@ -94,40 +89,6 @@ class Escalafones | ||
| 94 | return $this->nombre; | 89 | return $this->nombre; |
| 95 | } | 90 | } |
| 96 | 91 | ||
| 97 | - | ||
| 98 | - | ||
| 99 | - /** | ||
| 100 | - * Add docente | ||
| 101 | - * | ||
| 102 | - * @param \AppBundle\Entity\Adscripcion $docente | ||
| 103 | - * @return Adscripcion | ||
| 104 | - */ | ||
| 105 | - public function addDocente(\AppBundle\Entity\Adscripcion $docente) | ||
| 106 | - { | ||
| 107 | - $this->docente[] = $docente; | ||
| 108 | - | ||
| 109 | - return $this; | ||
| 110 | - } | ||
| 111 | - | ||
| 112 | - /** | ||
| 113 | - * Remove docente | ||
| 114 | - * | ||
| 115 | - * @param \AppBundle\Entity\Adscripcion $docente | ||
| 116 | - */ | ||
| 117 | - public function removeDocente(\AppBundle\Entity\Adscripcion $docente) | ||
| 118 | - { | ||
| 119 | - $this->docente->removeElement($docente); | ||
| 120 | - } | ||
| 121 | - | ||
| 122 | - /** | ||
| 123 | - * Get docente | ||
| 124 | - * | ||
| 125 | - * @return \Doctrine\Common\Collections\Collection | ||
| 126 | - */ | ||
| 127 | - public function getDocente() | ||
| 128 | - { | ||
| 129 | - return $this->docente; | ||
| 130 | - } | ||
| 131 | 92 | ||
| 132 | 93 | ||
| 133 | 94 |