'.dol_print_date($db->jdate($cp
else print $langs->trans('None');
print "';
print ''.$langs->trans("ReviewedByCP").' ';
- // Liste des utiliseurs du groupe choisi dans la config
$validator = new UserGroup($db);
$excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
$valideurobjects = $validator->listUsersForGroup($excludefilter);
@@ -1119,14 +1118,15 @@ else
} else {
print ' ';
print ''.$langs->trans('ReviewedByCP').' ';
- // Liste des utiliseurs du groupes choisi dans la config
- $idGroupValid = $cp->getConfCP('userGroup');
- $validator = new UserGroup($db);
- $valideur = $validator->listUsersForGroup('',1);
+ $validator = new UserGroup($db);
+ $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
+ $valideurobjects = $validator->listUsersForGroup($excludefilter);
+ $valideurarray = array();
+ foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
print '';
- $form->select_users($cp->fk_validator,"valideur",1,"",0,$valideur,'');
+ print $form->select_dolusers($user->fk_user, "valideur", 1, "", 0, $valideurarray); // By default, hierarchical parent
print ' ';
print ' ';
}
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index a98b50bf48b..3e68bb6bce5 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -96,8 +96,8 @@ class Holiday extends CommonObject
// Update sold of vocations
$result = $this->updateSoldeCP();
- // Vérifie le nombre d'utilisateur et mets à jour si besoin
- if ($result > 0) $result = $this->verifNbUsers($this->countActiveUsersWithoutCP(), $this->getConfCP('nbUser'));
+ // Check nb of users into table llx_holiday_users and update with empty lines
+ //if ($result > 0) $result = $this->verifNbUsers($this->countActiveUsersWithoutCP(), $this->getConfCP('nbUser'));
if ($result >= 0)
{
@@ -785,61 +785,6 @@ class Holiday extends CommonObject
}
- /**
- * Retourne un select HTML des groupes d'utilisateurs
- *
- * @param string $prefix nom du champ dans le formulaire
- * @return string retourne le select des groupes
- */
- function selectUserGroup($prefix)
- {
- // On récupère le groupe déjà configuré
- $group.= "SELECT value";
- $group.= " FROM ".MAIN_DB_PREFIX."holiday_config";
- $group.= " WHERE name = 'userGroup'";
-
- $resultat = $this->db->query($group);
- $objet = $this->db->fetch_object($resultat);
- $groupe = $objet->value;
-
- // On liste les groupes de Dolibarr
- $sql = "SELECT u.rowid, u.nom as name";
- $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as u";
- $sql.= " ORDER BY u.rowid";
-
- dol_syslog(get_class($this)."::selectUserGroup", LOG_DEBUG);
- $result = $this->db->query($sql);
-
- // Si pas d'erreur SQL
- if ($result)
- {
- // On créer le select HTML
- $selectGroup = ''."\n";
- $selectGroup.= ' '."\n";
-
- // On liste les utilisateurs
- while ($obj = $this->db->fetch_object($result))
- {
- if($groupe==$obj->rowid) {
- $selectGroup.= ''.$obj->name.' '."\n";
- } else {
- $selectGroup.= ''.$obj->name.' '."\n";
- }
- }
- $selectGroup.= ' '."\n";
- $this->db->free($result);
- }
- else
- {
- // Erreur SQL
- $this->error=$this->db->lasterror();
- return -1;
- }
-
- // Retourne le select HTML
- return $selectGroup;
- }
-
/**
* Met à jour une option du module Holiday Payés
*
@@ -925,41 +870,52 @@ class Holiday extends CommonObject
{
$this->db->begin();
+ $users = $this->fetchUsers(false,false);
+ $nbUser = count($users);
+
$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
$sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
$sql.= " WHERE name = 'lastUpdate'";
$result = $this->db->query($sql);
- $typeleaves=$cp->getTypes(1,1);
+ $typeleaves=$this->getTypes(1,1);
foreach($typeleaves as $key => $val)
{
// On ajoute x jours à chaque utilisateurs
$nb_holiday = $val['newByMonth'];
if (empty($nb_holiday)) $nb_holiday=0;
- $users = $this->fetchUsers(false,false);
- $nbUser = count($users);
+ if ($nb_holiday > 0)
+ {
+ dol_syslog("We update leavefor everybody for type ".$key, LOG_DEBUG);
- $i = 0;
- while ($i < $nbUser)
- {
- $now_holiday = $this->getCPforUser($users[$i]['rowid'], $val['rowid']);
- $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
+ $i = 0;
+ while ($i < $nbUser)
+ {
+ $now_holiday = $this->getCPforUser($users[$i]['rowid'], $val['rowid']);
+ $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
- // On ajoute la modification dans le LOG
- $this->addLogCP($user->id, $users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $new_solde, $val['rowid']);
+ // We add a log for each user
+ $this->addLogCP($user->id, $users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $new_solde, $val['rowid']);
- $i++;
- }
+ $i++;
+ }
- $sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
- $sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
- $sql2.= " WHERE fk_type = ".$val['rowid'];
+ // Now we update counter for all users at once
+ $sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
+ $sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
+ $sql2.= " WHERE fk_type = ".$val['rowid'];
- $result= $this->db->query($sql2);
+ $result= $this->db->query($sql2);
- if (! $result) break;
+ if (! $result)
+ {
+ dol_print_error($this->db);
+ break;
+ }
+ }
+ else dol_syslog("No change for leave of type ".$key, LOG_DEBUG);
}
if ($result)
@@ -1142,14 +1098,14 @@ class Holiday extends CommonObject
/**
* Get list of Users or list of vacation balance.
*
- * @param boolean $liste If true return a string list. If false, return an array
- * @param boolean $type If true, read Dolibarr user list, if false, return vacation balance list.
- * @return array|string Return an array
+ * @param boolean $stringlist If true return a string list of id. If false, return an array
+ * @param boolean $type If true, read Dolibarr user list, if false, return vacation balance list.
+ * @return array|string|int Return an array
*/
- function fetchUsers($liste=true,$type=true)
+ function fetchUsers($stringlist=true,$type=true)
{
// Si vrai donc pour user Dolibarr
- if ($liste)
+ if ($stringlist)
{
if($type)
{
@@ -1167,23 +1123,23 @@ class Holiday extends CommonObject
$i = 0;
$num = $this->db->num_rows($resql);
- $liste = '';
+ $stringlist = '';
// Boucles du listage des utilisateurs
- while($i < $num) {
-
+ while($i < $num)
+ {
$obj = $this->db->fetch_object($resql);
if($i == 0) {
- $liste.= $obj->rowid;
+ $stringlist.= $obj->rowid;
} else {
- $liste.= ', '.$obj->rowid;
+ $stringlist.= ', '.$obj->rowid;
}
$i++;
}
// Retoune le tableau des utilisateurs
- return $liste;
+ return $stringlist;
}
else
{
@@ -1195,8 +1151,8 @@ class Holiday extends CommonObject
}
else
{
- // Si utilisateur du module Congés Payés
- $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holidays, u.lastname, u.firstname";
+ // We want only list of user id
+ $sql = "SELECT DISTINCT cpu.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu";
dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
@@ -1207,26 +1163,26 @@ class Holiday extends CommonObject
$i = 0;
$num = $this->db->num_rows($resql);
- $liste = '';
+ $stringlist = '';
// Boucles du listage des utilisateurs
- while($i < $num) {
-
+ while($i < $num)
+ {
$obj = $this->db->fetch_object($resql);
if($i == 0) {
- $liste.= $obj->fk_user;
+ $stringlist.= $obj->fk_user;
} else {
- $liste.= ', '.$obj->fk_user;
+ $stringlist.= ', '.$obj->fk_user;
}
$i++;
}
// Retoune le tableau des utilisateurs
- return $liste;
+ return $stringlist;
}
else
- {
+ {
// Erreur SQL
$this->error="Error ".$this->db->lasterror();
return -1;
@@ -1248,8 +1204,8 @@ class Holiday extends CommonObject
$resql=$this->db->query($sql);
// Si pas d'erreur SQL
- if ($resql) {
-
+ if ($resql)
+ {
$i = 0;
$tab_result = $this->holiday;
$num = $this->db->num_rows($resql);
@@ -1264,7 +1220,7 @@ class Holiday extends CommonObject
$tab_result[$i]['lastname'] = $obj->lastname;
$tab_result[$i]['firstname'] = $obj->firstname;
$tab_result[$i]['type'] = $obj->type;
- $tab_result[$i]['nb_holidays'] = $obj->nb_holidays;
+ $tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
$i++;
}
@@ -1272,7 +1228,7 @@ class Holiday extends CommonObject
return $tab_result;
}
else
- {
+ {
// Erreur SQL
$this->error="Error ".$this->db->lasterror();
return -1;
@@ -1281,7 +1237,7 @@ class Holiday extends CommonObject
else
{
// List of vacation balance users
- $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holidays, u.lastname, u.firstname";
+ $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu,";
$sql.= " ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE cpu.fk_user = u.rowid";
@@ -1290,8 +1246,8 @@ class Holiday extends CommonObject
$resql=$this->db->query($sql);
// Si pas d'erreur SQL
- if ($resql) {
-
+ if ($resql)
+ {
$i = 0;
$tab_result = $this->holiday;
$num = $this->db->num_rows($resql);
@@ -1306,7 +1262,7 @@ class Holiday extends CommonObject
$tab_result[$i]['lastname'] = $obj->lastname;
$tab_result[$i]['firstname'] = $obj->firstname;
$tab_result[$i]['type'] = $obj->type;
- $tab_result[$i]['nb_holidays'] = $obj->nb_holidays;
+ $tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
$i++;
}
@@ -1314,7 +1270,7 @@ class Holiday extends CommonObject
return $tab_result;
}
else
- {
+ {
// Erreur SQL
$this->error="Error ".$this->db->lasterror();
return -1;
@@ -1328,16 +1284,16 @@ class Holiday extends CommonObject
*
* @return int retourne le nombre d'utilisateur
*/
- function countActiveUsers() {
-
+ function countActiveUsers()
+ {
$sql = "SELECT count(u.rowid) as compteur";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.statut > 0";
$result = $this->db->query($sql);
$objet = $this->db->fetch_object($result);
- return $objet->compteur;
+ return $objet->compteur;
}
/**
* Compte le nombre d'utilisateur actifs dans Dolibarr sans CP
@@ -1348,12 +1304,12 @@ class Holiday extends CommonObject
$sql = "SELECT count(u.rowid) as compteur";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
- $sql.= " WHERE u.statut > 0 AND hu.fk_user IS NULL ";
+ $sql.= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
$result = $this->db->query($sql);
$objet = $this->db->fetch_object($result);
- return $objet->compteur;
+ return $objet->compteur;
}
/**
@@ -1367,13 +1323,13 @@ class Holiday extends CommonObject
{
if (empty($userCP)) $userCP=0;
dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarrWithoutCP.' userCP='.$userCP);
-
+/*
// On vérifie les users Dolibarr sans CP
if ($userDolibarrWithoutCP > 0)
{
$this->db->begin();
- $this->updateConfCP('nbUser',$userDolibarrWithoutCP);
+ //$this->updateConfCP('nbUser',$userDolibarrWithoutCP);
$listUsersCP = $this->fetchUsers(true,false);
@@ -1453,7 +1409,7 @@ class Holiday extends CommonObject
return -1;
}
}
-
+*/
return 1;
}
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index d2cde8de5a0..c0179c55bd0 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -152,7 +152,7 @@ llxHeader(array(),$langs->trans('CPTitreMenu'));
print_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
print ''.$langs->trans('LastUpdateCP').': '."\n";
-if ($cp->getConfCP('lastUpdate')) print ''.dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser').' ';
+if ($holiday->getConfCP('lastUpdate')) print ''.dol_print_date($db->jdate($holiday->getConfCP('lastUpdate')),'dayhour','tzuser').' ';
else print $langs->trans('None');
print "