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

Minor: Format code

Browse Source
pull/4473/head
Angel Fernando Quiroz Campos 3 years ago
parent bac89f62cb
commit e9353ba96c
3 changed files with 49 additions and 97 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. 22
      main/inc/ajax/sequence.ajax.php
  2. 61
      src/Chamilo/CoreBundle/Entity/Repository/SequenceResourceRepository.php
  3. 63
      src/Chamilo/CoreBundle/Entity/Sequence.php

22
main/inc/ajax/sequence.ajax.php
Unescape View File

@ -16,16 +16,16 @@ use Graphp\GraphViz\GraphViz;
*/
require_once __DIR__.'/../global.inc.php';
$action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
$id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
$type = isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
$sequenceId = isset($_REQUEST['sequence_id']) ? $_REQUEST['sequence_id'] : 0;
$action = $_REQUEST['a'] ?? null;
$id = (int) ($_REQUEST['id'] ?? null);
$type = (int) ($_REQUEST['type'] ?? null);
$sequenceId = $_REQUEST['sequence_id'] ?? 0;
$em = Database::getManager();
/** @var SequenceRepository $sequenceRepository */
$sequenceRepository = $em->getRepository('ChamiloCoreBundle:Sequence');
$sequenceRepository = $em->getRepository(Sequence::class);
/** @var SequenceResourceRepository $sequenceResourceRepository */
$sequenceResourceRepository = $em->getRepository('ChamiloCoreBundle:SequenceResource');
$sequenceResourceRepository = $em->getRepository(SequenceResource::class);
switch ($action) {
case 'graph':
@ -68,7 +68,7 @@ switch ($action) {
api_block_anonymous_users();
api_protect_admin_script();
$showDelete = isset($_REQUEST['show_delete']) ? $_REQUEST['show_delete'] : false;
$showDelete = $_REQUEST['show_delete'] ?? false;
$image = Display::return_icon('item-sequence.png', null, null, ICON_SIZE_LARGE);
if (empty($id)) {
@ -97,7 +97,7 @@ switch ($action) {
exit;
}
if (!empty($resourceData) && $showDelete) {
if ($showDelete) {
$linkDelete = Display::toolbarButton(
get_lang('Delete'),
'#',
@ -145,7 +145,7 @@ switch ($action) {
api_block_anonymous_users();
api_protect_admin_script();
$vertexId = isset($_REQUEST['vertex_id']) ? $_REQUEST['vertex_id'] : null;
$vertexId = $_REQUEST['vertex_id'] ?? null;
/** @var Sequence $sequence */
$sequence = $sequenceRepository->find($sequenceId);
@ -251,7 +251,7 @@ switch ($action) {
api_protect_admin_script();
// children or parent
$loadResourceType = isset($_REQUEST['load_resource_type']) ? $_REQUEST['load_resource_type'] : null;
$loadResourceType = $_REQUEST['load_resource_type'] ?? null;
/** @var Sequence $sequence */
$sequence = $sequenceRepository->find($sequenceId);
@ -306,7 +306,7 @@ switch ($action) {
api_block_anonymous_users();
api_protect_admin_script();
$parents = isset($_REQUEST['parents']) ? $_REQUEST['parents'] : '';
$parents = $_REQUEST['parents'] ?? '';
if (empty($parents) || empty($sequenceId) || empty($type)) {
exit;

61
src/Chamilo/CoreBundle/Entity/Repository/SequenceResourceRepository.php
Unescape View File

@ -4,13 +4,17 @@
namespace Chamilo\CoreBundle\Entity\Repository;
use Category;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelUser;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\ORMException;
use Fhaculty\Graph\Set\Vertices;
use Fhaculty\Graph\Vertex;
use SessionManager;
/**
* Class SequenceResourceRepository.
@ -22,10 +26,8 @@ class SequenceResourceRepository extends EntityRepository
*
* @param int $resourceId
* @param int $type
*
* @return SequenceResource
*/
public function findRequirementForResource($resourceId, $type)
public function findRequirementForResource($resourceId, $type): ?SequenceResource
{
return $this->findOneBy(['resourceId' => $resourceId, 'type' => $type]);
}
@ -35,10 +37,8 @@ class SequenceResourceRepository extends EntityRepository
*
* @param int $resourceId
* @param int $type
*
* @return array
*/
public function getRequirementAndDependencies($resourceId, $type)
public function getRequirementAndDependencies($resourceId, $type): array
{
$sequence = $this->findRequirementForResource($resourceId, $type);
$result = ['requirements' => [], 'dependencies' => []];
@ -50,7 +50,7 @@ class SequenceResourceRepository extends EntityRepository
foreach ($from as $subVertex) {
$vertexId = $subVertex->getId();
$sessionInfo = api_get_session_info($vertexId);
$sessionInfo['admin_link'] = '<a href="'.\SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
$sessionInfo['admin_link'] = '<a href="'.SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
$result['requirements'][] = $sessionInfo;
}
@ -58,7 +58,7 @@ class SequenceResourceRepository extends EntityRepository
foreach ($to as $subVertex) {
$vertexId = $subVertex->getId();
$sessionInfo = api_get_session_info($vertexId);
$sessionInfo['admin_link'] = '<a href="'.\SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
$sessionInfo['admin_link'] = '<a href="'.SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
$result['dependencies'][] = $sessionInfo;
}
}
@ -68,10 +68,13 @@ class SequenceResourceRepository extends EntityRepository
/**
* Deletes a node and check in all the dependencies if the node exists in
* order to deleted.
* order to delete.
*
* @param int $resourceId
* @param int $type
*
* @throws ORMException
* @throws OptimisticLockException
*/
public function deleteResource($resourceId, $type)
{
@ -106,10 +109,8 @@ class SequenceResourceRepository extends EntityRepository
*
* @param int $resourceId The resource ID
* @param int $type The type of sequence resource
*
* @return array
*/
public function getRequirements($resourceId, $type)
public function getRequirements($resourceId, $type): array
{
$sequencesResource = $this->findBy(['resourceId' => $resourceId, 'type' => $type]);
$em = $this->getEntityManager();
@ -161,13 +162,8 @@ class SequenceResourceRepository extends EntityRepository
/**
* Get the requirements and dependencies within a sequence for a resource.
*
* @param int $resourceId The resource ID
* @param int $type The type of sequence resource
*
* @return array
*/
public function getRequirementsAndDependenciesWithinSequences($resourceId, $type)
public function getRequirementsAndDependenciesWithinSequences(int $resourceId, int $type): array
{
$sequencesResource = $this->findBy([
'resourceId' => $resourceId,
@ -208,10 +204,8 @@ class SequenceResourceRepository extends EntityRepository
* @param int $type The type of sequence resource
* @param int $userId
* @param int $sessionId
*
* @return array
*/
public function checkRequirementsForUser(array $sequences, $type, $userId, $sessionId = 0)
public function checkRequirementsForUser(array $sequences, int $type, $userId, $sessionId = 0): array
{
$sequenceList = [];
$em = $this->getEntityManager();
@ -263,9 +257,9 @@ class SequenceResourceRepository extends EntityRepository
);
foreach ($gradebooks as $gradebook) {
$category = \Category::createCategoryObjectFromEntity($gradebook);
$category = Category::createCategoryObjectFromEntity($gradebook);
if (!empty($userId)) {
$resourceItem['status'] = $resourceItem['status'] && \Category::userFinishedCourse(
$resourceItem['status'] = $resourceItem['status'] && Category::userFinishedCourse(
$userId,
$category
);
@ -282,7 +276,7 @@ class SequenceResourceRepository extends EntityRepository
$status = $this->checkCourseRequirements($userId, $resource, $checkSessionId);
if (false === $status) {
$sessionsInCourse = \SessionManager::get_session_by_course($id);
$sessionsInCourse = SessionManager::get_session_by_course($id);
foreach ($sessionsInCourse as $session) {
if (in_array($session['id'], $sessionUserList)) {
$status = $this->checkCourseRequirements($userId, $resource, $session['id']);
@ -313,7 +307,7 @@ class SequenceResourceRepository extends EntityRepository
return $sequenceList;
}
public function checkCourseRequirements($userId, Course $course, $sessionId)
public function checkCourseRequirements($userId, Course $course, $sessionId): bool
{
$em = $this->getEntityManager();
$sessionId = (int) $sessionId;
@ -333,8 +327,8 @@ class SequenceResourceRepository extends EntityRepository
$status = true;
foreach ($gradebooks as $gradebook) {
$category = \Category::createCategoryObjectFromEntity($gradebook);
$userFinishedCourse = \Category::userFinishedCourse(
$category = Category::createCategoryObjectFromEntity($gradebook);
$userFinishedCourse = Category::userFinishedCourse(
$userId,
$category,
true
@ -357,12 +351,8 @@ class SequenceResourceRepository extends EntityRepository
/**
* Check if at least one sequence are completed.
*
* @param array $sequences The sequences
*
* @return bool
*/
public function checkSequenceAreCompleted(array $sequences)
public function checkSequenceAreCompleted(array $sequences): bool
{
foreach ($sequences as $sequence) {
$status = true;
@ -381,13 +371,8 @@ class SequenceResourceRepository extends EntityRepository
/**
* Get sessions from vertices.
*
* @param Vertices $verticesEdges The vertices
* @param int $type
*
* @return array
*/
protected function findVerticesEdges(Vertices $verticesEdges, $type)
protected function findVerticesEdges(Vertices $verticesEdges, int $type): array
{
$sessionVertices = [];
$em = $this->getEntityManager();

63
src/Chamilo/CoreBundle/Entity/Sequence.php
Unescape View File

@ -4,9 +4,11 @@
namespace Chamilo\CoreBundle\Entity;
use DateTime;
use Doctrine\ORM\Mapping as ORM;
use Fhaculty\Graph\Graph;
use Gedmo\Mapping\Annotation as Gedmo;
use UnserializeApi;
/**
* Class Sequence.
@ -40,7 +42,7 @@ class Sequence
protected $graph;
/**
* @var \DateTime
* @var DateTime
*
* @Gedmo\Timestampable(on="create")
* @ORM\Column(name="created_at", type="datetime")
@ -48,7 +50,7 @@ class Sequence
protected $createdAt;
/**
* @var \DateTime
* @var DateTime
*
* @Gedmo\Timestampable(on="update")
* @ORM\Column(name="updated_at", type="datetime")
@ -63,88 +65,53 @@ class Sequence
return $this->name;
}
/**
* @return int
*/
public function getId()
public function getId(): int
{
return $this->id;
}
/**
* @param int $id
*
* @return Sequence
*/
public function setId($id)
public function setId(int $id): Sequence
{
$this->id = $id;
return $this;
}
/**
* @return string
*/
public function getName()
public function getName(): string
{
return $this->name;
}
/**
* @param string $name
*
* @return Sequence
*/
public function setName($name)
public function setName(string $name): Sequence
{
$this->name = $name;
return $this;
}
/**
* @return string
*/
public function getGraph()
public function getGraph(): string
{
return $this->graph;
}
/**
* @param string $graph
*
* @return Sequence
*/
public function setGraph($graph)
public function setGraph(string $graph): Sequence
{
$this->graph = $graph;
return $this;
}
/**
* @return bool
*/
public function hasGraph()
public function hasGraph(): bool
{
return !empty($this->graph) ? true : false;
return !empty($this->graph);
}
/**
* @return Graph
*/
public function getUnSerializeGraph()
public function getUnSerializeGraph(): Graph
{
return \UnserializeApi::unserialize('sequence_graph', $this->graph);
return UnserializeApi::unserialize('sequence_graph', $this->graph);
}
/**
* @param string $graph
*
* @return Sequence
*/
public function setGraphAndSerialize($graph)
public function setGraphAndSerialize(Graph $graph): Sequence
{
$this->setGraph(serialize($graph));

Write Preview
Loading…
Cancel
Save