chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor: move code into CoreBundle

Browse Source
pull/3262/head
Julio Montoya 6 years ago
parent 0dfc192eda
commit 8fe31ed5c5
20 changed files with 70 additions and 82 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      config/bundles.php
  2. 18
      config/services.yaml
  3. 4
      public/main/admin/skill.php
  4. 12
      public/main/admin/skill_level.php
  5. 12
      public/main/admin/skill_profile.php
  6. 4
      public/main/admin/skill_rel_course.php
  7. 2
      public/main/badge/assign.php
  8. 2
      public/main/badge/issued.php
  9. 2
      public/main/badge/issued_all.php
  10. 7
      public/main/gradebook/skill_rel_user.php
  11. 12
      public/main/inc/ajax/skill.ajax.php
  12. 2
      public/main/inc/lib/database.lib.php
  13. 29
      public/main/inc/lib/skill.lib.php
  14. 4
      src/CoreBundle/Entity/Level.php
  15. 4
      src/CoreBundle/Entity/Profile.php
  16. 2
      src/CoreBundle/Entity/SkillRelCourse.php
  17. 2
      src/CoreBundle/Entity/SkillRelItem.php
  18. 4
      src/CoreBundle/Entity/SkillRelItemRelUser.php
  19. 15
      src/CourseBundle/Resources/config/services.yml
  20. 14
      src/SkillBundle/ChamiloSkillBundle.php

1
config/bundles.php
Unescape View File

@ -15,7 +15,6 @@ return [
FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
FOS\RestBundle\FOSRestBundle::class => ['all' => true],
Chamilo\CoreBundle\ChamiloCoreBundle::class => ['all' => true],
Chamilo\SkillBundle\ChamiloSkillBundle::class => ['all' => true],
Chamilo\CourseBundle\ChamiloCourseBundle::class => ['all' => true],
Chamilo\TicketBundle\ChamiloTicketBundle::class => ['all' => true],
Chamilo\GraphQlBundle\ChamiloGraphQlBundle::class => ['all' => true],

18
config/services.yaml
Unescape View File

@ -83,6 +83,24 @@ services:
public: true
League\Flysystem\MountManager: '@oneup_flysystem.mount_manager'
# Voters
# Group voter, checks if a user has permissions to do actions
chamilo_course.security.authorization.voter.group_voter:
class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter
arguments:
- '@doctrine.orm.entity_manager'
- '@Chamilo\CoreBundle\Repository\CourseRepository'
- '@Chamilo\CourseBundle\Repository\CGroupInfoRepository'
- '@security.authorization_checker'
- '@service_container'
public: false
tags:
- {name: security.voter}
sylius_settings:
driver: doctrine/orm

4
public/main/admin/skill.php
Unescape View File

@ -10,7 +10,7 @@ $cidReset = true;
require_once __DIR__.'/../inc/global.inc.php';
api_protect_admin_script();
$em = Database::getManager();
$profiles = $em->getRepository('ChamiloSkillBundle:Profile')->findAll();
$profiles = $em->getRepository('ChamiloCoreBundle:Profile')->findAll();
$list = $em->getRepository('ChamiloCoreBundle:Skill')->findAll();
$listAction = api_get_self();
@ -62,7 +62,7 @@ switch ($action) {
if ($form->validate()) {
$values = $form->exportValues();
$profile = $em->getRepository('ChamiloSkillBundle:Profile')->find($values['profile_id']);
$profile = $em->getRepository('ChamiloCoreBundle:Profile')->find($values['profile_id']);
if ($profile) {
$item->setProfile($profile);
$em->persist($item);

12
public/main/admin/skill_level.php
Unescape View File

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\SkillBundle\Entity\Level;
use Chamilo\CoreBundle\Entity\Level;
/**
* Add a skill Level.
@ -13,8 +13,8 @@ require_once __DIR__.'/../inc/global.inc.php';
api_protect_admin_script();
$em = Database::getManager();
$profiles = $em->getRepository('ChamiloSkillBundle:Profile')->findAll();
$list = $em->getRepository('ChamiloSkillBundle:Level')->findAll();
$profiles = $em->getRepository('ChamiloCoreBundle:Profile')->findAll();
$list = $em->getRepository('ChamiloCoreBundle:Level')->findAll();
$listAction = api_get_self();
@ -28,7 +28,7 @@ $id = isset($_GET['id']) ? $_GET['id'] : '';
$item = null;
if (!empty($id)) {
/** @var Level $item */
$item = $em->getRepository('ChamiloSkillBundle:Level')->find($id);
$item = $em->getRepository('ChamiloCoreBundle:Level')->find($id);
if (!$item) {
api_not_allowed();
}
@ -62,7 +62,7 @@ switch ($action) {
if ($form->validate()) {
$values = $form->exportValues();
if (isset($values['profile_id']) && !empty($values['profile_id'])) {
$profile = $em->getRepository('ChamiloSkillBundle:Profile')->find($values['profile_id']);
$profile = $em->getRepository('ChamiloCoreBundle:Profile')->find($values['profile_id']);
if ($profile) {
$item = new Level();
$item->setName($values['name']);
@ -109,7 +109,7 @@ switch ($action) {
$item->setName($values['name']);
$item->setShortName($values['short_name']);
$profile = $em->getRepository('ChamiloSkillBundle:Profile')->find($values['profile_id']);
$profile = $em->getRepository('ChamiloCoreBundle:Profile')->find($values['profile_id']);
if ($profile) {
$item->setProfile($profile);
}

12
public/main/admin/skill_profile.php
Unescape View File

@ -1,8 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\SkillBundle\Entity\Level;
use Chamilo\SkillBundle\Entity\Profile;
use Chamilo\CoreBundle\Entity\Level;
use Chamilo\CoreBundle\Entity\Profile;
/**
* Add a skill Profile.
@ -12,7 +12,7 @@ require_once __DIR__.'/../inc/global.inc.php';
api_protect_admin_script();
$em = Database::getManager();
$list = $em->getRepository('ChamiloSkillBundle:Profile')->findAll();
$list = $em->getRepository('ChamiloCoreBundle:Profile')->findAll();
$listAction = api_get_self();
@ -25,7 +25,7 @@ $id = isset($_GET['id']) ? $_GET['id'] : '';
$item = null;
if (!empty($id)) {
$item = $em->getRepository('ChamiloSkillBundle:Profile')->find($id);
$item = $em->getRepository('ChamiloCoreBundle:Profile')->find($id);
if (!$item) {
api_not_allowed();
}
@ -52,7 +52,7 @@ $tpl = new Template($action);
switch ($action) {
case 'move_up':
/** @var Level $item */
$item = $em->getRepository('ChamiloSkillBundle:Level')->find($_GET['level_id']);
$item = $em->getRepository('ChamiloCoreBundle:Level')->find($_GET['level_id']);
if ($item) {
$position = $item->getPosition();
if (!empty($position)) {
@ -68,7 +68,7 @@ switch ($action) {
break;
case 'move_down':
/** @var Level $item */
$item = $em->getRepository('ChamiloSkillBundle:Level')->find($_GET['level_id']);
$item = $em->getRepository('ChamiloCoreBundle:Level')->find($_GET['level_id']);
if ($item) {
$position = $item->getPosition();
$item->setPosition($position + 1);

4
public/main/admin/skill_rel_course.php
Unescape View File

@ -1,7 +1,7 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\SkillBundle\Entity\SkillRelCourse;
use Chamilo\CoreBundle\Entity\SkillRelCourse;
$cidReset = true;
require_once __DIR__.'/../inc/global.inc.php';
@ -36,7 +36,7 @@ $form->addHeader(get_lang('Add skills').$sessionName);
$skillList = [];
$em = Database::getManager();
$items = $em->getRepository('ChamiloSkillBundle:SkillRelCourse')->findBy(
$items = $em->getRepository('ChamiloCoreBundle:SkillRelCourse')->findBy(
['course' => $courseId, 'session' => $sessionId]
);
/** @var SkillRelCourse $skillRelCourse */

2
public/main/badge/assign.php
Unescape View File

@ -29,7 +29,7 @@ $entityManager = Database::getManager();
$skillManager = new SkillManager();
$skillRepo = $entityManager->getRepository('ChamiloCoreBundle:Skill');
$skillRelSkill = $entityManager->getRepository('ChamiloCoreBundle:SkillRelSkill');
$skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level');
$skillLevelRepo = $entityManager->getRepository('ChamiloCoreBundle:Level');
$skillUserRepo = $entityManager->getRepository('ChamiloCoreBundle:SkillRelUser');
$skillLevels = api_get_configuration_value('skill_levels_names');

2
public/main/badge/issued.php
Unescape View File

@ -35,7 +35,7 @@ if (!$skillIssue) {
}
$skillRepo = $entityManager->getRepository('ChamiloCoreBundle:Skill');
$skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level');
$skillLevelRepo = $entityManager->getRepository('ChamiloCoreBundle:Level');
$user = $skillIssue->getUser();
$skill = $skillIssue->getSkill();

2
public/main/badge/issued_all.php
Unescape View File

@ -37,7 +37,7 @@ if (!$user || !$skill) {
$skillRepo = $em->getRepository('ChamiloCoreBundle:Skill');
$skillUserRepo = $em->getRepository('ChamiloCoreBundle:SkillRelUser');
$skillLevelRepo = $em->getRepository('ChamiloSkillBundle:Level');
$skillLevelRepo = $em->getRepository('ChamiloCoreBundle:Level');
$userSkills = $skillUserRepo->findBy([
'user' => $user,

7
public/main/gradebook/skill_rel_user.php
Unescape View File

@ -1,7 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\SkillBundle\Entity\SkillRelItem;
use Chamilo\CoreBundle\Entity\SkillRelItem;
use Chamilo\CoreBundle\Entity\SkillRelItemRelUser;
require_once __DIR__.'/../inc/global.inc.php';
@ -47,8 +48,8 @@ foreach ($skills as $skill) {
'user' => $userId,
'skillRelItem' => $skill,
];
/** @var \Chamilo\SkillBundle\Entity\SkillRelItemRelUser $skillRelItemRelUser */
$skillRelItemRelUser = $em->getRepository('ChamiloSkillBundle:SkillRelItemRelUser')->findOneBy($criteria);
/** @var SkillRelItemRelUser $skillRelItemRelUser */
$skillRelItemRelUser = $em->getRepository('ChamiloCoreBundle:SkillRelItemRelUser')->findOneBy($criteria);
$itemInfo['status'] = $skillRelItemRelUser ? true : false;
$itemInfo['url_activity'] = $codePath.$skill->getItemResultList(api_get_cidreq());
if ($skillRelItemRelUser) {

12
public/main/inc/ajax/skill.ajax.php
Unescape View File

@ -373,12 +373,12 @@ switch ($action) {
exit;
}
$em = Database::getManager();
$skills = $em->getRepository('ChamiloSkillBundle:SkillRelCourse')->findBy(
$skills = $em->getRepository('ChamiloCoreBundle:SkillRelCourse')->findBy(
['course' => $courseId, 'session' => $sessionId]
);
$returnSkills = [];
/** @var \Chamilo\SkillBundle\Entity\SkillRelCourse $skill */
/** @var \Chamilo\CoreBundle\Entity\SkillRelCourse $skill */
foreach ($skills as $skill) {
$returnSkills[] = [
'id' => $skill->getSkill()->getId(),
@ -421,8 +421,8 @@ switch ($action) {
}
$session = $em->getRepository('ChamiloCoreBundle:Session')->find($sessionId);
/** @var \Chamilo\SkillBundle\Entity\SkillRelItem $skillRelItem */
$skillRelItem = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findOneBy(
/** @var \Chamilo\CoreBundle\Entity\SkillRelItem $skillRelItem */
$skillRelItem = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findOneBy(
['itemId' => $itemId, 'itemType' => $typeId, 'skill' => $skillId]
);
@ -431,13 +431,13 @@ switch ($action) {
'user' => $userId,
'skillRelItem' => $skillRelItem,
];
$skillRelItemRelUser = $em->getRepository('ChamiloSkillBundle:SkillRelItemRelUser')->findOneBy($criteria);
$skillRelItemRelUser = $em->getRepository('ChamiloCoreBundle:SkillRelItemRelUser')->findOneBy($criteria);
if ($skillRelItemRelUser) {
$em->remove($skillRelItemRelUser);
$em->flush();
$skillRelItemRelUser = null;
} else {
$skillRelItemRelUser = new Chamilo\SkillBundle\Entity\SkillRelItemRelUser();
$skillRelItemRelUser = new Chamilo\CoreBundle\Entity\SkillRelItemRelUser();
$skillRelItemRelUser
->setUser($user)
->setSkillRelItem($skillRelItem)

2
public/main/inc/lib/database.lib.php
Unescape View File

@ -35,10 +35,8 @@ class Database
$config->setAutoGenerateProxyClasses(true);
$config->setEntityNamespaces(
[
'ChamiloCoreBundle' => 'Chamilo\CoreBundle\Entity',
'ChamiloCoreBundle' => 'Chamilo\CoreBundle\Entity',
'ChamiloCourseBundle' => 'Chamilo\CourseBundle\Entity',
'ChamiloSkillBundle' => 'Chamilo\SkillBundle\Entity',
'ChamiloTicketBundle' => 'Chamilo\TicketBundle\Entity',
'ChamiloPluginBundle' => 'Chamilo\PluginBundle\Entity',
]

29
public/main/inc/lib/skill.lib.php
Unescape View File

@ -3,9 +3,10 @@
use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
use Chamilo\CoreBundle\Entity\Skill as SkillEntity;
use Chamilo\CoreBundle\Entity\SkillRelItemRelUser;
use Chamilo\CoreBundle\Entity\SkillRelUser as SkillRelUserEntity;
use Chamilo\SkillBundle\Entity\SkillRelCourse;
use Chamilo\SkillBundle\Entity\SkillRelItem;
use Chamilo\CoreBundle\Entity\SkillRelCourse;
use Chamilo\CoreBundle\Entity\SkillRelItem;
use Chamilo\CoreBundle\Entity\User;
use Fhaculty\Graph\Graph;
use Fhaculty\Graph\Vertex;
@ -2482,9 +2483,9 @@ class Skill extends Model
}
/**
* @param \Chamilo\SkillBundle\Entity\SkillRelItem $skillRelItem
* @param \Chamilo\SkillBundle\Entity\SkillRelItemRelUser $skillRelItemRelUser
* @param bool $addHeader
* @param SkillRelItem $skillRelItem
* @param SkillRelItemRelUser $skillRelItemRelUser
* @param bool $addHeader
*
* @return string
*/
@ -2522,7 +2523,7 @@ class Skill extends Model
$allowSkillInTools = api_get_configuration_value('allow_skill_rel_items');
if ($allowSkillInTools && !empty($typeId) && !empty($itemId) && !empty($userId)) {
$em = Database::getManager();
$items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
$items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy(
['itemId' => $itemId, 'itemType' => $typeId]
);
@ -2539,7 +2540,7 @@ class Skill extends Model
'user' => $userId,
'skillRelItem' => $skillRelItem,
];
$skillRelItemRelUser = $em->getRepository('ChamiloSkillBundle:SkillRelItemRelUser')->findOneBy($criteria);
$skillRelItemRelUser = $em->getRepository('ChamiloCoreBundle:SkillRelItemRelUser')->findOneBy($criteria);
$skills .= self::getUserSkillStatusLabel($skillRelItem, $skillRelItemRelUser);
}
@ -2605,7 +2606,7 @@ class Skill extends Model
$skillList = [];
if (!empty($itemId)) {
$em = Database::getManager();
$items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
$items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy(
['itemId' => $itemId, 'itemType' => $typeId]
);
/** @var SkillRelItem $skillRelItem */
@ -2649,7 +2650,7 @@ class Skill extends Model
if ($allowSkillInTools) {
$em = Database::getManager();
$skills = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
$skills = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy(
['courseId' => $courseId, 'sessionId' => $sessionId]
);
}
@ -2742,7 +2743,7 @@ class Skill extends Model
$skills = [];
if ($allowSkillInTools) {
$em = Database::getManager();
$skills = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
$skills = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy(
['itemId' => $itemId, 'itemType' => $typeId]
);
}
@ -2785,7 +2786,7 @@ class Skill extends Model
$em = Database::getManager();
// Delete old ones
$items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
$items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy(
['itemId' => $itemId, 'itemType' => $typeId]
);
@ -2824,7 +2825,7 @@ class Skill extends Model
$skills = (array) $form->getSubmitValue('skills');
// Delete old ones
$items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy(
$items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy(
['itemId' => $itemId, 'itemType' => $typeId]
);
if (!empty($items)) {
@ -2910,7 +2911,7 @@ class Skill extends Model
}
// Delete old ones
$items = $em->getRepository('ChamiloSkillBundle:SkillRelCourse')->findBy(
$items = $em->getRepository('ChamiloCoreBundle:SkillRelCourse')->findBy(
['course' => $courseId, 'session' => $sessionId]
);
@ -2995,7 +2996,7 @@ class Skill extends Model
if (!empty($result)) {
return false;
}
$skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level');
$skillLevelRepo = $entityManager->getRepository('ChamiloCoreBundle:Level');
$skillUser = new SkillRelUserEntity();
$skillUser->setUser($user);

4
src/SkillBundle/Entity/Level.php → src/CoreBundle/Entity/Level.php
Unescape View File

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
namespace Chamilo\SkillBundle\Entity;
namespace Chamilo\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;
@ -48,7 +48,7 @@ class Level
/**
* @Gedmo\SortableGroup
*
* @ORM\ManyToOne(targetEntity="Chamilo\SkillBundle\Entity\Profile", inversedBy="levels")
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Profile", inversedBy="levels")
* @ORM\JoinColumn(name="profile_id", referencedColumnName="id")
*/
protected $profile;

4
src/SkillBundle/Entity/Profile.php → src/CoreBundle/Entity/Profile.php
Unescape View File

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
namespace Chamilo\SkillBundle\Entity;
namespace Chamilo\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
@ -36,7 +36,7 @@ class Profile
protected $skills;
/**
* @ORM\OneToMany(targetEntity="Chamilo\SkillBundle\Entity\Level", mappedBy="profile", cascade={"persist"})
* @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\Level", mappedBy="profile", cascade={"persist"})
* @ORM\OrderBy({"position" = "ASC"})
*/
protected $levels;

2
src/SkillBundle/Entity/SkillRelCourse.php → src/CoreBundle/Entity/SkillRelCourse.php
Unescape View File

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
namespace Chamilo\SkillBundle\Entity;
namespace Chamilo\CoreBundle\Entity;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;

2
src/SkillBundle/Entity/SkillRelItem.php → src/CoreBundle/Entity/SkillRelItem.php
Unescape View File

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
namespace Chamilo\SkillBundle\Entity;
namespace Chamilo\CoreBundle\Entity;
use Chamilo\CoreBundle\Entity\Skill;
use Doctrine\ORM\Mapping as ORM;

4
src/SkillBundle/Entity/SkillRelItemRelUser.php → src/CoreBundle/Entity/SkillRelItemRelUser.php
Unescape View File

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
namespace Chamilo\SkillBundle\Entity;
namespace Chamilo\CoreBundle\Entity;
use Chamilo\CoreBundle\Entity\User;
use Doctrine\ORM\Mapping as ORM;
@ -30,7 +30,7 @@ class SkillRelItemRelUser
/**
* @var SkillRelItem
*
* @ORM\ManyToOne(targetEntity="Chamilo\SkillBundle\Entity\SkillRelItem", cascade={"persist"})
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\SkillRelItem", cascade={"persist"})
* @ORM\JoinColumn(name="skill_rel_item_id", referencedColumnName="id", nullable=false)
*/
protected $skillRelItem;

15
src/CourseBundle/Resources/config/services.yml
Unescape View File

@ -3,8 +3,6 @@ services:
autowire: true
public: true
League\Flysystem\MountManager: '@oneup_flysystem.mount_manager'
chamilo_course.registry.settings_schema:
class: Sylius\Component\Registry\ServiceRegistry
arguments:
@ -192,16 +190,3 @@ services:
- [setRequest, ['@request_stack']]
tags:
- {name: kernel.event_listener, event: chamilo_course.course.session, method: onSessionAccessEvent}
# Voters
# Group voter, checks if a user has permissions to do actions
chamilo_course.security.authorization.voter.group_voter:
class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter
arguments:
- '@doctrine.orm.entity_manager'
- '@Chamilo\CoreBundle\Repository\CourseRepository'
- '@Chamilo\CourseBundle\Repository\CGroupInfoRepository'
- '@security.authorization_checker'
- '@service_container'
public: false
tags:
- {name: security.voter}

14
src/SkillBundle/ChamiloSkillBundle.php
Unescape View File

@ -1,14 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\SkillBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
/**
* Class ChamiloSkillBundle.
*/
class ChamiloSkillBundle extends Bundle
{
}
Write Preview
Loading…
Cancel
Save