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

error message

Browse Source
This commit is contained in:
Florian HENRY 2021-12-03 10:59:47 +01:00
parent 1db52532ff
commit 2f4fe2b898
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,7 +410,13 @@ class Skill extends CommonObject
$skilldet = new Skilldet($this->db); $skilldet = new Skilldet($this->db);
$this->lines = $skilldet->fetchAll('ASC', '', '', '', array('fk_skill' => $this->id), ''); $this->lines = $skilldet->fetchAll('ASC', '', '', '', array('fk_skill' => $this->id), '');
return (count($this->lines) > 0 ) ? $this->lines : array(); if (is_array($this->lines)) {
return (count($this->lines) > 0) ? $this->lines : array();
} elseif ($this->lines < 0) {
$this->errors = array_merge($this->errors, $skilldet->errors);
$this->error = $skilldet->error;
return $this->lines;
}
} }

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

@ -115,44 +115,48 @@ function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode
$skilldet = new Skilldet($db); $skilldet = new Skilldet($db);
$Lines = $skilldet->fetchAll('ASC', 'rank', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill)); $Lines = $skilldet->fetchAll('ASC', 'rank', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill));
if (!is_array($Lines) && $Lines<0) {
setEventMessages($skilldet->error, $skilldet->errors, 'errors');
}
if (empty($Lines)) return $langs->trans('SkillHasNoLines'); if (empty($Lines)) return $langs->trans('SkillHasNoLines');
$ret = '<!-- field jquery --><span title="'.$langs->trans('NA').'" class="radio_js_bloc_number '.$inputname.'_'.$fk_skill.(empty($selected_rank) ? ' selected' : '').'">0</span>'; $ret = '<!-- field jquery --><span title="'.$langs->trans('NA').'" class="radio_js_bloc_number '.$inputname.'_'.$fk_skill.(empty($selected_rank) ? ' selected' : '').'">0</span>';
if (is_array($Lines) && !empty($Lines)) {
foreach ($Lines as $line) {
$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : Skill::DEFAULT_MAX_RANK_PER_SKILL;
if ($line->rank > $MaxNumberSkill) {
continue;
}
foreach ($Lines as $line) { $ret .= '<span title="' . $line->description . '" class="radio_js_bloc_number ' . $inputname . '_' . $line->fk_skill;
$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : Skill::DEFAULT_MAX_RANK_PER_SKILL; $ret .= $line->rank == $selected_rank ? ' selected' : '';
if ($line->rank > $MaxNumberSkill) { $ret .= '">' . $line->rank . '</span>';
continue;
} }
$ret.= '<span title="'.$line->description.'" class="radio_js_bloc_number '.$inputname.'_'.$line->fk_skill; if ($mode == 'edit') {
$ret.= $line->rank == $selected_rank ? ' selected' : ''; $ret .= '
$ret.= '">'.$line->rank.'</span>'; <input type="hidden" id="' . $inputname . '_' . $fk_skill . '" name="' . $inputname . '[' . $fk_skill . ']" value="' . $selected_rank . '">
}
if ($mode == 'edit') {
$ret.= '
<input type="hidden" id="'.$inputname.'_'.$fk_skill.'" name="'.$inputname.'['.$fk_skill.']" value="'.$selected_rank.'">
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$(".radio_js_bloc_number").tooltip(); $(".radio_js_bloc_number").tooltip();
var error,same; var error,same;
$(".'.$inputname.'_'.$fk_skill.'").on("click",function(){ $(".' . $inputname . '_' . $fk_skill . '").on("click",function(){
same=false; same=false;
val = $(this).html(); val = $(this).html();
if($(this).hasClass("selected"))same=true; if($(this).hasClass("selected"))same=true;
$(".'.$inputname.'_'.$fk_skill.'").removeClass("selected"); $(".' . $inputname . '_' . $fk_skill . '").removeClass("selected");
if(same) if(same)
{ {
$("#'.$inputname.'_'.$fk_skill.'").val(""); $("#' . $inputname . '_' . $fk_skill . '").val("");
}else { }else {
$(this).addClass("selected"); $(this).addClass("selected");
$("#'.$inputname.'_'.$fk_skill.'").val(val); $("#' . $inputname . '_' . $fk_skill . '").val(val);
} }
}); });
}); });
</script>'; </script>';
}
} }
return $ret; return $ret;