diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php index b522f5d4def..28e6cbce764 100644 --- a/htdocs/hrm/skill_tab.php +++ b/htdocs/hrm/skill_tab.php @@ -324,32 +324,38 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print ''; } print '
'; - print ''; + print '
'; print ''; - foreach ($skill->fields as $key => $infos) { - if($infos['label'] === 'Rank') $infos['label'] = 'RequiredRank'; - if ($infos['visible'] > 0) print ''; + print ''; + print ''; + print ''; + print ''; + if($objecttype === 'job') { + print ''; + print ''; } - print ''; - print ''; print ''; if (!is_array($TSkills) || empty($TSkills)) { print ''; } else { $sk = new Skill($db); foreach ($TSkills as $skillElement) { - print ''; - print ''; + print ''; - print ''; - print ''; - print ''; + print '
' . $langs->trans($infos['label']) . ''.$langs->trans('SkillType').''.$langs->trans('Label').''.$langs->trans('Description').''.$langs->trans($objecttype === 'job' ? 'RequiredRank' : 'EmployeeRank').'
' . $langs->trans("NoRecordFound") . '
'; $sk->fetch($skillElement->fk_skill); + print '
'; + print Skill::typeCodeToLabel($sk->skill_type); + print ''; print $sk->getNomUrl(1); print ''; + print $sk->description; + print ''; + print ''; print displayRankInfos($skillElement->rank, $skillElement->fk_skill, 'TNote', $objecttype == 'job' && $permissiontoadd ? 'edit' : 'view'); print ''; if ($objecttype != 'user' && $permissiontoadd) { + print ''; print 'id . '">'; print img_delete(); print ''; diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index b5a005a07ee..45d1aadbbd3 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -48,6 +48,7 @@ ValidateEvaluation=Validate evaluation ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference %s? EvaluationCard=Evaluation card RequiredRank=Required rank for this job +EmployeeRank=Employee rank for this skill Position=Position Positions=Positions PositionCard=Position card diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang index 9a2663d6714..f0998719c47 100644 --- a/htdocs/langs/fr_FR/hrm.lang +++ b/htdocs/langs/fr_FR/hrm.lang @@ -59,6 +59,7 @@ ValidateEvaluation=Valider évaluation ConfirmValidateEvaluation=Etes vous sûr(e) de vouloir valider cette évaluation sous la référence %s? EvaluationCard=Fiche évaluation RequiredRank=Note requise pour ce métier +EmployeeRank=Note employé pour cette compétence PositionCard=Fiche poste EmployeesInThisPosition=Salariés occupant ce poste Position=Poste