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

FIX : postgres adaptation

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-10-05 15:04:15 +02:00
parent 99f331c817
commit 5f0e09e1ef
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/hrm/class/evaluation.class.php
View File

@ -228,7 +228,7 @@ class Evaluation extends CommonObject
if ($resultcreate > 0) {
require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
$skillRank = new SkillRank($this->db);
$TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job.' AND objecttype="job"'));
$TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job." AND objecttype='job'"));
if (is_array($TRequiredRanks) && !empty($TRequiredRanks)) {
$this->lines = array();

2
htdocs/hrm/class/skillrank.class.php
View File

@ -217,7 +217,7 @@ class SkillRank extends CommonObject
{
global $langs;
$sqlfilter = 'fk_object='.$this->fk_object.' AND objecttype="'.$this->objecttype.'" AND fk_skill = '.$this->fk_skill;
$sqlfilter = 'fk_object='.$this->fk_object." AND objecttype='".$this->objecttype."' AND fk_skill = ".$this->fk_skill;
$alreadyLinked = $this->fetchAll('ASC', 'rowid', 0, 0, array('customsql' => $sqlfilter));
if (!empty($alreadyLinked)) {
$this->error = $langs->trans('ErrSkillAlreadyAdded');

26
htdocs/hrm/compare.php
View File

@ -401,13 +401,11 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
$sql = "SELECT DISTINCT u.rowid FROM " . MAIN_DB_PREFIX . "user u
LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user ugu ON (u.rowid = ugu.fk_user)
WHERE 1
AND u.statut > 0
AND ugu.fk_usergroup=" . $fk_usergroup;
LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON (u.rowid = ugu.fk_user)
WHERE u.statut > 0
AND ugu.fk_usergroup=" . ((int)$fk_usergroup);
$res = $db->query($sql);
$out .= '<ul name="' . $namelist . '">';
$TExcludedId = explode(',', $excludedIdsList);
@ -476,12 +474,12 @@ function getSkillForUsers($TUser)
if (empty($TUser)) return array();
$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
$sql.= " MAX(sr.rank) as rank";
$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
$sql.=' WHERE sr.objecttype = "'.SkillRank::SKILLRANK_TYPE_USER.'"';
$sql.=' AND sr.fk_object IN ('.implode(',', $TUser).')';
$sql.=" GROUP BY sk.rowid "; // group par competence
$sql.= ' MAX(sr.rank) as "rank"';
$sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
$sql.= " WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_USER."'";
$sql.= ' AND sr.fk_object IN ('.implode(',', $TUser).')';
$sql.= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill "; // group par competence
$resql = $db->query($sql);
$Tab = array();
@ -531,12 +529,12 @@ function getSkillForJob($fk_job)
if (empty($fk_job)) return array();
$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
$sql.= " MAX(sr.rank) as rank";
$sql.= ' MAX(sr.rank) as "rank"';
$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
$sql.=' WHERE sr.objecttype = "'.SkillRank::SKILLRANK_TYPE_JOB.'"';
$sql.=" WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
$sql.=' AND sr.fk_object IN ('.$fk_job.')';
$sql.=' GROUP BY sk.rowid '; // group par competence*/
$sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill '; // group par competence*/
$resql = $db->query($sql);
$Tab = array();

10
htdocs/hrm/evaluation_card.php
View File

@ -610,17 +610,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$sql .= ' e.ref,';
$sql .= ' e.date_creation,';
$sql .= ' e.fk_job,';
$sql .= ' j.label as refjob,';
$sql .= ' j.label as "refjob",';
$sql .= ' ed.fk_skill,';
$sql .= ' sk.label as skilllabel,';
$sql .= ' sk.label as "skilllabel",';
$sql .= ' sk.skill_type,';
$sql .= ' sk.description,';
$sql .= ' ed.rank,';
$sql .= ' ed.required_rank,';
$sql .= ' ed.rank as userRankForSkill,';
$sql .= ' skdet_user.description as userRankForSkillDesc,';
$sql .= ' skdet_required.description as required_rank_desc';
$sql .= ' ed.rank as "userRankForSkill",';
$sql .= ' skdet_user.description as "userRankForSkillDesc",';
$sql .= ' skdet_required.description as "required_rank_desc"';
$sql .= ' FROM ' . MAIN_DB_PREFIX . 'hrm_evaluation as e';
$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_evaluationdet as ed ON e.rowid = ed.fk_evaluation';

4
htdocs/hrm/skill_tab.php
View File

@ -178,7 +178,7 @@ if (empty($reshook)) {
} else if ($action == 'saveSkill') {
if (!empty($TNote)) {
foreach ($TNote as $skillId => $rank) {
$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . ' AND objecttype="' . $objecttype . '" AND fk_skill = ' . $skillId));
$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . " AND objecttype='" . $objecttype . "' AND fk_skill = " . $skillId));
if (is_array($TSkills) && !empty($TSkills)) {
foreach ($TSkills as $tmpObj) {
$tmpObj->rank = $rank;
@ -283,7 +283,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// table of skillRank linked to current object
$TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . ' AND objecttype="' . $objecttype . '"'));
$TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . $id . " AND objecttype='" . $objecttype . "'"));
$TAlreadyUsedSkill = array();
if (is_array($TSkillsJob) && !empty($TSkillsJob)) {