Minor - flint fixes

pull/3016/head
Julio Montoya 6 years ago
parent 3e3f6e435d
commit 53f765f335
  1. 8
      main/glossary/glossary_ajax_request.php
  2. 2
      main/inc/lib/CoursesAndSessionsCatalog.class.php
  3. 8
      main/inc/lib/document.lib.php
  4. 112
      main/inc/lib/tracking.lib.php
  5. 2
      src/CoreBundle/Controller/ResourceController.php
  6. 9
      src/CoreBundle/Entity/Resource/ResourceFile.php
  7. 4
      src/CoreBundle/Migrations/Schema/V200/Version20.php

@ -48,10 +48,10 @@ if (!empty($glossaryId)) {
if (!empty($glossaryInfo)) {
$description = str_replace(
$path_image_search,
$path_image,
$glossaryInfo['description']
);
$path_image_search,
$path_image,
$glossaryInfo['description']
);
if (is_null($description) || strlen(trim($description)) == 0) {
$description = get_lang('NoResults');

@ -10,7 +10,7 @@ use Doctrine\ORM\Query\Expr\Join;
*/
class CoursesAndSessionsCatalog
{
const PAGE_LENGTH = 12;
public const PAGE_LENGTH = 12;
/**
* Check the configuration for the courses and sessions catalog.

@ -11,8 +11,8 @@ use Chamilo\CourseBundle\Entity\CGroupInfo;
use Chamilo\UserBundle\Entity\User;
use ChamiloSession as Session;
use Sonata\MediaBundle\Extra\ApiMediaFile;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\File\File;
use Symfony\Component\HttpFoundation\File\UploadedFile;
/**
* Class DocumentManager
@ -6364,9 +6364,7 @@ class DocumentManager
// Only create a ResourceFile and Media if there's a file involved
if ($fileType === 'file') {
$mediaManager = Container::$container->get('sonata.media.manager.media');
//$mediaManager->create();
/** @var League\Flysystem\Adapter\Local $mediaManager */
/** @var League\Flysystem\Adapter\Local $mediaManager */
$mediaManager = Container::$container->get('oneup_flysystem.resources_filesystem');
/** @var League\Flysystem\Adapter\Local $mediaManager */
//$mediaManager = Container::$container->get('flysystem');
@ -6379,8 +6377,6 @@ class DocumentManager
if ($content instanceof UploadedFile) {
error_log('UploadedFile');
//$file = $content;
//$media->setSize($file->getSize());
} else {
// $path points to a file in the directory
if (file_exists($realPath) && !is_dir($realPath)) {

@ -2712,13 +2712,13 @@ class Tracking
// Getting latest LP result for a student
//@todo problem when a course have more than 1500 users
$sql = "SELECT MAX(view_count) as vc, id, progress, lp_id, user_id
FROM $lp_view_table
WHERE
c_id = $course_id AND
lp_id IN (".implode(',', $lp_list).")
$condition_user1 AND
session_id = $session_id
GROUP BY lp_id, user_id";
FROM $lp_view_table
WHERE
c_id = $course_id AND
lp_id IN (".implode(',', $lp_list).")
$condition_user1 AND
session_id = $session_id
GROUP BY lp_id, user_id";
$rs_last_lp_view_id = Database::query($sql);
$global_result = 0;
@ -2758,27 +2758,27 @@ class Tracking
// Getting the most recent attempt
$sql = "SELECT
lp_iv.id as lp_item_view_id,
lp_iv.score as score,
lp_i.max_score,
lp_iv.max_score as max_score_item_view,
lp_i.path,
lp_i.item_type,
lp_i.id as iid
FROM $lp_item_view_table as lp_iv
INNER JOIN $lp_item_table as lp_i
ON (
lp_i.id = lp_iv.lp_item_id AND
lp_iv.c_id = lp_i.c_id
)
WHERE
lp_iv.c_id = $course_id AND
lp_i.c_id = $course_id AND
lp_item_id = $my_lp_item_id AND
lp_view_id = $lp_view_id AND
(lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."')
ORDER BY $order
LIMIT 1";
lp_iv.id as lp_item_view_id,
lp_iv.score as score,
lp_i.max_score,
lp_iv.max_score as max_score_item_view,
lp_i.path,
lp_i.item_type,
lp_i.id as iid
FROM $lp_item_view_table as lp_iv
INNER JOIN $lp_item_table as lp_i
ON (
lp_i.id = lp_iv.lp_item_id AND
lp_iv.c_id = lp_i.c_id
)
WHERE
lp_iv.c_id = $course_id AND
lp_i.c_id = $course_id AND
lp_item_id = $my_lp_item_id AND
lp_view_id = $lp_view_id AND
(lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."')
ORDER BY $order
LIMIT 1";
$res_lp_item_result = Database::query($sql);
while ($row_max_score = Database::fetch_array($res_lp_item_result, 'ASSOC')) {
@ -2789,23 +2789,23 @@ class Tracking
// For the currently analysed view, get the score and
// max_score of each item if it is a sco or a TOOL_QUIZ
$sql = "SELECT
lp_iv.id as lp_item_view_id,
lp_iv.score as score,
lp_i.max_score,
lp_iv.max_score as max_score_item_view,
lp_i.path,
lp_i.item_type,
lp_i.id as iid
FROM $lp_item_view_table as lp_iv
INNER JOIN $lp_item_table as lp_i
ON lp_i.id = lp_iv.lp_item_id AND
lp_iv.c_id = lp_i.c_id
WHERE
lp_iv.c_id = $course_id AND
lp_i.c_id = $course_id AND
lp_view_id = $lp_view_id AND
(lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."')
";
lp_iv.id as lp_item_view_id,
lp_iv.score as score,
lp_i.max_score,
lp_iv.max_score as max_score_item_view,
lp_i.path,
lp_i.item_type,
lp_i.id as iid
FROM $lp_item_view_table as lp_iv
INNER JOIN $lp_item_table as lp_i
ON lp_i.id = lp_iv.lp_item_id AND
lp_iv.c_id = lp_i.c_id
WHERE
lp_iv.c_id = $course_id AND
lp_i.c_id = $course_id AND
lp_view_id = $lp_view_id AND
(lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."')
";
$res_max_score = Database::query($sql);
while ($row_max_score = Database::fetch_array($res_max_score, 'ASSOC')) {
$list[] = $row_max_score;
@ -2867,17 +2867,17 @@ class Tracking
$order = 'score DESC';
}
$sql = "SELECT exe_id, score
FROM $tbl_stats_exercices
WHERE
exe_exo_id = '$item_path' AND
exe_user_id = $user_id AND
orig_lp_item_id = $item_id AND
$lpItemCondition AND
c_id = $course_id AND
session_id = $session_id AND
status = ''
ORDER BY $order
LIMIT 1";
FROM $tbl_stats_exercices
WHERE
exe_exo_id = '$item_path' AND
exe_user_id = $user_id AND
orig_lp_item_id = $item_id AND
$lpItemCondition AND
c_id = $course_id AND
session_id = $session_id AND
status = ''
ORDER BY $order
LIMIT 1";
$result_last_attempt = Database::query($sql);
$num = Database::num_rows($result_last_attempt);

@ -445,7 +445,7 @@ class ResourceController extends BaseController implements CourseControllerInter
switch ($type) {
case 'show':
return $downloadHandler->downloadObject($resourceFile, $fileField = 'file');
$file = $resourceFile->getFile();
$file = $resourceFile->getFile();
var_dump($file);

@ -38,16 +38,18 @@ class ResourceFile
protected $name;
/**
* @ORM\Column(type="integer")
* @var int
*
* @var integer
* @ORM\Column(type="integer")
*
*/
protected $size;
/**
* @Vich\UploadableField(mapping="resources", fileNameProperty="name", size="size")
* @var File
*
* @Vich\UploadableField(mapping="resources", fileNameProperty="name", size="size")
*
*/
protected $file;
@ -398,7 +400,6 @@ class ResourceFile
/**
* @param File|\Symfony\Component\HttpFoundation\File\UploadedFile $file
*
*/
public function setFile(File $file = null): void
{

@ -933,8 +933,7 @@ class Version20 extends AbstractMigrationChamilo
$this->addSql("INSERT INTO settings_options (variable, value, display_text) VALUES ('exercise_invisible_in_session','false','No')");
}
$result = $connection
->executeQuery("SELECT COUNT(1) FROM settings_current WHERE variable = 'configure_exercise_visibility_in_course' AND category = 'Session'");
$result = $connection->executeQuery("SELECT COUNT(1) FROM settings_current WHERE variable = 'configure_exercise_visibility_in_course' AND category = 'Session'");
$count = $result->fetch()[0];
if (empty($count)) {
@ -945,7 +944,6 @@ class Version20 extends AbstractMigrationChamilo
//ALTER TABLE resource_file ADD name VARCHAR(255) NOT NULL, ADD size INT NOT NULL;
//ALTER TABLE resource_file_audit ADD name VARCHAR(255) DEFAULT NULL, ADD size INT DEFAULT NULL;
}
/**

Loading…
Cancel
Save