diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php index 2b7a59e8409..75252c5669f 100644 --- a/htdocs/hrm/compare.php +++ b/htdocs/hrm/compare.php @@ -216,62 +216,63 @@ $fk_usergroup1 = GETPOSTINT('fk_usergroup1');

-
- - 0 || $fk_usergroup2 > 0 || $fk_job > 0) { ?> - - - - - - - - - - -
trans('Skill'); ?>trans('rank'); ?>trans('difference'); ?>trans('rank'); ?>
'; +
+ 0 || $fk_usergroup2 > 0 || $fk_job > 0) { $TUser1 = $TUser2 = array(); - $userlist1 = displayUsersListWithPicto($TUser1, $fk_usergroup1, 'list1'); + $userlist1 = displayUsersListWithPicto($TUser1, $fk_usergroup1, 'list1'); // This fill also the $TUser1 - - $skill = new Skill($db); $TSkill1 = getSkillForUsers($TUser1); - if ($fk_job > 0) { - $TSkill2 = getSkillForJob($fk_job); + if ($fk_job > 0) { + $TSkill2 = getSkillForJob($fk_job); - $job = new Job($db); - $job->fetch($fk_job); - $userlist2 = '
    + $job = new Job($db); + $job->fetch($fk_job); + $userlist2 = '
    • ' . $job->label . '

      ' . $job->description . '

    '; - } else { - $userlist2 = displayUsersListWithPicto($TUser2, $fk_usergroup2, 'list2'); - $TSkill2 = getSkillForUsers($TUser2); - } + } else { + $userlist2 = displayUsersListWithPicto($TUser2, $fk_usergroup2, 'list2'); + $TSkill2 = getSkillForUsers($TUser2); + } $TMergedSkills = mergeSkills($TSkill1, $TSkill2); + ?> + + + + + + + + + + '; + + echo ''; - echo ''; - echo ''; + echo ''; + + echo ''; + echo ''; - echo ''; - echo ''; + echo ''; - echo ''; + echo ''; ?> @@ -319,7 +320,7 @@ function diff(&$TMergedSkills) $class .= ' sad'; } - $out .= '
  • + $out .= '
  •  
  • '; } @@ -330,10 +331,11 @@ function diff(&$TMergedSkills) } /** - * Return a html list with rank information - * @param array $TMergedSkills skill list for display - * @param string $field which column of comparison we are working with - * @return string + * Return a html list with rank information + * + * @param array $TMergedSkills Skill list for display + * @param string $field Which column of comparison we are working with ('rate1' or 'rate2') + * @return string String to show for level */ function rate(&$TMergedSkills, $field) { @@ -348,7 +350,7 @@ function rate(&$TMergedSkills, $field) $note = 'x'; $class .= ' none'; } else { - $note = $sk->$field; + $note = $sk->$field < 0 ? $langs->trans("NA") : $sk->$field; $how_many = ($field === 'rate1') ? $sk->how_many_max1 : $sk->how_many_max2; } @@ -358,8 +360,8 @@ function rate(&$TMergedSkills, $field) $trad = $langs->trans('HighestRank'); } - $out .= '
  • -

    ' . $note . '' . ($how_many > 0 ? '' . $how_many . '' : '') . '

    + $out .= '
  • +

    ' . $note . '' . ($how_many > 0 ? '' . $how_many . '' : '') . '

  • '; } @@ -391,10 +393,10 @@ function skillList(&$TMergedSkills) } /** - * create an array of lines [ skillLabel,description, maxrank on group1 , minrank needed for this skill ] + * Create an array of lines [ skillLabel,description, maxrank on group1 , minrank needed for this skill ] * - * @param array $TSkill1 skill list of first column - * @param array $TSkill2 skill list of second column + * @param array $TSkill1 Skill list of first column + * @param array $TSkill2 Skill list of second column * @return array */ function mergeSkills($TSkill1, $TSkill2) @@ -408,6 +410,7 @@ function mergeSkills($TSkill1, $TSkill2) $Tab[$sk->fk_skill]->rate1 = $sk->rankorder; $Tab[$sk->fk_skill]->how_many_max1 = $sk->how_many_max; + $Tab[$sk->fk_skill]->label = $sk->label; $Tab[$sk->fk_skill]->description = $sk->description; } @@ -417,9 +420,10 @@ function mergeSkills($TSkill1, $TSkill2) $Tab[$sk->fk_skill] = new stdClass(); } $Tab[$sk->fk_skill]->rate2 = $sk->rankorder; + $Tab[$sk->fk_skill]->how_many_max2 = $sk->how_many_max; + $Tab[$sk->fk_skill]->label = $sk->label; $Tab[$sk->fk_skill]->description = $sk->description; - $Tab[$sk->fk_skill]->how_many_max2 = $sk->how_many_max; } return $Tab; @@ -511,52 +515,60 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list /** * Allow to get skill(s) of a user * - * @param int[] $TUser array of employees we need to get skills + * @param int[] $TUser array of employees we need to get skills * @return array */ function getSkillForUsers($TUser) { global $db; - //I go back to the user with the highest score in a given group for all the skills assessed in that group + // I go back to the user with the highest score in a given group for all the skills assessed in that group if (empty($TUser)) { return array(); } - $sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, '; + $sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type,'; $sql .= ' MAX(sr.rankorder) as rankorder'; $sql .= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk'; - $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)'; - $sql .= " WHERE sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'"; + $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr'; + $sql .= " WHERE sk.rowid = sr.fk_skill AND sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'"; $sql .= ' AND sr.fk_object IN ('.$db->sanitize(implode(',', $TUser)).')'; - $sql .= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill "; // group par competence + $sql .= ' AND rankorder >= 0'; + $sql .= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type"; // group by skill + $sql .= " ORDER BY sk.rowid ASC"; $resql = $db->query($sql); $Tab = array(); if ($resql) { - //For each skill, we count the number of times that the max score has been reached within a given group + // For each skill, we count the number of times that the max score has been reached within a given group $num = 0; while ($obj = $db->fetch_object($resql)) { + $Tab[$num] = new stdClass(); + + $Tab[$num]->fk_skill = $obj->rowid; + $Tab[$num]->label = $obj->label; + $Tab[$num]->description = $obj->description; + $Tab[$num]->skill_type = $obj->skill_type; + //$Tab[$num]->fk_object = $obj->fk_object; + $Tab[$num]->objectType = SkillRank::SKILLRANK_TYPE_USER; + + $Tab[$num]->rankorder = $obj->rankorder; + + // Get how_many_max $sql1 = "SELECT COUNT(rowid) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank as sr"; $sql1 .= " WHERE sr.rankorder = ".((int) $obj->rankorder); $sql1 .= " AND sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'"; - $sql1 .= " AND sr.fk_skill = ".((int) $obj->fk_skill); + $sql1 .= " AND sr.fk_skill = ".((int) $obj->rowid); $sql1 .= " AND sr.fk_object IN (".$db->sanitize(implode(',', $TUser)).")"; $resql1 = $db->query($sql1); $objMax = $db->fetch_object($resql1); - $Tab[$num] = new stdClass(); - $Tab[$num]->fk_skill = $obj->fk_skill; - $Tab[$num]->label = $obj->label; - $Tab[$num]->description = $obj->description; - $Tab[$num]->skill_type = $obj->skill_type; - $Tab[$num]->fk_object = $obj->fk_object; - $Tab[$num]->objectType = SkillRank::SKILLRANK_TYPE_USER; - $Tab[$num]->rankorder = $obj->rankorder; $Tab[$num]->how_many_max = $objMax->how_many_max; + $db->free($resql1); + $num++; } } else {
    trans('Employees'); ?>trans('Skill'); ?>trans('HighestRank'); ?>trans('difference'); ?>trans($fk_job > 0 ? 'ExpectedRank' : 'HighestRank'); ?>
    '; echo $userlist1; - echo '' . skillList($TMergedSkills) . '' . rate($TMergedSkills, 'rate1') . '' . skillList($TMergedSkills) . '' . rate($TMergedSkills, 'rate1') . '' . diff($TMergedSkills) . '' . rate($TMergedSkills, 'rate2') . ''; + echo '' . rate($TMergedSkills, 'rate2') . ''; echo $userlist2; + echo '