Minor - flint fixes

pull/2874/head
Julio Montoya 7 years ago
parent 12f3807e0e
commit 9262b38429
  1. 2
      main/exercise/export/aiken/aiken_import.inc.php
  2. 2
      main/exercise/question.class.php
  3. 1
      main/inc/global.inc.php
  4. 5
      main/inc/lib/exercise.lib.php
  5. 5
      main/inc/lib/tracking.lib.php
  6. 34
      main/session/session_category_list.php
  7. 2
      src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php

@ -10,8 +10,6 @@
* @package chamilo.exercise * @package chamilo.exercise
*/ */
use Chamilo\CourseBundle\Entity\CQuizAnswer;
/** /**
* This function displays the form for import of the zip file with qti2. * This function displays the form for import of the zip file with qti2.
* *

@ -122,7 +122,7 @@ abstract class Question
/** /**
* Reads question information from the data base. * Reads question information from the data base.
* *
* @param int $id - question ID * @param int $id - question ID
* @param array $course_info * @param array $course_info
* @param bool $getExerciseList * @param bool $getExerciseList
* *

@ -16,7 +16,6 @@ use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
* @todo remove the code that displays the button that links to the install page * @todo remove the code that displays the button that links to the install page
* but use a redirect immediately. By doing so the $alreadyInstalled variable can be removed. * but use a redirect immediately. By doing so the $alreadyInstalled variable can be removed.
*/ */
define('SHOW_ERROR_CODES', false); define('SHOW_ERROR_CODES', false);
// Include the libraries that are necessary everywhere // Include the libraries that are necessary everywhere

@ -5343,12 +5343,13 @@ EOT;
/** /**
* Check if an exercise complies with the requirements to be embedded in the mobile app or a video. By making sure * Check if an exercise complies with the requirements to be embedded in the mobile app or a video. By making sure
* it is set on one question per page and it only contains unique-answer or multiple-answer questions * it is set on one question per page and it only contains unique-answer or multiple-answer questions.
* *
* @param array $exercise Exercise info * @param array $exercise Exercise info
* *
* @return bool
* @throws \Doctrine\ORM\Query\QueryException * @throws \Doctrine\ORM\Query\QueryException
*
* @return bool
*/ */
public static function isQuizEmbeddable(array $exercise) public static function isQuizEmbeddable(array $exercise)
{ {

@ -3995,11 +3995,10 @@ class Tracking
* *
* @param array|int $student_id * @param array|int $student_id
* @param string $course_code * @param string $course_code
* @param int $session_id if param is null(default) return count of assignments including sessions, * @param int $session_id if param is null(default) return count of assignments including sessions,
* 0 = session is not filtered * 0 = session is not filtered
* *
* @return int Count of assignments * @return int Count of assignments
*
*/ */
public static function count_student_assignments( public static function count_student_assignments(
$student_id, $student_id,

@ -109,11 +109,10 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') {
Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), [], ICON_SIZE_MEDIUM), Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), [], ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'session/session_category_add.php' api_get_path(WEB_CODE_PATH).'session/session_category_add.php'
); );
echo Display::url( echo Display::url(
Display::return_icon('session.png', get_lang('ListSession'), [], ICON_SIZE_MEDIUM), Display::return_icon('session.png', get_lang('ListSession'), [], ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'session/session_list.php' api_get_path(WEB_CODE_PATH).'session/session_list.php'
); ); ?>
?>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="pull-right"> <div class="pull-right">
@ -166,13 +165,10 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') {
<?php <?php
} else { } else {
echo get_lang('Next'); echo get_lang('Next');
} } ?>
?>
</div> </div>
<?php <?php
} } ?>
?>
<table class="data_table" width="100%"> <table class="data_table" width="100%">
<tr> <tr>
@ -190,12 +186,12 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') {
<?php <?php
$i = 0; $i = 0;
$x = 0; $x = 0;
foreach ($Sessions as $key => $enreg) { foreach ($Sessions as $key => $enreg) {
if ($key == $limit) { if ($key == $limit) {
break; break;
} }
$sql = 'SELECT COUNT(session_category_id) $sql = 'SELECT COUNT(session_category_id)
FROM '.$tbl_session.' s FROM '.$tbl_session.' s
INNER JOIN '.$table_access_url_rel_session.' us INNER JOIN '.$table_access_url_rel_session.' us
ON (s.id = us.session_id) ON (s.id = us.session_id)
@ -203,8 +199,8 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') {
s.session_category_id = '.intval($enreg['id']).' AND s.session_category_id = '.intval($enreg['id']).' AND
us.access_url_id = '.api_get_current_access_url_id(); us.access_url_id = '.api_get_current_access_url_id();
$rs = Database::query($sql); $rs = Database::query($sql);
list($nb_courses) = Database::fetch_array($rs); ?> list($nb_courses) = Database::fetch_array($rs); ?>
<tr class="<?php echo $i ? 'row_odd' : 'row_even'; ?>"> <tr class="<?php echo $i ? 'row_odd' : 'row_even'; ?>">
<td><input type="checkbox" id="idChecked_<?php echo $x; ?>" name="idChecked[]" <td><input type="checkbox" id="idChecked_<?php echo $x; ?>" name="idChecked[]"
value="<?php echo $enreg['id']; ?>"></td> value="<?php echo $enreg['id']; ?>"></td>
@ -235,9 +231,9 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') {
</tr> </tr>
<?php <?php
$i = $i ? 0 : 1; $i = $i ? 0 : 1;
$x++; $x++;
} }
unset($Sessions); ?> unset($Sessions); ?>
</table> </table>
<br/> <br/>
<div> <div>

@ -357,7 +357,7 @@ class ChamiloApi
} }
/** /**
* Get JavaScript code necessary to load quiz markers-rolls in medialement's Markers Rolls plugin * Get JavaScript code necessary to load quiz markers-rolls in medialement's Markers Rolls plugin.
* *
* @return string * @return string
*/ */

Loading…
Cancel
Save