lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX : IHM

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-09-29 08:30:30 +02:00
parent 409c8c8d57
commit eccff256b1
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/hrm/skill_tab.php
View File

@ -324,32 +324,38 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<input type="hidden" name="action" value="saveSkill">'; print '<input type="hidden" name="action" value="saveSkill">';
} }
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table id="tablelines" class="noborder noshadow" width="100%">'; print '<table id="tablelines" class="noborder centpercent" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
foreach ($skill->fields as $key => $infos) { print '<th>'.$langs->trans('SkillType').'</th>';
if($infos['label'] === 'Rank') $infos['label'] = 'RequiredRank'; print '<th>'.$langs->trans('Label').'</th>';
if ($infos['visible'] > 0) print '<th class="linecol' . $key . '">' . $langs->trans($infos['label']) . '</th>'; print '<th>'.$langs->trans('Description').'</th>';
} print '<th>'.$langs->trans($objecttype === 'job' ? 'RequiredRank' : 'EmployeeRank').'</th>';
if($objecttype === 'job') {
print '<th class="linecoledit"></th>'; print '<th class="linecoledit"></th>';
print '<th class="linecoldelete"></th>'; print '<th class="linecoldelete"></th>';
}
print '</tr>'; print '</tr>';
if (!is_array($TSkills) || empty($TSkills)) { if (!is_array($TSkills) || empty($TSkills)) {
print '<tr><td>' . $langs->trans("NoRecordFound") . '</td></tr>'; print '<tr><td>' . $langs->trans("NoRecordFound") . '</td></tr>';
} else { } else {
$sk = new Skill($db); $sk = new Skill($db);
foreach ($TSkills as $skillElement) { foreach ($TSkills as $skillElement) {
print '<tr>';
print '<td class="linecolfk_skill">';
$sk->fetch($skillElement->fk_skill); $sk->fetch($skillElement->fk_skill);
print '<tr>';
print '<td>';
print Skill::typeCodeToLabel($sk->skill_type);
print '</td><td class="linecolfk_skill">';
print $sk->getNomUrl(1); print $sk->getNomUrl(1);
print '</td>'; print '</td>';
print '<td class="linecolrank">'; print $sk->description;
print '<td>';
print '</td><td class="linecolrank">';
print displayRankInfos($skillElement->rank, $skillElement->fk_skill, 'TNote', $objecttype == 'job' && $permissiontoadd ? 'edit' : 'view'); print displayRankInfos($skillElement->rank, $skillElement->fk_skill, 'TNote', $objecttype == 'job' && $permissiontoadd ? 'edit' : 'view');
print '</td>'; print '</td>';
print '<td class="linecoledit"></td>';
print '<td class="linecoldelete">';
if ($objecttype != 'user' && $permissiontoadd) if ($objecttype != 'user' && $permissiontoadd)
{ {
print '<td class="linecoledit"></td>';
print '<td class="linecoldelete">';
print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $skillElement->fk_object . '&amp;objecttype=' . $objecttype . '&amp;action=ask_deleteskill&amp;lineid=' . $skillElement->id . '">'; print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $skillElement->fk_object . '&amp;objecttype=' . $objecttype . '&amp;action=ask_deleteskill&amp;lineid=' . $skillElement->id . '">';
print img_delete(); print img_delete();
print '</a>'; print '</a>';

1
htdocs/langs/en_US/hrm.lang
View File

@ -48,6 +48,7 @@ ValidateEvaluation=Validate evaluation
ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>? ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
EvaluationCard=Evaluation card EvaluationCard=Evaluation card
RequiredRank=Required rank for this job RequiredRank=Required rank for this job
EmployeeRank=Employee rank for this skill
Position=Position Position=Position
Positions=Positions Positions=Positions
PositionCard=Position card PositionCard=Position card

1
htdocs/langs/fr_FR/hrm.lang
View File

@ -59,6 +59,7 @@ ValidateEvaluation=Valider évaluation
ConfirmValidateEvaluation=Etes vous sûr(e) de vouloir valider cette évaluation sous la référence <b>%s</b>? ConfirmValidateEvaluation=Etes vous sûr(e) de vouloir valider cette évaluation sous la référence <b>%s</b>?
EvaluationCard=Fiche évaluation EvaluationCard=Fiche évaluation
RequiredRank=Note requise pour ce métier RequiredRank=Note requise pour ce métier
EmployeeRank=Note employé pour cette compétence
PositionCard=Fiche poste PositionCard=Fiche poste
EmployeesInThisPosition=Salariés occupant ce poste EmployeesInThisPosition=Salariés occupant ce poste
Position=Poste Position=Poste