Minor - Flint fixes

pull/2990/head
Angel Fernando Quiroz Campos 6 years ago
parent 49a99aa1b5
commit 9e6c750e6f
  1. 2
      main/cron/import_csv.php
  2. 4
      main/exercise/exercise.class.php
  3. 7
      main/mySpace/access_details_session.php

@ -1440,7 +1440,7 @@ class ImportCsv
$externalCareerIds = []; $externalCareerIds = [];
if (substr($externalCareerIdList, 0, 1) === '[') { if (substr($externalCareerIdList, 0, 1) === '[') {
$externalCareerIdList = substr($externalCareerIdList, 1, -1); $externalCareerIdList = substr($externalCareerIdList, 1, -1);
$externalCareerIds = preg_split('/,/',$externalCareerIdList); $externalCareerIds = preg_split('/,/', $externalCareerIdList);
} else { } else {
$externalCareerIds = [$externalCareerIdList]; $externalCareerIds = [$externalCareerIdList];
} }

@ -7939,6 +7939,7 @@ class Exercise
if (empty($this->exerciseCategoryId)) { if (empty($this->exerciseCategoryId)) {
return null; return null;
} }
return (int) $this->exerciseCategoryId; return (int) $this->exerciseCategoryId;
} }
@ -7948,7 +7949,7 @@ class Exercise
public function setExerciseCategoryId($value) public function setExerciseCategoryId($value)
{ {
if (!empty($value)) { if (!empty($value)) {
$this->exerciseCategoryId = (int)$value; $this->exerciseCategoryId = (int) $value;
} }
} }
@ -8372,6 +8373,7 @@ class Exercise
* Return an HTML table of exercises for on-screen printing, including * Return an HTML table of exercises for on-screen printing, including
* action icons. If no exercise is present and the user can edit the * action icons. If no exercise is present and the user can edit the
* course, show a "create test" button. * course, show a "create test" button.
*
* @param int $categoryId * @param int $categoryId
* @param string $keyword * @param string $keyword
* *

@ -155,7 +155,7 @@ if ($form->validate()) {
// Partials // Partials
$partialDuration += $item['duration']; $partialDuration += $item['duration'];
/* /*
if (empty($partialMinLogin)) { if (empty($partialMinLogin)) {
$partialMinLogin = api_strtotime($item['login'], 'UTC'); $partialMinLogin = api_strtotime($item['login'], 'UTC');
} }
@ -222,7 +222,7 @@ if ($form->validate()) {
// Partials // Partials
$partialDuration += $item['duration']; $partialDuration += $item['duration'];
/* /*
if (empty($partialMinLogin)) { if (empty($partialMinLogin)) {
$partialMinLogin = api_strtotime($item['login'], 'UTC'); $partialMinLogin = api_strtotime($item['login'], 'UTC');
} }
@ -236,7 +236,7 @@ if ($form->validate()) {
} }
if (!empty($result)) { if (!empty($result)) {
/* /*
$record = [ $record = [
customDate($partialMinLogin, true), customDate($partialMinLogin, true),
customDate($partialMaxLogin, true), customDate($partialMaxLogin, true),
@ -249,7 +249,6 @@ if ($form->validate()) {
api_format_time($partialDuration, 'js'), api_format_time($partialDuration, 'js'),
]; ];
$report[0]['courses'][$course['course_id']][] = $record; $report[0]['courses'][$course['course_id']][] = $record;
$report[0]['name'][$course['course_id']] = $course['title']; $report[0]['name'][$course['course_id']] = $course['title'];
} }

Loading…
Cancel
Save