Fix entity annotations, add migrations, fix type hints

pull/3844/head
Julio Montoya 5 years ago
parent 28ad2fb96b
commit 02ce2245c5
  1. 2
      public/main/inc/lib/notebook.lib.php
  2. 98
      src/CoreBundle/Entity/GradebookCategory.php
  3. 2
      src/CoreBundle/Entity/GradebookEvaluation.php
  4. 2
      src/CoreBundle/Entity/GradebookLink.php

@ -58,7 +58,7 @@ class NotebookManager
$notebook
->setTitle($values['note_title'])
->setDescription($values['note_comment'])
->setUserId($userId)
->setUser(api_get_user_entity($userId))
->addCourseLink($course, $session)
;

@ -67,6 +67,20 @@ class GradebookCategory
*/
protected ?Session $session = null;
/**
* @var Collection|GradebookEvaluation[]
*
* @ORM\OneToMany(targetEntity="GradebookEvaluation", mappedBy="category", cascade={"persist", "remove"})
*/
protected Collection $evaluations;
/**
* @var Collection|GradebookLink[]
*
* @ORM\OneToMany(targetEntity="GradebookLink", mappedBy="category", cascade={"persist", "remove"})
*/
protected Collection $links;
/**
* @ORM\Column(name="weight", type="float", precision=10, scale=0, nullable=false)
*/
@ -144,6 +158,8 @@ class GradebookCategory
{
$this->description = '';
$this->comments = new ArrayCollection();
$this->evaluations = new ArrayCollection();
$this->links = new ArrayCollection();
$this->locked = 0;
$this->generateCertificates = false;
$this->isRequirement = false;
@ -406,4 +422,86 @@ class GradebookCategory
return $this;
}
/**
* @return User
*/
public function getUser(): User
{
return $this->user;
}
public function setUser(User $user): self
{
$this->user = $user;
return $this;
}
/**
* @return GradebookEvaluation[]|Collection
*/
public function getEvaluations()
{
return $this->evaluations;
}
/**
* @param GradebookEvaluation[]|Collection $evaluations
*/
public function setEvaluations(Collection$evaluations)
{
$this->evaluations = $evaluations;
return $this;
}
/**
* @return GradebookLink[]|Collection
*/
public function getLinks()
{
return $this->links;
}
/**
* @param GradebookLink[]|Collection $links
*/
public function setLinks(Collection $links): self
{
$this->links = $links;
return $this;
}
/**
* @return string|null
*/
public function getDepends(): ?string
{
return $this->depends;
}
public function setDepends(?string $depends): self
{
$this->depends = $depends;
return $this;
}
/**
* @return int|null
*/
public function getMinimumToValidate(): ?int
{
return $this->minimumToValidate;
}
public function setMinimumToValidate(?int $minimumToValidate): self
{
$this->minimumToValidate = $minimumToValidate;
return $this;
}
}

@ -56,7 +56,7 @@ class GradebookEvaluation
protected Course $course;
/**
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\GradebookCategory")
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\GradebookCategory", inversedBy="evaluations")
* @ORM\JoinColumn(name="category_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected GradebookCategory $category;

@ -59,7 +59,7 @@ class GradebookLink
protected Course $course;
/**
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\GradebookCategory")
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\GradebookCategory", inversedBy="category")
* @ORM\JoinColumn(name="category_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected GradebookCategory $category;

Loading…
Cancel
Save