Use "XBundle\Repository" namespace instead of XBundle\Entity\Repository

pull/2487/merge
Julio Montoya 7 years ago
parent 88bc49f75b
commit 791a25abe9
  1. 2
      config/packages/chamilo.yaml
  2. 2
      main/admin/course_add.php
  3. 2
      main/admin/course_edit.php
  4. 2
      main/admin/teachers_time_by_session_report.php
  5. 2
      main/auth/courses_controller.php
  6. 2
      main/create_course/add_course.php
  7. 2
      main/gamification/my_progress.php
  8. 2
      main/inc/ajax/message.ajax.php
  9. 2
      main/inc/ajax/session.ajax.php
  10. 2
      main/inc/lib/sessionmanager.lib.php
  11. 2
      main/inc/lib/skill.lib.php
  12. 4
      main/inc/lib/usermanager.lib.php
  13. 2
      main/inc/lib/webservices/Rest.php
  14. 4
      main/lp/learnpath.class.php
  15. 4
      main/lp/lp_subscribe_users.php
  16. 4
      main/lp/lp_subscribe_users_to_category.php
  17. 2
      main/session/about.php
  18. 4
      main/session/resume_session.php
  19. 2
      src/CoreBundle/Component/Editor/Driver/DropBoxDriver.php
  20. 5
      src/CoreBundle/Entity/AccessUrl.php
  21. 1
      src/CoreBundle/Entity/AccessUrlRelSession.php
  22. 2
      src/CoreBundle/Entity/BranchSync.php
  23. 4
      src/CoreBundle/Entity/Course.php
  24. 5
      src/CoreBundle/Entity/CourseCategory.php
  25. 2
      src/CoreBundle/Entity/ExtraFieldOptions.php
  26. 2
      src/CoreBundle/Entity/ExtraFieldRelTag.php
  27. 2
      src/CoreBundle/Entity/ExtraFieldValues.php
  28. 2
      src/CoreBundle/Entity/GradebookLink.php
  29. 2
      src/CoreBundle/Entity/Language.php
  30. 2
      src/CoreBundle/Entity/Legal.php
  31. 2
      src/CoreBundle/Entity/Listener/CourseListener.php
  32. 2
      src/CoreBundle/Entity/Listener/SessionListener.php
  33. 2
      src/CoreBundle/Entity/Manager/SequenceResourceManager.php
  34. 2
      src/CoreBundle/Entity/Manager/SettingsCurrentManager.php
  35. 2
      src/CoreBundle/Entity/SequenceResource.php
  36. 2
      src/CoreBundle/Entity/Session.php
  37. 2
      src/CoreBundle/Entity/Skill.php
  38. 1
      src/CoreBundle/Entity/SkillRelUser.php
  39. 2
      src/CoreBundle/Entity/Templates.php
  40. 2
      src/CoreBundle/Entity/TrackECourseAccess.php
  41. 4
      src/CoreBundle/Repository/AccessUrlRepository.php
  42. 4
      src/CoreBundle/Repository/BranchSyncRepository.php
  43. 4
      src/CoreBundle/Repository/CourseCategoryRepository.php
  44. 4
      src/CoreBundle/Repository/CourseRepository.php
  45. 4
      src/CoreBundle/Repository/ExtraFieldOptionsRepository.php
  46. 4
      src/CoreBundle/Repository/ExtraFieldRelTagRepository.php
  47. 4
      src/CoreBundle/Repository/ExtraFieldValuesRepository.php
  48. 2
      src/CoreBundle/Repository/ItemPropertyRepository.php
  49. 4
      src/CoreBundle/Repository/LanguageRepository.php
  50. 53
      src/CoreBundle/Repository/LegalRepository.php
  51. 4
      src/CoreBundle/Repository/SequenceRepository.php
  52. 4
      src/CoreBundle/Repository/SessionRepository.php
  53. 2
      src/CoreBundle/Repository/SkillRepository.php
  54. 2
      src/CoreBundle/Repository/TemplatesRepository.php
  55. 4
      src/CoreBundle/Repository/TrackECourseAccessRepository.php
  56. 40
      src/CourseBundle/Component/CourseCopy/Resources/LearnPathCategory.php
  57. 2
      src/CourseBundle/Entity/CItemProperty.php
  58. 2
      src/CourseBundle/Entity/CNotebook.php
  59. 2
      src/CourseBundle/Entity/CStudentPublication.php
  60. 4
      src/CourseBundle/Repository/CCourseSettingRepository.php
  61. 4
      src/CourseBundle/Repository/CNotebookRepository.php
  62. 4
      src/CourseBundle/Repository/CStudentPublicationRepository.php
  63. 4
      src/CourseBundle/Resources/config/services.yml
  64. 321
      src/UserBundle/Entity/Repository/UserRepository.php
  65. 2
      src/UserBundle/Entity/User.php
  66. 80
      src/UserBundle/Repository/UserRepository.php

@ -75,7 +75,7 @@ chamilo_course:
# parameter:
# classes:
# model: Chamilo\CourseBundle\Entity\CCourseSetting
# repository: Chamilo\CourseBundle\Entity\Repository\CCourseSettingRepository
# repository: Chamilo\CourseBundle\Repository\CCourseSettingRepository
doctrine_cache:
providers:

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\CourseCategory;
use Chamilo\CoreBundle\Entity\Repository\CourseCategoryRepository;
use Chamilo\CoreBundle\Repository\CourseCategoryRepository;
/**
* @package chamilo.admin

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\CourseCategory;
use Chamilo\CoreBundle\Entity\Repository\CourseCategoryRepository;
use Chamilo\CoreBundle\Repository\CourseCategoryRepository;
use Chamilo\UserBundle\Entity\User;
/**

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CourseBundle\Entity\Repository\CStudentPublicationRepository;
use Chamilo\CourseBundle\Repository\CStudentPublicationRepository;
use Doctrine\Common\Collections\Criteria;
/**

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Repository\SequenceRepository;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\SessionRelCourse;
use Chamilo\CoreBundle\Entity\Tag;

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\CourseCategory;
use Chamilo\CoreBundle\Entity\Repository\CourseCategoryRepository;
use Chamilo\CoreBundle\Repository\CourseCategoryRepository;
/**
* This script allows professors and administrative staff to create course sites.

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Repository\TrackECourseAccessRepository;
use Chamilo\CoreBundle\Repository\TrackECourseAccessRepository;
/**
* See the progress for a user when the gamification mode is active.

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Entity\Repository\UserRepository;
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User;
$_dont_save_user_course_access = true;

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Entity\Repository\UserRepository;
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User;
/**

@ -3,7 +3,7 @@
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Entity\Repository\SequenceRepository;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;

@ -5,7 +5,7 @@ use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
use Chamilo\CoreBundle\Entity\Skill as SkillEntity;
use Chamilo\SkillBundle\Entity\SkillRelCourse;
use Chamilo\SkillBundle\Entity\SkillRelItem;
use Chamilo\UserBundle\Entity\Repository\UserRepository;
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User;
use Fhaculty\Graph\Graph;
use Fhaculty\Graph\Vertex;

@ -2,11 +2,11 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
use Chamilo\CoreBundle\Entity\Repository\AccessUrlRepository;
use Chamilo\CoreBundle\Repository\AccessUrlRepository;
use Chamilo\CoreBundle\Entity\SkillRelUser;
use Chamilo\CoreBundle\Entity\SkillRelUserComment;
use Chamilo\CoreBundle\Framework\Container;
use Chamilo\UserBundle\Entity\Repository\UserRepository;
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User;
use ChamiloSession as Session;
use Symfony\Component\Security\Core\Encoder\EncoderFactory;

@ -6,7 +6,7 @@ use Chamilo\CoreBundle\Entity\ExtraFieldValues;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CourseBundle\Entity\CLpCategory;
use Chamilo\CourseBundle\Entity\CNotebook;
use Chamilo\CourseBundle\Entity\Repository\CNotebookRepository;
use Chamilo\CourseBundle\Repository\CNotebookRepository;
use Chamilo\UserBundle\Entity\User;
/**

@ -1,8 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Repository\CourseRepository;
use Chamilo\CoreBundle\Entity\Repository\ItemPropertyRepository;
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CoreBundle\Repository\ItemPropertyRepository;
use Chamilo\CourseBundle\Component\CourseCopy\CourseArchiver;
use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder;
use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer;

@ -1,8 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Repository\CourseRepository;
use Chamilo\CoreBundle\Entity\Repository\ItemPropertyRepository;
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CoreBundle\Repository\ItemPropertyRepository;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
use Chamilo\CourseBundle\Entity\CItemProperty;

@ -1,8 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Repository\CourseRepository;
use Chamilo\CoreBundle\Entity\Repository\ItemPropertyRepository;
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CoreBundle\Repository\ItemPropertyRepository;
use Chamilo\CourseBundle\Entity\CLpCategory;
use Chamilo\CourseBundle\Entity\CLpCategoryUser;
use Chamilo\UserBundle\Entity\User;

@ -4,7 +4,7 @@
use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CourseBundle\Entity\CCourseDescription;
use Chamilo\UserBundle\Entity\Repository\UserRepository;
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User;
use ChamiloSession as Session;

@ -2,8 +2,8 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\Repository\SessionRepository;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Repository\SessionRepository;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;

@ -90,7 +90,7 @@ class DropBoxDriver extends \elFinderVolumeMySQL implements DriverInterface
public function getConfiguration()
{
if ($this->connector->security->isGranted('IS_AUTHENTICATED_FULLY')) {
/** @var \Chamilo\CoreBundle\Entity\Repository\UserRepository $repository */
/** @var \Chamilo\CoreBundle\Repository\UserRepository $repository */
/*$repository = $this->connector->entityManager->getRepository('Chamilo\UserBundle\Entity\User');
$courses = $repository->getCourses($this->connector->user);*/

@ -9,11 +9,11 @@ use Doctrine\ORM\Mapping as ORM;
* AccessUrl.
*
* @ORM\Table(name="access_url")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\AccessUrlRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\AccessUrlRepository")
*/
class AccessUrl
{
/**
/**
* @var int
*
* @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
@ -41,7 +41,6 @@ class AccessUrl
* @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SessionCategory", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
*/
protected $sessionCategory;
/**
* @var string

@ -33,7 +33,6 @@ class AccessUrlRelSession
* @ORM\JoinColumn(name="access_url_id", referencedColumnName="id")
*/
protected $url;
/**
* Get id.

@ -10,7 +10,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
* BranchSync.
*
* @ORM\Table(name="branch_sync")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\BranchSyncRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\BranchSyncRepository")
* @Gedmo\Tree(type="nested")
*/
class BranchSync

@ -27,7 +27,7 @@ use Symfony\Component\Validator\Constraints as Assert;
* @UniqueEntity("code")
* @UniqueEntity("visualCode")
* @UniqueEntity("directory")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\CourseRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\CourseRepository")
* @ORM\EntityListeners({"Chamilo\CoreBundle\Entity\Listener\CourseListener"})
*/
class Course
@ -1303,7 +1303,7 @@ class Course
public function getIssuedSkills()
{
return $this->issuedSkills;
}
}
/**
* @param CourseRelUser $subscription

@ -19,7 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
* @ORM\Index(name="tree_pos", columns={"tree_pos"})
* }
* )
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\CourseCategoryRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\CourseCategoryRepository")
*/
class CourseCategory
{
@ -32,12 +32,11 @@ class CourseCategory
*/
protected $id;
/**
* @ORM\OneToMany(targetEntity="CourseCategory", mappedBy="parent")
*/
protected $children;
/**
* @var string
*

@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
/**
* Class ExtraField.
*
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\ExtraFieldOptionsRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\ExtraFieldOptionsRepository")
* @ORM\Table(name="extra_field_options")
*
* @ORM\MappedSuperclass

@ -17,7 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
* @ORM\Index(name="field_item_tag", columns={"field_id", "item_id", "tag_id"})
* }
* )
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\ExtraFieldRelTagRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\ExtraFieldRelTagRepository")
*/
class ExtraFieldRelTag
{

@ -16,7 +16,7 @@ use Sylius\Component\Attribute\Model\AttributeValue as BaseAttributeValue;
* @ORM\Index(name="idx_efv_fiii", columns={"field_id", "item_id"}),
* }
* )
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\ExtraFieldValuesRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\ExtraFieldValuesRepository")
* @ORM\MappedSuperclass
*/
class ExtraFieldValues // extends BaseAttributeValue

@ -9,7 +9,7 @@ use Doctrine\ORM\Mapping as ORM;
* GradebookLink.
*
* @ORM\Table(name="gradebook_link")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\GradebookLinkRepository")
* @ORM\Entity
*/
class GradebookLink
{

@ -14,7 +14,7 @@ use Doctrine\ORM\Mapping as ORM;
* options={"row_format":"DYNAMIC"},
* indexes={@ORM\Index(name="idx_language_dokeos_folder", columns={"dokeos_folder"})}
* )
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\LanguageRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\LanguageRepository")
*/
class Language
{

@ -9,7 +9,7 @@ use Doctrine\ORM\Mapping as ORM;
* Legal.
*
* @ORM\Table(name="legal")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\LegalRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\LegalRepository")
*/
class Legal
{

@ -6,7 +6,7 @@ namespace Chamilo\CoreBundle\Entity\Listener;
use Chamilo\CoreBundle\Entity\AccessUrl;
use Chamilo\CoreBundle\Entity\AccessUrlRelCourse;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Repository\CourseRepository;
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CoreBundle\Entity\Tool;
use Chamilo\CourseBundle\ToolChain;
use Doctrine\ORM\Event\LifecycleEventArgs;

@ -5,7 +5,7 @@ namespace Chamilo\CoreBundle\Entity\Listener;
use Chamilo\CoreBundle\Entity\AccessUrl;
use Chamilo\CoreBundle\Entity\AccessUrlRelSession;
use Chamilo\CoreBundle\Entity\Repository\SessionRepository;
use Chamilo\CoreBundle\Repository\SessionRepository;
use Chamilo\CoreBundle\Entity\Session;
use Doctrine\ORM\Event\LifecycleEventArgs;

@ -9,7 +9,7 @@ use Sonata\CoreBundle\Model\BaseEntityManager;
* Class SequenceResourceManager
* CRUD for the course.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class SequenceResourceManager extends BaseEntityManager
{

@ -8,7 +8,7 @@ use Sonata\CoreBundle\Model\BaseEntityManager;
/**
* Class SettingsCurrentRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class SettingsCurrentManager extends BaseEntityManager
{

@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
/**
* Class SequenceResource.
*
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\SequenceRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\SequenceRepository")
* @ORM\Table(name="sequence_resource")
*/
class SequenceResource

@ -25,7 +25,7 @@ use Doctrine\ORM\Mapping as ORM;
* }
* )
* @ORM\EntityListeners({"Chamilo\CoreBundle\Entity\Listener\SessionListener"})
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\SessionRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\SessionRepository")
*/
class Session
{

@ -16,7 +16,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
* Skill.
*
* @ORM\Table(name="skill")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\SkillRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\SkillRepository")
*/
class Skill
{

@ -24,7 +24,6 @@ use Doctrine\ORM\Mapping as ORM;
*/
class SkillRelUser
{
/**
* @var int
*

@ -9,7 +9,7 @@ use Doctrine\ORM\Mapping as ORM;
* Templates.
*
* @ORM\Table(name="templates")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\TemplatesRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\TemplatesRepository")
*/
class Templates
{

@ -18,7 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
* @ORM\Index(name="user_course_session_date", columns={"user_id", "c_id", "session_id", "login_course_date"})
* }
* )
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\TrackECourseAccessRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\TrackECourseAccessRepository")
*/
class TrackECourseAccess
{

@ -1,14 +1,14 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Doctrine\ORM\EntityRepository;
/**
* Class AccessUrlRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class AccessUrlRepository extends EntityRepository
{

@ -1,14 +1,14 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Gedmo\Tree\Entity\Repository\NestedTreeRepository;
/**
* Class BranchSyncRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class BranchSyncRepository extends NestedTreeRepository
{

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query\Expr\Join;
@ -9,7 +9,7 @@ use Doctrine\ORM\Query\Expr\Join;
/**
* Class CCourseCategoryRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class CourseCategoryRepository extends EntityRepository
{

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Doctrine\Common\Collections\Criteria;
@ -13,7 +13,7 @@ use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
* Class CourseRepository
* The functions inside this class must return an instance of QueryBuilder.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class CourseRepository extends EntityRepository
{

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\ExtraFieldOptions;
use Doctrine\ORM\EntityRepository;
@ -9,7 +9,7 @@ use Doctrine\ORM\EntityRepository;
/**
* Class ExtraFieldOptionsRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class ExtraFieldOptionsRepository extends EntityRepository
{

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\ExtraField;
use Doctrine\ORM\EntityRepository;
@ -10,7 +10,7 @@ use Doctrine\ORM\Query\Expr\Join;
/**
* ExtraFieldRelTagRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*
* @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
*/

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query\Expr\Join;
@ -9,7 +9,7 @@ use Doctrine\ORM\Query\Expr\Join;
/**
* ExtraFieldValuesRepository class.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*
* @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
*/

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;

@ -1,14 +1,14 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Doctrine\ORM\EntityRepository;
/**
* Class LanguageRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class LanguageRepository extends EntityRepository
{

@ -0,0 +1,53 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Repository;
use Doctrine\ORM\EntityRepository;
/**
* Class LegalRepository.
*
* @package Chamilo\CoreBundle\Repository
*/
class LegalRepository extends EntityRepository
{
/**
* Count the legal terms by language (only count one set of terms for each
* language).
*
* @throws \Exception
*
* @return int
*/
public function countAllActiveLegalTerms()
{
$qb = $this->createQueryBuilder('l');
$qb->select('l.languageId, COUNT(l.id)')
->groupBy('l.languageId');
return count($qb->getQuery()->getResult());
}
/**
* Get the latest version of terms of the given type and language.
*
* @param int $typeId The type of terms:
* 0 for general text,
* 1 for general HTML link,
* 101 for private data collection,
* etc - see personal_data.php
* @param int $languageId The Id of the language
*
* @return array The terms for those type and language
*/
public function findOneByTypeAndLanguage($typeId, $languageId)
{
$qb = $this->createQueryBuilder('l');
$qb->select('l.content')
->where($qb->expr()->eq('l.type', $typeId))
->andWhere($qb->expr()->eq('l.languageId', $languageId));
return $qb->getQuery()->getResult();
}
}

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Doctrine\ORM\EntityRepository;
@ -12,7 +12,7 @@ use Fhaculty\Graph\Vertex;
* Class SequenceRepository
* The functions inside this class should return an instance of QueryBuilder.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*/
class SequenceRepository extends EntityRepository
{

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;
@ -11,7 +11,7 @@ use Doctrine\ORM\Query\Expr\Join;
/**
* SessionRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*
* @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
* @author Julio Montoya <gugli100@gmail.com>

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\UserBundle\Entity\User;

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity\Repository;
namespace Chamilo\CoreBundle\Repository;
use Chamilo\CoreBundle\Entity\TrackECourseAccess;
use Chamilo\UserBundle\Entity\User;
@ -10,7 +10,7 @@ use Doctrine\ORM\EntityRepository;
/**
* TrackECourseAccessRepository.
*
* @package Chamilo\CoreBundle\Entity\Repository
* @package Chamilo\CoreBundle\Repository
*
* @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
*/

@ -0,0 +1,40 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CourseBundle\Component\CourseCopy\Resources;
use Chamilo\CourseBundle\Entity\CLpCategory;
/**
* Class LearnPathCategory.
*
* @package Chamilo\CourseBundle\Component\CourseCopy\Resources
*/
class LearnPathCategory extends Resource
{
/**
* @var CLpCategory
*/
public $object;
/**
* @param int $id
* @param string $object
*/
public function __construct(
$id,
$object
) {
parent::__construct($id, RESOURCE_LEARNPATH_CATEGORY);
$this->object = $object;
}
/**
* Show this resource.
*/
public function show()
{
parent::show();
echo $this->object->getName();
}
}

@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
* CItemProperty.
*
* @ORM\Table(name="c_item_property", indexes={@ORM\Index(name="idx_item_property_toolref", columns={"tool", "ref"})})
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\ItemPropertyRepository")
* @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\ItemPropertyRepository")
*/
class CItemProperty
{

@ -14,7 +14,7 @@ use Doctrine\ORM\Mapping as ORM;
* @ORM\Index(name="course", columns={"c_id"})
* }
* )
* @ORM\Entity(repositoryClass="Chamilo\CourseBundle\Entity\Repository\CNotebookRepository")
* @ORM\Entity(repositoryClass="Chamilo\CourseBundle\Repository\CNotebookRepository")
*/
class CNotebook
{

@ -17,7 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
* @ORM\Index(name="idx_csp_u", columns={"user_id"})
* }
* )
* @ORM\Entity(repositoryClass="Chamilo\CourseBundle\Entity\Repository\CStudentPublicationRepository")
* @ORM\Entity(repositoryClass="Chamilo\CourseBundle\Repository\CStudentPublicationRepository")
*/
class CStudentPublication
{

@ -1,14 +1,14 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CourseBundle\Entity\Repository;
namespace Chamilo\CourseBundle\Repository;
use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
/**
* Class CCourseSettingRepository.
*
* @package Chamilo\CourseBundle\Entity\Repository
* @package Chamilo\CourseBundle\Repository
*/
class CCourseSettingRepository extends EntityRepository
{

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CourseBundle\Entity\Repository;
namespace Chamilo\CourseBundle\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;
@ -11,7 +11,7 @@ use Doctrine\ORM\EntityRepository;
/**
* Class CNotebookRepository.
*
* @package Chamilo\CourseBundle\Entity\Repository
* @package Chamilo\CourseBundle\Repository
*/
class CNotebookRepository extends EntityRepository
{

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CourseBundle\Entity\Repository;
namespace Chamilo\CourseBundle\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;
@ -12,7 +12,7 @@ use Doctrine\ORM\Query\Expr\Join;
/**
* Class CStudentPublicationRepository.
*
* @package Chamilo\CourseBundle\Entity\Repository
* @package Chamilo\CourseBundle\Repository
*/
class CStudentPublicationRepository extends EntityRepository
{

@ -68,12 +68,12 @@ services:
- '@form.factory'
chamilo_course.repository.parameter:
class: Chamilo\CourseBundle\Entity\Repository\CCourseSettingRepository
class: Chamilo\CourseBundle\Repository\CCourseSettingRepository
factory: ['@doctrine', getRepository]
arguments: [Chamilo\CourseBundle\Entity\CCourseSetting]
# chamilo_settings.repository.parameter:
# class: Chamilo\CoreBundle\Entity\Repository\SettingsCurrentRepository
# class: Chamilo\CoreBundle\Repository\SettingsCurrentRepository
# factory: ["@doctrine", getRepository]
# arguments: [ Chamilo\CoreBundle\Entity\SettingsCurrent ]

@ -1,321 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\UserBundle\Entity\Repository;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
use Chamilo\UserBundle\Entity\User;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query\Expr\Join;
//use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
//use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
/**
* Class UserRepository.
*
* All functions that query the database (selects)
* Functions should return query builders.
*
* @package Chamilo\UserBundle\Repository
*/
class UserRepository extends EntityRepository
{
/**
* @param string $keyword
*
* @return mixed
*/
public function searchUserByKeyword($keyword)
{
$qb = $this->createQueryBuilder('a');
// Selecting user info
$qb->select('DISTINCT b');
$qb->from('Chamilo\UserBundle\Entity\User', 'b');
// Selecting courses for users
//$qb->innerJoin('u.courses', 'c');
//@todo check app settings
$qb->add('orderBy', 'b.firstname ASC');
$qb->where('b.firstname LIKE :keyword OR b.lastname LIKE :keyword ');
$qb->setParameter('keyword', "%$keyword%");
$query = $qb->getQuery();
return $query->execute();
}
/**
* Get course user relationship based in the course_rel_user table.
*
* @return array
*/
/*public function getCourses(User $user)
{
$queryBuilder = $this->createQueryBuilder('user');
// Selecting course info.
$queryBuilder->select('c');
// Loading User.
//$qb->from('Chamilo\UserBundle\Entity\User', 'u');
// Selecting course
$queryBuilder->innerJoin('Chamilo\CoreBundle\Entity\Course', 'c');
//@todo check app settings
//$qb->add('orderBy', 'u.lastname ASC');
$wherePart = $queryBuilder->expr()->andx();
// Get only users subscribed to this course
$wherePart->add($queryBuilder->expr()->eq('user.userId', $user->getUserId()));
$queryBuilder->where($wherePart);
$query = $queryBuilder->getQuery();
return $query->execute();
}
public function getTeachers()
{
$queryBuilder = $this->createQueryBuilder('u');
// Selecting course info.
$queryBuilder
->select('u')
->where('u.groups.id = :groupId')
->setParameter('groupId', 1);
$query = $queryBuilder->getQuery();
return $query->execute();
}*/
/*public function getUsers($group)
{
$queryBuilder = $this->createQueryBuilder('u');
// Selecting course info.
$queryBuilder
->select('u')
->where('u.groups = :groupId')
->setParameter('groupId', $group);
$query = $queryBuilder->getQuery();
return $query->execute();
}*/
/**
* Get a filtered list of user by status and (optionally) access url.
*
* @param string $query The query to filter
* @param int $status The status
* @param int $accessUrlId The access URL ID
*
* @return array
*/
public function searchUsersByStatus($query, $status, $accessUrlId = null)
{
$accessUrlId = intval($accessUrlId);
$queryBuilder = $this->createQueryBuilder('u');
if ($accessUrlId > 0) {
$queryBuilder->innerJoin(
'ChamiloCoreBundle:AccessUrlRelUser',
'auru',
\Doctrine\ORM\Query\Expr\Join::WITH,
'u.id = auru.userId'
);
}
$queryBuilder->where('u.status = :status')
->andWhere('u.username LIKE :query OR u.firstname LIKE :query OR u.lastname LIKE :query')
->setParameter('status', $status)
->setParameter('query', "$query%");
if ($accessUrlId > 0) {
$queryBuilder->andWhere('auru.accessUrlId = :url')
->setParameter(':url', $accessUrlId);
}
return $queryBuilder->getQuery()->getResult();
}
/**
* Get the coaches for a course within a session.
*
* @param Session $session The session
* @param Course $course The course
*
* @return \Doctrine\ORM\QueryBuilder
*/
public function getCoachesForSessionCourse(Session $session, Course $course)
{
$queryBuilder = $this->createQueryBuilder('u');
$queryBuilder->select('u')
->innerJoin(
'ChamiloCoreBundle:SessionRelCourseRelUser',
'scu',
Join::WITH,
'scu.user = u'
)
->where(
$queryBuilder->expr()->andX(
$queryBuilder->expr()->eq('scu.session', $session->getId()),
$queryBuilder->expr()->eq('scu.course', $course->getId()),
$queryBuilder->expr()->eq('scu.status', SessionRelCourseRelUser::STATUS_COURSE_COACH)
)
);
return $queryBuilder->getQuery()->getResult();
}
/**
* Get the sessions admins for a user.
*
* @param User $user The user
*
* @return array
*/
public function getSessionAdmins($user)
{
$queryBuilder = $this->createQueryBuilder('u');
$queryBuilder
->distinct()
->innerJoin(
'ChamiloCoreBundle:SessionRelUser',
'su',
Join::WITH,
$queryBuilder->expr()->eq('u', 'su.user')
)
->innerJoin(
'ChamiloCoreBundle:SessionRelCourseRelUser',
'scu',
Join::WITH,
$queryBuilder->expr()->eq('su.session', 'scu.session')
)
->where(
$queryBuilder->expr()->eq('scu.user', $user->getId())
)
->andWhere(
$queryBuilder->expr()->eq('su.relationType', SESSION_RELATION_TYPE_RRHH)
);
return $queryBuilder->getQuery()->getResult();
}
/**
* Get the student bosses for a user.
*
* @param User $user The user
*
* @return array
*/
public function getStudentBosses($user)
{
$queryBuilder = $this->createQueryBuilder('u');
$queryBuilder
->distinct()
->innerJoin(
'ChamiloCoreBundle:UserRelUser',
'uu',
Join::WITH,
$queryBuilder->expr()->eq('u.id', 'uu.friendUserId')
)
->where(
$queryBuilder->expr()->eq('uu.relationType', USER_RELATION_TYPE_BOSS)
)
->andWhere(
$queryBuilder->expr()->eq('uu.userId', $user->getId())
);
return $queryBuilder->getQuery()->getResult();
}
/**
* Find potential users to send a message.
*
* @param int $currentUserId The current user ID
* @param string $search The search text to filter the user list
* @param int $limit Optional. Sets the maximum number of results to retrieve
*
* @return mixed
*/
public function findUsersToSendMessage($currentUserId, $search, $limit = 10)
{
$allowSendMessageToAllUsers = api_get_setting('allow_send_message_to_all_platform_users');
$accessUrlId = api_get_multiple_access_url() ? api_get_current_access_url_id() : 1;
if (api_get_setting('allow_social_tool') === 'true' &&
api_get_setting('allow_message_tool') === 'true'
) {
// All users
if ($allowSendMessageToAllUsers === 'true' || api_is_platform_admin()) {
$dql = "SELECT DISTINCT U
FROM ChamiloUserBundle:User U
LEFT JOIN ChamiloCoreBundle:AccessUrlRelUser R
WITH U = R.user
WHERE
U.active = 1 AND
U.status != 6 AND
U.id != $currentUserId AND
R.portal = $accessUrlId";
} else {
$dql = "SELECT DISTINCT U
FROM ChamiloCoreBundle:AccessUrlRelUser R, ChamiloCoreBundle:UserRelUser UF
INNER JOIN ChamiloUserBundle:User AS U
WITH UF.friendUserId = U
WHERE
U.active = 1 AND
U.status != 6 AND
UF.relationType NOT IN(".USER_RELATION_TYPE_DELETED.", ".USER_RELATION_TYPE_RRHH.") AND
UF.userId = $currentUserId AND
UF.friendUserId != $currentUserId AND
U = R.user AND
R.portal = $accessUrlId";
}
} elseif (
api_get_setting('allow_social_tool') === 'false' &&
api_get_setting('allow_message_tool') === 'true'
) {
if ($allowSendMessageToAllUsers === 'true') {
$dql = "SELECT DISTINCT U
FROM ChamiloUserBundle:User U
LEFT JOIN ChamiloCoreBundle:AccessUrlRelUser R
WITH U = R.user
WHERE
U.active = 1 AND
U.status != 6 AND
U.id != $currentUserId AND
R.portal = $accessUrlId";
} else {
$time_limit = api_get_setting('time_limit_whosonline');
$online_time = time() - $time_limit * 60;
$limit_date = api_get_utc_datetime($online_time);
$dql = "SELECT DISTINCT U
FROM ChamiloUserBundle:User U
INNER JOIN ChamiloCoreBundle:TrackEOnline T
WITH U.id = T.loginUserId
WHERE
U.active = 1 AND
T.loginDate >= '".$limit_date."'";
}
}
$dql .= ' AND (U.firstname LIKE :search OR U.lastname LIKE :search OR U.email LIKE :search OR U.username LIKE :search)';
return $this->getEntityManager()
->createQuery($dql)
->setMaxResults($limit)
->setParameters(['search' => "%$search%"])
->getResult();
}
}

@ -42,7 +42,7 @@ use Symfony\Component\Validator\Mapping\ClassMetadata;
* }
* )
* @UniqueEntity("username")
* @ORM\Entity(repositoryClass="Chamilo\UserBundle\Entity\Repository\UserRepository")
* @ORM\Entity(repositoryClass="Chamilo\UserBundle\Repository\UserRepository")
*
* @ORM\AttributeOverrides({
* @ORM\AttributeOverride(name="username",

@ -363,4 +363,84 @@ class UserRepository extends EntityRepository
->getSingleScalarResult()
;
}
/**
* Find potential users to send a message.
*
* @param int $currentUserId The current user ID
* @param string $search The search text to filter the user list
* @param int $limit Optional. Sets the maximum number of results to retrieve
*
* @return mixed
*/
public function findUsersToSendMessage($currentUserId, $search, $limit = 10)
{
$allowSendMessageToAllUsers = api_get_setting('allow_send_message_to_all_platform_users');
$accessUrlId = api_get_multiple_access_url() ? api_get_current_access_url_id() : 1;
if (api_get_setting('allow_social_tool') === 'true' &&
api_get_setting('allow_message_tool') === 'true'
) {
// All users
if ($allowSendMessageToAllUsers === 'true' || api_is_platform_admin()) {
$dql = "SELECT DISTINCT U
FROM ChamiloUserBundle:User U
LEFT JOIN ChamiloCoreBundle:AccessUrlRelUser R
WITH U = R.user
WHERE
U.active = 1 AND
U.status != 6 AND
U.id != $currentUserId AND
R.portal = $accessUrlId";
} else {
$dql = "SELECT DISTINCT U
FROM ChamiloCoreBundle:AccessUrlRelUser R, ChamiloCoreBundle:UserRelUser UF
INNER JOIN ChamiloUserBundle:User AS U
WITH UF.friendUserId = U
WHERE
U.active = 1 AND
U.status != 6 AND
UF.relationType NOT IN(".USER_RELATION_TYPE_DELETED.", ".USER_RELATION_TYPE_RRHH.") AND
UF.userId = $currentUserId AND
UF.friendUserId != $currentUserId AND
U = R.user AND
R.portal = $accessUrlId";
}
} elseif (
api_get_setting('allow_social_tool') === 'false' &&
api_get_setting('allow_message_tool') === 'true'
) {
if ($allowSendMessageToAllUsers === 'true') {
$dql = "SELECT DISTINCT U
FROM ChamiloUserBundle:User U
LEFT JOIN ChamiloCoreBundle:AccessUrlRelUser R
WITH U = R.user
WHERE
U.active = 1 AND
U.status != 6 AND
U.id != $currentUserId AND
R.portal = $accessUrlId";
} else {
$time_limit = api_get_setting('time_limit_whosonline');
$online_time = time() - $time_limit * 60;
$limit_date = api_get_utc_datetime($online_time);
$dql = "SELECT DISTINCT U
FROM ChamiloUserBundle:User U
INNER JOIN ChamiloCoreBundle:TrackEOnline T
WITH U.id = T.loginUserId
WHERE
U.active = 1 AND
T.loginDate >= '".$limit_date."'";
}
}
$dql .= ' AND (U.firstname LIKE :search OR U.lastname LIKE :search OR U.email LIKE :search OR U.username LIKE :search)';
return $this->getEntityManager()
->createQuery($dql)
->setMaxResults($limit)
->setParameters(['search' => "%$search%"])
->getResult();
}
}

Loading…
Cancel
Save