';
+
+echo '';
+echo '
+
+';
+
+echo '
';
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 0e39f591bdd..b88547729c1 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -79,7 +79,7 @@ class Holiday extends CommonObject
/**
- * updateSold
+ * updateSold. Update sold and check table of users for holidays is complete. If not complete.
*
* @return int Return 1
*/
@@ -889,7 +889,7 @@ class Holiday extends CommonObject
$month = date('m',$now);
$lastUpdate = $this->getConfCP('lastUpdate');
$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
- //print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate;
+ //print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate;exit;
// Si la date du mois n'est pas la même que celle sauvegardée, on met à jour le timestamp
if ($month != $monthLastUpdate)
@@ -986,25 +986,31 @@ class Holiday extends CommonObject
*/
function createCPusers($single=false,$userid='')
{
- // Si c'est l'ensemble des utilisateurs à ajoutés
- if(!$single)
+ // Si c'est l'ensemble des utilisateurs à ajouter
+ if (! $single)
{
dol_syslog(get_class($this).'::createCPusers');
- foreach($this->fetchUsers(false,true) as $users) {
+ $arrayofusers = $this->fetchUsers(false,true);
+
+ foreach($arrayofusers as $users)
+ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
$sql.= " (fk_user, nb_holiday)";
$sql.= " VALUES ('".$users['rowid']."','0')";
- $this->db->query($sql);
+ $resql=$this->db->query($sql);
+ if (! $resql) dol_print_error($this->db);
}
- } else {
+ }
+ else
+ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
$sql.= " (fk_user, nb_holiday)";
$sql.= " VALUES ('".$userid."','0')";
- $this->db->query($sql);
+ $resql=$this->db->query($sql);
+ if (! $resql) dol_print_error($this->db);
}
-
}
/**
@@ -1051,7 +1057,7 @@ class Holiday extends CommonObject
* uniquement pour vérifier si il existe de nouveau utilisateur
*
* @param boolean $liste si vrai retourne une liste, si faux retourne un array
- * @param boolean $type si vrai retourne pour Dolibarr si faux retourne pour CP
+ * @param boolean $type si vrai retourne pour Dolibarr, si faux retourne pour CP
* @return string retourne un tableau de tout les utilisateurs actifs
*/
function fetchUsers($liste=true,$type=true)
@@ -1262,49 +1268,56 @@ class Holiday extends CommonObject
function verifNbUsers($userDolibarrWithoutCP,$userCP) {
if (empty($userCP)) $userCP=0;
- dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarr.' userCP='.$userCP);
+ dol_syslog(get_class($this).'::verifNbUsers userDolibarr='.$userDolibarrWithoutCP.' userCP='.$userCP);
// On vérifie les users Dolibarr sans CP
if ($userDolibarrWithoutCP > 0)
{
- $this->updateConfCP('nbUser',$userDolibarr);
+ $this->db->begin();
+
+ $this->updateConfCP('nbUser',$userDolibarrWithoutCP);
$listUsersCP = $this->fetchUsers(true,false);
// On séléctionne les utilisateurs qui ne sont pas déjà dans le module
$sql = "SELECT u.rowid, u.lastname, u.firstname";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
- $sql.= " WHERE u.rowid NOT IN(".$listUsersCP.")";
-
- $result = $this->db->query($sql);
-
- // Si pas d'erreur SQL
- if($result) {
+ if ($listUsersCP != '') $sql.= " WHERE u.rowid NOT IN(".$listUsersCP.")";
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
$i = 0;
$num = $this->db->num_rows($resql);
- while($i < $num) {
-
+ while($i < $num)
+ {
$obj = $this->db->fetch_object($resql);
+ $uid = $obj->rowid;
// On ajoute l'utilisateur
- $this->createCPusers(true,$obj->rowid);
+ //print "Add user rowid = ".$uid." into database holiday";
+
+ $result = $this->createCPusers(true,$uid);
$i++;
}
-
+ $this->db->commit();
} else {
// Erreur SQL
$this->error="Error ".$this->db->lasterror();
+ dol_syslog(get_class($this)."::verifNbUsers ".$this->error, LOG_ERR);
+ $this->db->rollback();
return -1;
}
} else {
- // Si il y a moins d'utilisateur Dolibarr que dans le module CP
+ $this->db->begin();
- $this->updateConfCP('nbUser',$userDolibarr);
+ // Si il y a moins d'utilisateur Dolibarr que dans le module CP
+
+ $this->updateConfCP('nbUser',$userDolibarrWithoutCP);
$listUsersDolibarr = $this->fetchUsers(true,true);
@@ -1331,10 +1344,12 @@ class Holiday extends CommonObject
$i++;
}
-
+ $this->db->commit();
} else {
// Erreur SQL
$this->error="Error ".$this->db->lasterror();
+ dol_syslog(get_class($this)."::verifNbUsers ".$this->error, LOG_ERR);
+ $this->db->rollback();
return -1;
}
}
@@ -1720,6 +1735,30 @@ class Holiday extends CommonObject
}
}
+
+ /**
+ * Tous les types
+ *
+ * @return boolean Return array with list of types
+ */
+ function getTypes()
+ {
+ $result = $this->db->query("SELECT rowid, type, affect FROM " . MAIN_DB_PREFIX . "holiday_types");
+ $num = $this->db->num_rows($result);
+ if ($num)
+ {
+ while ($obj = $this->db->fetch_object($result))
+ {
+ $types[] = array('rowid'=> $obj->rowid, 'type'=> $obj->type, 'affect'=>$obj->affect);
+ }
+
+ return $types;
+ }
+
+ return array();
+ }
+
+
/**
* Initialise an instance with random values.
* Used to build previews or test instances.
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 4b37a8b53c5..62e8fc698c9 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -43,14 +43,17 @@ $action=GETPOST('action');
*/
$form = new Form($db);
+$userstatic=new User($db);
+$holiday = new Holiday($db);
+
llxHeader(array(),$langs->trans('CPTitreMenu'));
print_fiche_titre($langs->trans('MenuConfCP'));
-$holiday = new Holiday($db);
+$holiday->updateSold(); // Create users into table holiday if they don't exists. TODO Remove if we use field into table user.
+
$listUsers = $holiday->fetchUsers(false,false);
-$userstatic=new User($db);
// Si il y a une action de mise à jour
if ($action == 'update' && isset($_POST['update_cp']))
@@ -71,7 +74,7 @@ if ($action == 'update' && isset($_POST['update_cp']))
$comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
// We add the modification to the log
- $holiday->addLogCP($user->id,$userID, $langs->trans('ManualUpdate').$comment,$userValue);
+ $holiday->addLogCP($user->id,$userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment,$userValue);
// Update of the days of the employee
$holiday->updateSoldeCP($userID,$userValue);
diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php
index 0092a6e25c9..9fc3e278ac5 100644
--- a/htdocs/holiday/fiche.php
+++ b/htdocs/holiday/fiche.php
@@ -761,8 +761,9 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
print '';
}
else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
+ //var_dump($cp->getConfCP('nbHolidayDeducted'));
$nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted');
- print ' '.$langs->trans('SoldeCPUser', round($nb_holiday,0)).'';
+ print ' '.$langs->trans('SoldeCPUser', round($nb_holiday,2)).'';
print '';
print '';
print '| ' . $langs->trans('TypeLabel') . ' | '; +echo '' . $langs->trans('TypeDescription') . ' | '; +echo '' . $langs->trans('TypeAffect') . ' | '; +echo '' . $langs->trans('TypeDelay') . ' | '; +echo '' . $langs->trans('nbCongesDeductedCPMini') . ' | '; +echo '' . $langs->trans('nbCongesEveryMonthCPMini') . ' | '; +echo ''; +echo ' |
| '.$type['label'].' | +'.($type['description']?$type['description']:'N/A').' | ++ '.($type['affect']?$langs->trans('TypeAffectYes'):$langs->trans('TypeAffectNo')).' + | +'.$type['delay'].' | +'.$type['nbCongesDeducted'].' | +'.$type['nbCongesEveryMonth'].' | +
+ 
+ 
+ |
+
+ 
+ |
+ ||||||
';
+ print $langs->trans('UpdateConfCPOK');
+ print '
';
+
+}
+
+$var = true;
+$i = 0;
+
+foreach($congespayes->getTypes() as $type)
+{
+ if($type['affect']==1)
+ {
+ print '';
+
+ print '
';
+ }
+}
+
+// Fin de page
+$db->close();
+llxFooter();
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 566fdbcf502..5f18a524acc 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2007-2014 Laurent Destailleur