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

FIX : stickler feedbacks part 4

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-09-30 13:46:10 +02:00
parent acbf09ba59
commit 030829942c
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/hrm/lib/hrm_skill.lib.php
View File

@ -95,12 +95,6 @@ function skillPrepareHead($object)
}
//Affichage des 5 trades pour cet object
function showTraductionNote($object)
{
}
/**
* Show html area for list of traduction
*

10
htdocs/hrm/lib/hrm_skillrank.lib.php
View File

@ -94,6 +94,16 @@ function skillrankPrepareHead($object)
return $head;
}
/**
* Used to print ranks of a skill into several case, view or edit pour js necessary to select a rank
*
* @param int $selected_rank rank we want to preselect
* @param int $fk_skill id of skill we display ranks
* @param string $inputname html name of input
* @param string $mode view or edit
*
* @return string string result
*/
function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode = 'view')
{
global $db, $conf, $langs;

21
htdocs/hrm/position.php
View File

@ -188,17 +188,16 @@ llxHeader('', $title, $help_url);
if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
DisplayJob($job);
DisplayPositionList($conf, $langs, $db);
DisplayPositionList();
}
/**
* Show the top of the page including informations of a job
*
* @param DoliDB $db Database handler
* @param Job $object Job object
* @param $permissiontoadd $permissiontoadd Rights/permissions
* @return array
*
* @return void
*/
function DisplayJob($object)
{
@ -266,16 +265,12 @@ function DisplayJob($object)
/**
* Show a list of positions for the current job
* @param Conf $conf Object conf
* @param Translate $langs Object langs
* @param DoliDB $db Database handler
* @param Position $object Position object
* @return array|void
*
* @return void
*/
function DisplayPositionList($conf, $langs, $db)
function DisplayPositionList()
{
global $user,$langs, $db, $conf, $extrafields, $hookmanager, $permissiontoadd, $permissiontodelete;
global $user, $langs, $db, $conf, $extrafields, $hookmanager, $permissiontoadd, $permissiontodelete;
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@ -897,7 +892,7 @@ function DisplayPositionList($conf, $langs, $db)
print $formfile->showdocuments('massfilesarea_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
}
return array($arrayfields, $object, $action, $obj, $totalarray);
}
// Part to create