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

Debug v16 to prepare stable status of module HRM #21136

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-18 14:10:45 +02:00
parent f42db465d0
commit da042c7f57
16 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/hrm/class/skill.class.php
View File

@ -119,7 +119,7 @@ class Skill extends CommonObject
'required_level' => array('type'=>'integer', 'label'=>'requiredLevel', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0,),
'date_validite' => array('type'=>'integer', 'label'=>'date_validite', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>0,),
'temps_theorique' => array('type'=>'double(24,8)', 'label'=>'temps_theorique', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>0,),
'skill_type' => array('type'=>'integer', 'label'=>'SkillType', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'knowHow', '1'=>'HowToBe', '9'=>'knowledge'), 'default'=>0),
'skill_type' => array('type'=>'integer', 'label'=>'SkillType', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'css'=>'minwidth200', 'arrayofkeyval'=>array('0'=>'TypeKnowHow', '1'=>'TypeHowToBe', '9'=>'TypeKnowledge'), 'default'=>0),
'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,),
'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,),
);
@ -1123,9 +1123,9 @@ class Skill extends CommonObject
global $langs;
$result = '';
switch ($code) {
case 0 : $result = $langs->trans("knowHow"); break; //"Savoir Faire"
case 1 : $result = $langs->trans("HowToBe"); break; // "Savoir être"
case 9 : $result = $langs->trans("knowledge"); break; //"Savoir"
case 0 : $result = $langs->trans("TypeKnowHow"); break; //"Savoir Faire"
case 1 : $result = $langs->trans("TypeHowToBe"); break; // "Savoir être"
case 9 : $result = $langs->trans("TypeKnowledge"); break; //"Savoir"
}
return $result;
}

2
htdocs/hrm/evaluation_list.php
View File

@ -208,7 +208,7 @@ $now = dol_now();
//$help_url="EN:Module_Evaluation|FR:Module_Evaluation_FR|ES:Módulo_Evaluation";
$help_url = '';
$title = $langs->trans("List").' '.$langs->trans('Evaluations');
$title = $langs->trans('Evaluations');
$morejs = array();
$morecss = array();

4
htdocs/hrm/job_card.php
View File

@ -21,8 +21,8 @@
/**
* \file job_card.php
* \ingroup hrm
* \brief Page to create/edit/view job
* \ingroup hrm
* \brief Page to create/edit/view job
*/

2
htdocs/hrm/job_list.php
View File

@ -208,7 +208,7 @@ $now = dol_now();
//$help_url="EN:Module_Job|FR:Module_Job_FR|ES:Módulo_Job";
$help_url = '';
$title = $langs->trans("ListOf", $langs->transnoentities('Jobs'));
$title = $langs->trans("JobsPosition");
$morejs = array();
$morecss = array();

2
htdocs/hrm/lib/hrm_job.lib.php
View File

@ -40,7 +40,7 @@ function jobPrepareHead($object)
$head = array();
$head[$h][0] = DOL_URL_ROOT."/hrm/job_card.php?id=".$object->id;
$head[$h][1] = $langs->trans("JobCard");
$head[$h][1] = $langs->trans("JobPosition");
$head[$h][2] = 'job_card';
$h++;

4
htdocs/hrm/lib/hrm_position.lib.php
View File

@ -31,7 +31,7 @@
* @param Position $object Position
* @return array Array of tabs
*/
function PositionCardPrepareHead($object)
function positionCardPrepareHead($object)
{
global $db, $langs, $conf;
@ -41,7 +41,7 @@ function PositionCardPrepareHead($object)
$head = array();
$head[$h][0] = dol_buildpath("/hrm/position_card.php", 1).'?id='.$object->id;
$head[$h][1] = $langs->trans("PositionCard");
$head[$h][1] = $langs->trans("EmployeePosition");
$head[$h][2] = 'position';
$h++;

2
htdocs/hrm/position_agenda.php
View File

@ -141,7 +141,7 @@ if ($object->id > 0) {
if (!empty($conf->notification->enabled)) {
$langs->load("mails");
}
$head = PositionCardPrepareHead($object);
$head = positionCardPrepareHead($object);
print dol_get_fiche_head($head, 'agenda', $langs->trans("Agenda"), -1, $object->picto);

10
htdocs/hrm/position_card.php
View File

@ -171,18 +171,18 @@ if (empty($reshook)) {
include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
}
DisplayPositionCard($object);
displayPositionCard($object);
/**
* Show the card of a position
*
* @param Position $object Position object
*
* @return void
*/
function DisplayPositionCard(&$object)
function displayPositionCard(&$object)
{
global $user, $langs, $db, $conf, $extrafields, $hookmanager, $action, $permissiontoadd, $permissiontodelete;
$id = $object->id;
@ -245,7 +245,7 @@ function DisplayPositionCard(&$object)
$res = $object->fetch_optionals();
$head = PositionCardPrepareHead($object);
$head = positionCardPrepareHead($object);
print dol_get_fiche_head($head, 'position', $langs->trans("Workstation"), -1, $object->picto);
$formconfirm = '';

2
htdocs/hrm/position_contact.php
View File

@ -125,7 +125,7 @@ if ($object->id) {
/*
* Show tabs
*/
$head = PositionCardPrepareHead($object);
$head = positionCardPrepareHead($object);
print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);

2
htdocs/hrm/position_document.php
View File

@ -113,7 +113,7 @@ if ($object->id) {
/*
* Show tabs
*/
$head = PositionCardPrepareHead($object);
$head = positionCardPrepareHead($object);
print dol_get_fiche_head($head, 'document', $langs->trans("Document"), -1, $object->picto);

2
htdocs/hrm/position_list.php
View File

@ -208,7 +208,7 @@ $now = dol_now();
//$help_url="EN:Module_Position|FR:Module_Position_FR|ES:Módulo_Position";
$help_url = '';
$title = $langs->trans("ListOf", $langs->trans('Positions'));
$title = $langs->trans('EmployeePositions');
$morejs = array();
$morecss = array();

2
htdocs/hrm/position_note.php
View File

@ -96,7 +96,7 @@ llxHeader('', $langs->trans('Position'), $help_url);
if ($id > 0 || !empty($ref)) {
$object->fetch_thirdparty();
$head = PositionCardPrepareHead($object);
$head = positionCardPrepareHead($object);
print dol_get_fiche_head($head, 'note', $langs->trans("Notes"), -1, $object->picto);

2
htdocs/hrm/skill_list.php
View File

@ -208,7 +208,7 @@ $now = dol_now();
//$help_url="EN:Module_Skill|FR:Module_Skill_FR|ES:Módulo_Skill";
$help_url = '';
$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Skills"));
$title = $langs->trans("Skills");
$morejs = array();
$morecss = array();

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

@ -70,9 +70,9 @@ RequiredSkills=Required skills for this job
UserRank=User Rank
SkillList=Skill list
SaveRank=Save rank
knowHow=Know how
HowToBe=How to be
knowledge=Knowledge
TypeKnowHow=Know how
TypeHowToBe=How to be
TypeKnowledge=Knowledge
AbandonmentComment=Abandonment comment
DateLastEval=Date last evaluation
NoEval=No evaluation done for this employee

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

@ -70,9 +70,9 @@ RequiredSkills=Compétences requises pour cet emploi
UserRank=Niveau employé
SkillList=Liste compétence
SaveRank=Sauvegarder niveau
knowHow=Savoir comment
HowToBe=Comment être
knowledge=Connaissances
TypeKnowHow=Savoir comment
TypeHowToBe=Comment être
TypeKnowledge=Connaissances
AbandonmentComment=Commentaire sur l'abandon
DateLastEval=Date dernière évaluation
NoEval=Aucune évaluation effectuée pour cet employé

11
htdocs/theme/md/style.css.php
View File

@ -6118,6 +6118,17 @@ ul.select2-results__options li {
font-size: 0.95em;
}
@media only screen and (min-width: 767px)
{
.select2-container.select2-container--open .select2-dropdown.ui-dialog {
min-width: 200px !important;
}
.select2-container--open .select2-dropdown--below {
border-top: 1px solid var(--inputbordercolor);
/* border-top: 1px solid #aaaaaa; */
}
}
/* ============================================================================== */
/* For categories */