Fix sent message to boss when user achieved skill

pull/3063/head
Julio 8 years ago
parent 6b56411b45
commit 3ca8ce211b
  1. 8
      main/badge/assign.php
  2. 4
      main/inc/lib/skill.lib.php

@ -269,14 +269,16 @@ if ($form->validate()) {
$entityManager->persist($skillUser);
$entityManager->flush();
// ofaj
// Send email depending of children_auto_threshold
$skillRelSkill = new SkillRelSkill();
$skillModel = new \Skill();
$parents = $skillRelSkill->getSkillParents($values['skill']);
$parents = $skillModel->getDirectParents($skillToProcess);
$extraFieldValue = new ExtraFieldValue('skill');
foreach ($parents as $parentInfo) {
$parentId = $parentInfo['id'];
$parentId = $parentInfo['skill_id'];
$parentData = $skillModel->get($parentId);
$data = $extraFieldValue->get_values_by_handler_and_field_variable($parentId, 'children_auto_threshold');
@ -290,6 +292,7 @@ if ($form->validate()) {
$counter++;
}
}
if ($counter >= $requiredSkills) {
$bossList = UserManager::getStudentBossList($userId);
if (!empty($bossList)) {
@ -311,6 +314,7 @@ if ($form->validate()) {
);
}
}
break;
}
}
}

@ -200,7 +200,7 @@ class SkillRelSkill extends Model
*/
public function getSkillParents($skill_id, $add_child_info = true)
{
$skill_id = intval($skill_id);
$skill_id = (int) $skill_id;
$sql = 'SELECT child.* FROM '.$this->table.' child
LEFT JOIN '.$this->table.' parent
ON child.parent_id = parent.skill_id
@ -895,7 +895,7 @@ class Skill extends Model
/**
* All direct parents
* @param int $skillId
* @return int
* @return array
*/
public function getDirectParents($skillId)
{

Loading…
Cancel
Save