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

Skill: Remove legacy methods to translate title and short code - refs BT#21568

Browse Source
pull/5919/head
Angel Fernando Quiroz Campos 10 months ago
parent 07094d08c8
commit b582f455f9
No known key found for this signature in database
GPG Key ID: B284841AE3E562CD
4 changed files with 63 additions and 103 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. 132
      public/main/inc/lib/SkillModel.php
  2. 9
      public/main/social/my_skills_report.php
  3. 20
      src/CoreBundle/Entity/Skill.php
  4. 3
      src/CoreBundle/Entity/User.php

132
public/main/inc/lib/SkillModel.php
Unescape View File

@ -80,6 +80,8 @@ class SkillModel extends Model
return []; return [];
} }
$skill = Database::getManager()->find(Skill::class, $id);
// @todo fix badges icons // @todo fix badges icons
//$path = api_get_path(WEB_UPLOAD_PATH).'badges/'; //$path = api_get_path(WEB_UPLOAD_PATH).'badges/';
$path = ''; $path = '';
@ -110,8 +112,8 @@ class SkillModel extends Model
$result['img_mini'] = Display::img($iconBig, $result['title'], ['width' => ICON_SIZE_MEDIUM]); $result['img_mini'] = Display::img($iconBig, $result['title'], ['width' => ICON_SIZE_MEDIUM]);
$result['img_big'] = Display::img($iconBig, $result['name']); $result['img_big'] = Display::img($iconBig, $result['name']);
$result['img_small'] = Display::img($iconSmall, $result['name']);*/ $result['img_small'] = Display::img($iconSmall, $result['name']);*/
$result['title'] = self::translateName($result['title']); $result['title'] = $skill->getTitle();
$result['short_code'] = self::translateCode($result['short_code']); $result['short_code'] = $skill->getShortCode();
return $result; return $result;
} }
@ -257,35 +259,41 @@ class SkillModel extends Model
} }
/** /**
* @param array $skill_list * @param array<int, int> $skill_list
* *
* @return array * @return array<int, array>
*/ */
public function getSkillsInfo($skill_list) public function getSkillsInfo(array $skill_list): array
{ {
$skillRepo = Container::getSkillRepository();
$skill_list = array_map('intval', $skill_list); $skill_list = array_map('intval', $skill_list);
$skill_list = implode("', '", $skill_list);
$sql = "SELECT * FROM {$this->table} $skills = $skillRepo->findBy(['id' => $skill_list]);
WHERE id IN ('$skill_list') "; $skillsInfo = [];
$result = Database::query($sql);
$skills = Database::store_result($result, 'ASSOC');
foreach ($skills as &$skill) { /** @var Skill $skill */
if (!$skill['icon']) { foreach ($skills as $skill) {
if (!$skill->getIcon()) {
continue; continue;
} }
$skill['icon_small'] = sprintf( $skillsInfo[] = [
'badges/%s-small.png', 'id' => $skill->getId(),
sha1($skill['title']) 'title' => $skill->getTitle(),
); 'description' => $skill->getDescription(),
$skill['title'] = self::translateName($skill['title']); 'access_url_id' => $skill->getAccessUrlId(),
$skill['short_code'] = self::translateCode($skill['short_code']); 'updated_at' => $skill->getUpdatedAt()->format('Y-m-d H:i:s'),
'short_code' => $skill->getShortCode(),
'icon' => $skill->getIcon(),
'criteria' => $skill->getCriteria(),
'status' => $skill->getStatus(),
'asset_id' => (string) $skill->getAsset()?->getId(),
'profile_id' => $skill->getProfile()?->getId(),
'icons_small' => sprintf('badges/%s-small.png', sha1($skill['title'])),
];
} }
return $skills; return $skillsInfo;
} }
/** /**
@ -346,8 +354,8 @@ class SkillModel extends Model
$row['asset'] = $assetRepo->getAssetUrl($skill->getAsset()); $row['asset'] = $assetRepo->getAssetUrl($skill->getAsset());
} }
$row['title'] = self::translateName($skill->getTitle()); $row['title'] = $skill->getTitle();
$row['short_code'] = self::translateCode($skill->getShortCode()); $row['short_code'] = $skill->getShortCode();
$skillRelSkill = new SkillRelSkillModel(); $skillRelSkill = new SkillRelSkillModel();
$parents = $skillRelSkill->getSkillParents($skillId); $parents = $skillRelSkill->getSkillParents($skillId);
$row['level'] = count($parents) - 1; $row['level'] = count($parents) - 1;
@ -665,6 +673,7 @@ class SkillModel extends Model
*/ */
public function getUserSkills($userId, $getSkillData = false, $courseId = 0, $sessionId = 0) public function getUserSkills($userId, $getSkillData = false, $courseId = 0, $sessionId = 0)
{ {
$em = Database::getManager();
$userId = (int) $userId; $userId = (int) $userId;
$courseId = (int) $courseId; $courseId = (int) $courseId;
$sessionId = (int) $sessionId; $sessionId = (int) $sessionId;
@ -681,9 +690,6 @@ class SkillModel extends Model
$sql = 'SELECT DISTINCT $sql = 'SELECT DISTINCT
s.id, s.id,
s.title,
s.icon,
s.asset_id,
u.id as issue, u.id as issue,
u.acquired_skill_at, u.acquired_skill_at,
u.course_id u.course_id
@ -815,11 +821,10 @@ class SkillModel extends Model
$asset = $assetRepo->find($resultData['asset_id']); $asset = $assetRepo->find($resultData['asset_id']);
} }
$skillTitle = self::translateName($resultData['title']);
$image = $asset ? $assetRepo->getAssetUrl($asset) : '/img/icons/32/badges-default.png'; $image = $asset ? $assetRepo->getAssetUrl($asset) : '/img/icons/32/badges-default.png';
$badgeImage = Display::img( $badgeImage = Display::img(
$image, $image,
$skillTitle, $resultData['title'],
['width' => '40'], ['width' => '40'],
false false
); );
@ -827,7 +832,7 @@ class SkillModel extends Model
'skill_id' => $resultData['id'], 'skill_id' => $resultData['id'],
'asset_id' => $resultData['asset_id'], 'asset_id' => $resultData['asset_id'],
'skill_badge' => $badgeImage, 'skill_badge' => $badgeImage,
'skill_title' => $skillTitle, 'skill_title' => $resultData['title'],
'short_code' => $resultData['short_code'], 'short_code' => $resultData['short_code'],
'skill_url' => $resultData['url'], 'skill_url' => $resultData['url'],
'achieved_at' => api_get_local_time($resultData['acquired_skill_at']), 'achieved_at' => api_get_local_time($resultData['acquired_skill_at']),
@ -1434,6 +1439,8 @@ class SkillModel extends Model
return []; return [];
} }
$em = Database::getManager();
$list = []; $list = [];
$sql = "SELECT $sql = "SELECT
@ -1445,7 +1452,6 @@ class SkillModel extends Model
user.firstname, user.firstname,
user.username, user.username,
skill.id skill_id, skill.id skill_id,
skill.title skill_title,
sru.acquired_skill_at sru.acquired_skill_at
FROM {$this->table_skill_rel_user} AS sru FROM {$this->table_skill_rel_user} AS sru
INNER JOIN {$this->table_course} INNER JOIN {$this->table_course}
@ -1459,7 +1465,8 @@ class SkillModel extends Model
$result = Database::query($sql); $result = Database::query($sql);
while ($row = Database::fetch_assoc($result)) { while ($row = Database::fetch_assoc($result)) {
$row['skill_title'] = self::translateName($row['skill_title']); $skill = $em->find(Skill::class, $row['skill_id']);
$row['skill_title'] = $skill->getTitle();
$list[] = $row; $list[] = $row;
} }
@ -1481,6 +1488,8 @@ class SkillModel extends Model
return []; return [];
} }
$em = Database::getManager();
$list = []; $list = [];
$sql = "SELECT $sql = "SELECT
course.id c_id, course.id c_id,
@ -1491,7 +1500,6 @@ class SkillModel extends Model
user.firstname, user.firstname,
user.username, user.username,
skill.id skill_id, skill.id skill_id,
skill.title skill_title,
sru.acquired_skill_at sru.acquired_skill_at
FROM {$this->table_skill_rel_user} AS sru FROM {$this->table_skill_rel_user} AS sru
INNER JOIN {$this->table_course} INNER JOIN {$this->table_course}
@ -1504,7 +1512,8 @@ class SkillModel extends Model
$result = Database::query($sql); $result = Database::query($sql);
while ($row = Database::fetch_assoc($result)) { while ($row = Database::fetch_assoc($result)) {
$row['skill_title'] = self::translateName($row['skill_title']); $skill = $em->find(Skill::class, $row['skill_id']);
$row['skill_title'] = $skill->getTitle();
$list[] = $row; $list[] = $row;
} }
@ -1706,31 +1715,24 @@ class SkillModel extends Model
*/ */
public function getStudentSkills($userId, $level = 0) public function getStudentSkills($userId, $level = 0)
{ {
$userId = (int) $userId; $achievedSkills = api_get_user_entity($userId)->getAchievedSkills();
$skills = [];
$sql = "SELECT s.id, s.title, sru.acquired_skill_at
FROM {$this->table} s
INNER JOIN {$this->table_skill_rel_user} sru
ON s.id = sru.skill_id
WHERE sru.user_id = $userId";
$query = Database::query($sql); foreach ($achievedSkills as $achievedSkill) {
$result = Database::store_result($query, 'ASSOC'); $skill = $achievedSkill->getSkill();
$skills = [];
foreach ($result as $item) {
if (empty($level)) { if (empty($level)) {
$skills[] = [ $skills[] = [
'title' => self::translateName($item['title']), 'title' => $skill->getTitle(),
'acquired_skill_at' => $item['acquired_skill_at'], 'acquired_skill_at' => $achievedSkill->getAcquiredSkillAt()->format('Y-m-d H:i:s'),
]; ];
} else { } else {
$parents = self::get_parents($item['id']); $parents = self::get_parents($skill->getId());
// +2 because it takes into account the root // +2 because it takes into account the root
if (count($parents) == $level + 1) { if (count($parents) == $level + 1) {
$skills[] = [ $skills[] = [
'title' => self::translateName($item['title']), 'title' => $skill->getTitle(),
'acquired_skill_at' => $item['acquired_skill_at'], 'acquired_skill_at' => $achievedSkill->getAcquiredSkillAt()->format('Y-m-d H:i:s'),
]; ];
} }
} }
@ -1739,40 +1741,6 @@ class SkillModel extends Model
return $skills; return $skills;
} }
/**
* @param string $name
*
* @return string
*/
public static function translateName($name)
{
$variable = ChamiloApi::getLanguageVar($name, 'Skill');
$translation = get_lang($variable);
if ($variable != $translation) {
return $translation;
}
return $name;
}
/**
* @param string $code
*
* @return mixed|string
*/
public static function translateCode($code)
{
if (empty($code)) {
return '';
}
$variable = ChamiloApi::getLanguageVar($code, 'SkillCode');
$translation = get_lang($variable);
if ($variable != $translation) {
return $translation;
}
return $code;
}
/** /**
* @param array $skillInfo * @param array $skillInfo
* *

9
public/main/social/my_skills_report.php
Unescape View File

@ -2,6 +2,7 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Skill;
use Chamilo\CoreBundle\Framework\Container; use Chamilo\CoreBundle\Framework\Container;
/** /**
@ -18,6 +19,8 @@ $isStudent = api_is_student();
$isStudentBoss = api_is_student_boss(); $isStudentBoss = api_is_student_boss();
$isDRH = api_is_drh(); $isDRH = api_is_drh();
$em = Database::getManager();
if (!$isStudent && !$isStudentBoss && !$isDRH) { if (!$isStudent && !$isStudentBoss && !$isDRH) {
header('Location: '.api_get_path(WEB_CODE_PATH).'social/skills_wheel.php'); header('Location: '.api_get_path(WEB_CODE_PATH).'social/skills_wheel.php');
exit; exit;
@ -74,7 +77,7 @@ if ($isStudent) {
if ($frmStudents->validate()) { if ($frmStudents->validate()) {
$selectedStudent = (int) $frmStudents->exportValue('student'); $selectedStudent = (int) $frmStudents->exportValue('student');
$sql = "SELECT s.title, sru.acquired_skill_at, c.title, c.directory, c.id as course_id $sql = "SELECT s.id AS skill_id9i, sru.acquired_skill_at, c.title, c.directory, c.id as course_id
FROM $skillTable s FROM $skillTable s
INNER JOIN $skillRelUserTable sru INNER JOIN $skillRelUserTable sru
ON s.id = sru.skill_id ON s.id = sru.skill_id
@ -86,9 +89,11 @@ if ($isStudent) {
$result = Database::query($sql); $result = Database::query($sql);
while ($resultData = Database::fetch_assoc($result)) { while ($resultData = Database::fetch_assoc($result)) {
$skill = $em->find(Skill::class, $resultData['skill_id']);
$tableRow = [ $tableRow = [
'complete_name' => $followedStudents[$selectedStudent]['completeName'], 'complete_name' => $followedStudents[$selectedStudent]['completeName'],
'skill_name' => SkillModel::translateName($resultData['title']), 'skill_name' => $skill->getTitle(),
'achieved_at' => api_format_date($resultData['acquired_skill_at'], DATE_FORMAT_NUMBER), 'achieved_at' => api_format_date($resultData['acquired_skill_at'], DATE_FORMAT_NUMBER),
'course_image' => Display::return_icon( 'course_image' => Display::return_icon(
'course.png', 'course.png',

20
src/CoreBundle/Entity/Skill.php
Unescape View File

@ -136,29 +136,13 @@ class Skill implements Stringable, Translatable
return $this; return $this;
} }
public function getTitle($translated = true): string public function getTitle(): string
{ {
if ($translated) {
$variable = ChamiloApi::getLanguageVar($this->title, 'Skill');
$translation = get_lang($variable);
if ($variable != $translation) {
return $translation;
}
}
return $this->title; return $this->title;
} }
public function getShortCode($translated = true): string public function getShortCode(): string
{ {
if ($translated) {
$variable = ChamiloApi::getLanguageVar($this->shortCode, 'SkillCode');
$translation = get_lang($variable);
if ($variable != $translation) {
return $translation;
}
}
return $this->shortCode; return $this->shortCode;
} }

3
src/CoreBundle/Entity/User.php
Unescape View File

@ -1426,6 +1426,9 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso
return false; return false;
} }
/**
* @return Collection<int, SkillRelUser>
*/
public function getAchievedSkills(): Collection public function getAchievedSkills(): Collection
{ {
return $this->achievedSkills; return $this->achievedSkills;

Write Preview
Loading…
Cancel
Save