From c4f890bef88947bcc361ffda97861f12f29d76c5 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 5 Sep 2018 14:15:36 +0200 Subject: [PATCH] Fix personal data, remove unused properties in entities --- main/social/personal_data.php | 4 +- src/CoreBundle/Entity/Course.php | 20 ---- src/CoreBundle/Entity/SessionCategory.php | 24 ----- .../Entity/SessionRelCourseRelUser.php | 2 +- src/CourseBundle/Entity/CGroupInfo.php | 27 +---- src/UserBundle/Entity/User.php | 102 ------------------ src/UserBundle/Repository/UserRepository.php | 15 ++- 7 files changed, 16 insertions(+), 178 deletions(-) diff --git a/main/social/personal_data.php b/main/social/personal_data.php index 1b5c75d27f..89ebf8c7be 100644 --- a/main/social/personal_data.php +++ b/main/social/personal_data.php @@ -1,8 +1,6 @@ sessions; } - /** - * @return ArrayCollection - */ - public function getNotebooks() - { - return $this->notebooks; - } - - /** - * @return ArrayCollection - */ - public function getItems() - { - return $this->items; - } - /** * @return ArrayCollection */ diff --git a/src/CoreBundle/Entity/SessionCategory.php b/src/CoreBundle/Entity/SessionCategory.php index 546ed50001..12765dd41e 100644 --- a/src/CoreBundle/Entity/SessionCategory.php +++ b/src/CoreBundle/Entity/SessionCategory.php @@ -165,28 +165,4 @@ class SessionCategory { return $this->dateEnd; } - - /** - * Set accessUrlId. - * - * @param int $accessUrlId - * - * @return SessionCategory - */ - public function setAccessUrlId($accessUrlId) - { - $this->accessUrlId = $accessUrlId; - - return $this; - } - - /** - * Get accessUrlId. - * - * @return int - */ - public function getAccessUrlId() - { - return $this->accessUrlId; - } } diff --git a/src/CoreBundle/Entity/SessionRelCourseRelUser.php b/src/CoreBundle/Entity/SessionRelCourseRelUser.php index f9eac3a7c3..b7cb6d1007 100644 --- a/src/CoreBundle/Entity/SessionRelCourseRelUser.php +++ b/src/CoreBundle/Entity/SessionRelCourseRelUser.php @@ -227,7 +227,7 @@ class SessionRelCourseRelUser * * @return int */ - public function getLegalAgreement(): int + public function getLegalAgreement() { return $this->legalAgreement; } diff --git a/src/CourseBundle/Entity/CGroupInfo.php b/src/CourseBundle/Entity/CGroupInfo.php index 8a65297441..c972adf927 100644 --- a/src/CourseBundle/Entity/CGroupInfo.php +++ b/src/CourseBundle/Entity/CGroupInfo.php @@ -4,6 +4,7 @@ namespace Chamilo\CourseBundle\Entity; use Chamilo\CoreBundle\Entity\Course; +use Chamilo\CoreBundle\Traits\CourseTrait; use Doctrine\ORM\Mapping as ORM; /** @@ -20,6 +21,8 @@ use Doctrine\ORM\Mapping as ORM; */ class CGroupInfo { + use CourseTrait; + /** * @var int * @@ -578,30 +581,6 @@ class CGroupInfo return $this->id; } - /** - * Set cId. - * - * @param int $cId - * - * @return CGroupInfo - */ - public function setCId($cId) - { - $this->cId = $cId; - - return $this; - } - - /** - * Get cId. - * - * @return int - */ - public function getCId() - { - return $this->cId; - } - /** * @return int */ diff --git a/src/UserBundle/Entity/User.php b/src/UserBundle/Entity/User.php index 4d7cd4cca1..4909343f85 100644 --- a/src/UserBundle/Entity/User.php +++ b/src/UserBundle/Entity/User.php @@ -1484,108 +1484,6 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement return $this->lastLogin; } - /** - * {@inheritdoc} - */ - public function getExtraFields() - { - return $this->extraFields; - } - - /** - * {@inheritdoc} - */ - public function setExtraFieldList($extraFields) - { - $this->extraFields = new ArrayCollection(); - foreach ($extraFields as $extraField) { - $this->addExtraFields($extraField); - } - - return $this; - } - - public function setExtraFields($extraFields) - { - $this->extraFields = $extraFields; - } - - /** - * {@inheritdoc} - */ - /*public function addExtraFields(ExtraFieldValues $extraFieldValue) - { - $extraFieldValue->setUser($this); - $this->extraFields[] = $extraFieldValue; - - return $this; - }*/ - - /** - * {@inheritdoc} - */ - public function addExtraFields(ExtraFieldValues $extraFieldValue) - { - //if (!$this->hasExtraField($attribute)) { - $extraFieldValue->setUser($this); - $this->extraFields[] = $extraFieldValue; - //} - - return $this; - } - - /** - * {@inheritdoc} - */ - public function removeExtraField(ExtraFieldValues $attribute) - { - //if ($this->hasExtraField($attribute)) { - //$this->extraFields->removeElement($attribute); - //$attribute->setUser($this); - //} - - return $this; - } - - /** - * {@inheritdoc} - */ - /*public function hasExtraField($attribute) - { - if (!$this->extraFields) { - return false; - } - return $this->extraFields->contains($attribute); - }*/ - - /** - * {@inheritdoc} - */ - public function hasExtraFieldByName($attributeName) - { - foreach ($this->extraFields as $attribute) { - if ($attribute->getName() === $attributeName) { - return true; - } - } - - return false; - } - - /** - * {@inheritdoc} - */ - public function getExtraFieldByName($attributeName) - { - foreach ($this->extraFields as $attribute) { - if ($attribute->getName() === $attributeName) { - return $attribute; - } - } - - return null; - } - /** * Get sessionCourseSubscription. * diff --git a/src/UserBundle/Repository/UserRepository.php b/src/UserBundle/Repository/UserRepository.php index b009eba294..e97461f65a 100644 --- a/src/UserBundle/Repository/UserRepository.php +++ b/src/UserBundle/Repository/UserRepository.php @@ -626,7 +626,7 @@ class UserRepository extends EntityRepository $date = $item->getTms() ? $item->getTms()->format($dateFormat) : ''; $list = [ 'Attempt #'.$item->getExeId(), - 'Course # '.$item->getCId(), + 'Course # '.$item->getCourse()->getCode(), //'Answer: '.$item->getAnswer(), 'Session #'.$item->getSessionId(), //'Marks: '.$item->getMarks(), @@ -926,17 +926,21 @@ class UserRepository extends EntityRepository // Message $criteria = [ - 'userSenderId' => $userId, + 'userSender' => $userId, ]; $result = $em->getRepository('ChamiloCoreBundle:Message')->findBy($criteria); $messageList = []; /** @var Message $item */ foreach ($result as $item) { $date = $item->getSendDate() ? $item->getSendDate()->format($dateFormat) : ''; + $userName = ''; + if ($item->getUserReceiver()) { + $userName = $item->getUserReceiver()->getUsername(); + } $list = [ 'Title: '.$item->getTitle(), 'Sent date: '.$date, - 'To user # '.$item->getUserReceiverId(), + 'To user: '.$userName, 'Status'.$item->getMsgStatus(), ]; $messageList[] = implode(', ', $list); @@ -1237,7 +1241,7 @@ class UserRepository extends EntityRepository $list = []; /** @var AccessUrlRelUser $portal */ foreach ($portals as $portal) { - $portalInfo = \UrlManager::get_url_data_from_id($portal->getAccessUrlId()); + $portalInfo = \UrlManager::get_url_data_from_id($portal->getUrl()->getId()); $list[] = $portalInfo['url']; } } @@ -1262,7 +1266,8 @@ class UserRepository extends EntityRepository $extraFieldValues = new \ExtraFieldValue('user'); $items = $extraFieldValues->getAllValuesByItem($userId); - $user->setExtraFields($items); + //$user->setExtraFields($items); + //$user->setExtraFields([]); $lastLogin = $user->getLastLogin(); if (empty($lastLogin)) {