diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index a5a0b5fbf3f..3dfd8e1e2c2 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -127,6 +127,15 @@ print '';
print ' | ';
print '';
+
+print '';
+print '| '.$langs->trans('EnableResourceUsedInEventCheck').' | ';
+print '';
+echo ajax_constantonoff('RESOURCE_USED_IN_EVENT_CHECK');
+print ' | ';
+print ' | ';
+print '
';
+
print '';
print '';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 003203940a8..173770d725c 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -512,6 +512,65 @@ if ($action == 'update')
$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
if ($ret < 0) $error++;
+ if (!$error) {
+ // check if an event resource is already in use
+ if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
+ $eventDateStart = $object->datep;
+ $eventDateEnd = $object->datef;
+
+ $sql = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "element_resources as er";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element) . "'";
+ $sql .= " WHERE ac.id != " . $object->id;
+ $sql .= " AND er.resource_id IN (";
+ $sql .= " SELECT resource_id FROM " . MAIN_DB_PREFIX . "element_resources";
+ $sql .= " WHERE element_id = " . $object->id;
+ $sql .= " AND element_type = '" . $db->escape($object->element) . "'";
+ $sql .= " AND busy = 1";
+ $sql .= ")";
+ $sql .= " AND er.busy = 1";
+ $sql .= " AND (";
+
+ // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+ $sql .= " (ac.datep <= '" . $db->idate($eventDateStart) . "' AND (ac.datep2 IS NULL OR ac.datep2 >= '" . $db->idate($eventDateStart) . "'))";
+ // event date end between ac.datep and ac.datep2
+ if (!empty($eventDateEnd)) {
+ $sql .= " OR (ac.datep <= '" . $db->idate($eventDateEnd) . "' AND (ac.datep2 >= '" . $db->idate($eventDateEnd) . "'))";
+ }
+ // event date start before ac.datep and event date end after ac.datep2
+ $sql .= " OR (";
+ $sql .= "ac.datep >= '" . $db->idate($eventDateStart) . "'";
+ if (!empty($eventDateEnd)) {
+ $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '" . $db->idate($eventDateEnd) . "')";
+ }
+ $sql .= ")";
+
+ $sql .= ")";
+ $resql = $db->query($sql);
+ if (!$resql) {
+ $error++;
+ $object->error = $db->lasterror();
+ $object->errors[] = $object->error;
+ } else {
+ if ($db->num_rows($resql) > 0) {
+ // already in use
+ $error++;
+ $object->error = $langs->trans('ErrorResourcesAlreadyInUse') . ' : ';
+ while ($obj = $db->fetch_object($resql)) {
+ $object->error .= '
- ' . $langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label . ' [' . $obj->ac_id . ']');
+ }
+ $object->errors[] = $object->error;
+ }
+ $db->free($resql);
+ }
+
+ if ($error) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+ }
+
if (! $error)
{
$db->begin();
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9202e31308b..e530a8a47de 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1907,6 +1907,7 @@ ResourceSetup=Configuration of Resource module
UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
DisabledResourceLinkUser=Disable feature to link a resource to users
DisabledResourceLinkContact=Disable feature to link a resource to contacts
+EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
ConfirmUnactivation=Confirm module reset
OnMobileOnly=On small screen (smartphone) only
DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
index 33a5046e006..134cc4c87a3 100644
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -34,3 +34,6 @@ IdResource=Id resource
AssetNumber=Serial number
ResourceTypeCode=Resource type code
ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s use in %s event
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ff684f01cb9..3d15d7fe3d4 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1907,6 +1907,7 @@ ResourceSetup=Configuration du module Ressource
UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante).
DisabledResourceLinkUser=Désactiver la fonctionnalité pour lier une ressource aux utilisateurs
DisabledResourceLinkContact=Désactiver la fonctionnalité pour lier une ressource aux contacts/adresses
+EnableResourceUsedInEventCheck=Activer la fonctionnalité de vérification d'une ressource déjà réservée lors d'un évènement
ConfirmUnactivation=Confirmer réinitialisation du module
OnMobileOnly=Sur petit écran (smartphone) uniquement
DisableProspectCustomerType=Désactiver le type de tiers "Prospect + Client" (le tiers doit donc être un client potentiel ou un client, mais ne peut pas être les deux)
diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang
index be7547b36da..5db22aedcbd 100644
--- a/htdocs/langs/fr_FR/resource.lang
+++ b/htdocs/langs/fr_FR/resource.lang
@@ -34,3 +34,6 @@ IdResource=id ressource
AssetNumber=Numéro de série
ResourceTypeCode=Code de type de ressource
ImportDataset_resource_1=Ressources
+
+ErrorResourcesAlreadyInUse=Des ressources sont déjà occupées
+ErrorResourceUseInEvent=%s occupée dans l'événement %s
\ No newline at end of file
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 02565a23dd0..bb9a54a9bf0 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -87,6 +87,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
if (empty($reshook))
{
+ $error = 0;
+
if ($action == 'add_element_resource' && ! $cancel)
{
$res = 0;
@@ -100,8 +102,68 @@ if (empty($reshook))
{
$objstat = fetchObjectByElement($element_id, $element, $element_ref);
$objstat->element = $element; // For externals module, we need to keep @xx
- $res = $objstat->add_element_resource($resource_id, $resource_type, $busy, $mandatory);
+
+ // TODO : add this check at update_linked_resource and when modifying event start or end date
+ // check if an event resource is already in use
+ if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element=='action' && $resource_type=='dolresource' && intval($busy)==1) {
+ $eventDateStart = $objstat->datep;
+ $eventDateEnd = $objstat->datef;
+ $isFullDayEvent = intval($objstat->fulldayevent);
+ if (empty($eventDateEnd)) {
+ if ($isFullDayEvent) {
+ $eventDateStartArr = dol_getdate($eventDateStart);
+ $eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+ $eventDateEnd = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+ }
+ }
+
+ $sql = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "element_resources as er";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = '" . $db->escape($resource_type) . "'";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($objstat->element) . "'";
+ $sql .= " WHERE er.resource_id = " . $resource_id;
+ $sql .= " AND er.busy = 1";
+ $sql .= " AND (";
+
+ // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+ $sql .= " (ac.datep <= '" . $db->idate($eventDateStart) . "' AND (ac.datep2 IS NULL OR ac.datep2 >= '" . $db->idate($eventDateStart) . "'))";
+ // event date end between ac.datep and ac.datep2
+ if (!empty($eventDateEnd)) {
+ $sql .= " OR (ac.datep <= '" . $db->idate($eventDateEnd) . "' AND (ac.datep2 >= '" . $db->idate($eventDateEnd) . "'))";
+ }
+ // event date start before ac.datep and event date end after ac.datep2
+ $sql .= " OR (";
+ $sql .= "ac.datep >= '" . $db->idate($eventDateStart) . "'";
+ if (!empty($eventDateEnd)) {
+ $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '" . $db->idate($eventDateEnd) . "')";
+ }
+ $sql .= ")";
+
+ $sql .= ")";
+ $resql = $db->query($sql);
+ if (!$resql) {
+ $error++;
+ $objstat->error = $db->lasterror();
+ $objstat->errors[] = $objstat->error;
+ } else {
+ if ($db->num_rows($resql)>0) {
+ // already in use
+ $error++;
+ $objstat->error = $langs->trans('ErrorResourcesAlreadyInUse') . ' : ';
+ while ($obj = $db->fetch_object($resql)) {
+ $objstat->error .= '
- ' . $langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label . ' [' . $obj->ac_id . ']');
+ }
+ $objstat->errors[] = $objstat->error;
+ }
+ $db->free($resql);
+ }
+ }
+
+ if (!$error) {
+ $res = $objstat->add_element_resource($resource_id, $resource_type, $busy, $mandatory);
+ }
}
+
if (! $error && $res > 0)
{
setEventMessages($langs->trans('ResourceLinkedWithSuccess'), null, 'mesgs');
@@ -123,18 +185,73 @@ if (empty($reshook))
$object->busy = $busy;
$object->mandatory = $mandatory;
- $result = $object->update_element_resource($user);
+ if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type=='action' && $object->resource_type=='dolresource' && intval($object->busy)==1) {
+ $eventDateStart = $object->objelement->datep;
+ $eventDateEnd = $object->objelement->datef;
+ $isFullDayEvent = intval($objstat->fulldayevent);
+ if (empty($eventDateEnd)) {
+ if ($isFullDayEvent) {
+ $eventDateStartArr = dol_getdate($eventDateStart);
+ $eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+ $eventDateEnd = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+ }
+ }
- if ($result >= 0)
- {
+ $sql = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "element_resources as er";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = '" . $db->escape($object->resource_type) . "'";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element_type) . "'";
+ $sql .= " WHERE er.resource_id = " . $object->resource_id;
+ $sql .= " AND ac.id != " . $object->element_id;
+ $sql .= " AND er.busy = 1";
+ $sql .= " AND (";
+
+ // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+ $sql .= " (ac.datep <= '" . $db->idate($eventDateStart) . "' AND (ac.datep2 IS NULL OR ac.datep2 >= '" . $db->idate($eventDateStart) . "'))";
+ // event date end between ac.datep and ac.datep2
+ if (!empty($eventDateEnd)) {
+ $sql .= " OR (ac.datep <= '" . $db->idate($eventDateEnd) . "' AND (ac.datep2 IS NULL OR ac.datep2 >= '" . $db->idate($eventDateEnd) . "'))";
+ }
+ // event date start before ac.datep and event date end after ac.datep2
+ $sql .= " OR (";
+ $sql .= "ac.datep >= '" . $db->idate($eventDateStart) . "'";
+ if (!empty($eventDateEnd)) {
+ $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '" . $db->idate($eventDateEnd) . "')";
+ }
+ $sql .= ")";
+
+ $sql .= ")";
+ $resql = $db->query($sql);
+ if (!$resql) {
+ $error++;
+ $object->error = $db->lasterror();
+ $object->errors[] = $object->error;
+ } else {
+ if ($db->num_rows($resql)>0) {
+ // already in use
+ $error++;
+ $object->error = $langs->trans('ErrorResourcesAlreadyInUse') . ' : ';
+ while ($obj = $db->fetch_object($resql)) {
+ $object->error .= '
- ' . $langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label . ' [' . $obj->ac_id . ']');
+ }
+ $object->errors[] = $objstat->error;
+ }
+ $db->free($resql);
+ }
+ }
+
+ if (!$error) {
+ $result = $object->update_element_resource($user);
+ if ($result < 0) $error++;
+ }
+
+ if ($error) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ } else {
setEventMessages($langs->trans('RessourceLineSuccessfullyUpdated'), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
exit;
}
- else
- {
- setEventMessages($object->error, $object->errors, 'errors');
- }
}
}