';
// Draft MyObject
if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookcal')) {
$langs->load("orders");
+ $myobjectstatic = new Booking($db);
$sql = "SELECT rowid, `ref`, fk_soc, fk_project, description, note_public, note_private, date_creation, tms, fk_user_creat, fk_user_modif, last_main_doc, import_key, model_pdf, status, firstname, lastname, email, `start`, duration";
$sql .= " FROM ". MAIN_DB_PREFIX . 'bookcal_booking';
@@ -92,7 +94,6 @@ if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookca
id
ref
name
- date
hour
duration
description
@@ -105,7 +106,6 @@ if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookca
$myobjectstatic->id=$obj->rowid;
$myobjectstatic->ref=$obj->ref;
- $myobjectstatic->date = $obj->start;
$myobjectstatic->firstname = $obj->firstname;
$myobjectstatic->lastname = $obj->lastname;
$myobjectstatic->start = $obj->start;
@@ -116,7 +116,7 @@ if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookca
print '' . $myobjectstatic->id . " ";
print '' . $myobjectstatic->ref . " ";
print '' . $myobjectstatic->firstname . " " . $myobjectstatic->lastname . " ";
- print '' . $myobjectstatic->start . " ";
+ print '' . dol_print_date($myobjectstatic->start, 'dayhourtext') . " ";
print '' . $myobjectstatic->duration . " ";
print '' . $myobjectstatic->description . " ";
$i++;
diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php
index caaefd3d90b..dd3c4cabcd7 100644
--- a/htdocs/bookcal/calendar_card.php
+++ b/htdocs/bookcal/calendar_card.php
@@ -353,6 +353,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
}
+ if ($action == 'generate') {
+ print ' Link : Public page' ;
+ }
+
// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
if ($action == 'xxx') {
$text = $langs->trans('ConfirmActionCalendar', $object->ref);
@@ -546,6 +550,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid)?'&socid='.$object->socid:'').'&action=clone&token='.newToken(), '', $permissiontoadd);
}
+ // Generate link
+ if ($object->status == Calendar::STATUS_VALIDATED) {
+ print dolGetButtonAction($langs->trans('generateLink'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=generate', '', $permissiontoadd);
+ }
/*
if ($permissiontoadd) {
if ($object->status == $object::STATUS_ENABLED) {
diff --git a/htdocs/core/ajax/bookcalAjax.php b/htdocs/core/ajax/bookcalAjax.php
new file mode 100644
index 00000000000..80323b0fee9
--- /dev/null
+++ b/htdocs/core/ajax/bookcalAjax.php
@@ -0,0 +1,123 @@
+.
+ */
+
+/**
+ * \file /htdocs/core/ajax/bookcalAjax.php
+ * \brief File to make Ajax action on Book cal
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+ define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREHTML')) {
+ define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+ define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+ define('NOREQUIRESOC', '1');
+}
+// Do not check anti CSRF attack test
+if (!defined('NOREQUIREMENU')) {
+ define('NOREQUIREMENU', '1');
+}
+// If there is no need to load and show top and left menu
+if (!defined("NOLOGIN")) {
+ define("NOLOGIN", '1');
+}
+
+if (!defined('NOBROWSERNOTIF')) {
+ define('NOBROWSERNOTIF', '1');
+}
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+$action = GETPOST('action', 'aZ09');
+$idavailability = GETPOST('id', 'int');
+$datetocheckbooking = GETPOST('datetocheck', 'int');
+$error = 0;
+
+// Security check
+/*if (!defined("NOLOGIN")) { // No need of restrictedArea if not logged: Later the select will filter on public articles only if not logged.
+ restrictedArea($user, 'knowledgemanagement', 0, 'knowledgemanagement_knowledgerecord', 'knowledgerecord');
+}*/
+
+$result = "{}";
+
+/*
+ * Actions
+ */
+
+top_httphead('application/json');
+
+if ($action == 'verifyavailability') {
+ $response = array();
+ if (empty($idavailability)) {
+ $error++;
+ $response["code"] = "MISSING_ID";
+ $response["message"] = "Missing parameter id";
+ header('HTTP/1.0 400 Bad Request');
+ }
+ if (empty($datetocheckbooking)) {
+ $error++;
+ $response["code"] = "MISSING_DATE_AVAILABILITY";
+ $response["message"] = "Missing parameter datetocheck";
+ header('HTTP/1.0 400 Bad Request');
+ }
+ if (!$error) {
+ $datetocheckbooking_end = dol_time_plus_duree($datetocheckbooking, 1, 'd');
+ $sql = "SELECT b.start, b.rowid";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bookcal_booking as b";
+ $sql .= " WHERE fk_bookcal_availability = ".((int) $idavailability);
+ $sql .= " AND b.start >= '".$db->idate($datetocheckbooking)."'";
+ $sql .= " AND b.start < '".$db->idate($datetocheckbooking_end)."'";
+
+ $resql = $db->query($sql);
+ if ($resql) {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ $response = array();
+ $response["content"] = array();
+ while ($i < $num) {
+ $obj = $db->fetch_object($resql);
+ $dateobject = $obj->start;
+ $dateobject = explode(" ", $dateobject)[1];
+ $dateobject = explode(":", $dateobject);
+
+ $dateobjectstring = $dateobject[0].$dateobject[1];
+
+ $response["content"][] = $dateobjectstring;
+ $i++;
+ }
+ if ($i == 0) {
+ $response["code"] = "NO_DATA_FOUND";
+ } else {
+ $response["code"] = "SUCCESS";
+ }
+ } else {
+ dol_print_error($db);
+ }
+ }
+ $result = json_encode($response);
+}
+
+/*
+ * View
+ */
+//None
+
+echo json_encode($result);
diff --git a/htdocs/core/modules/bookcal/mod_booking_advanced.php b/htdocs/core/modules/bookcal/mod_booking_advanced.php
new file mode 100644
index 00000000000..51b60e1fd7a
--- /dev/null
+++ b/htdocs/core/modules/bookcal/mod_booking_advanced.php
@@ -0,0 +1,146 @@
+
+ * Copyright (C) 2004-2007 Laurent Destailleur
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2008 Raphael Bertrand (Resultic)
+ * Copyright (C) 2019 Frédéric France
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
\n"; + $texte .= ''; + + return $texte; + } + + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + global $conf, $db, $langs, $mysoc; + + $object = new Booking($db); + $object->initAsSpecimen(); + + /*$old_code_client = $mysoc->code_client; + $old_code_type = $mysoc->typent_code; + $mysoc->code_client = 'CCCCCCCCCC'; + $mysoc->typent_code = 'TTTTTTTTTT';*/ + + $numExample = $this->getNextValue($object); + + /*$mysoc->code_client = $old_code_client; + $mysoc->typent_code = $old_code_type;*/ + + if (!$numExample) { + $numExample = $langs->trans('NotConfigured'); + } + return $numExample; + } + + /** + * Return next free value + * + * @param Object $object Object we need next value for + * @return string Value if KO, <0 if KO + */ + public function getNextValue($object) + { + global $db, $conf; + + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + + // We get cursor rule + $mask = getDolGlobalString('BOOKCAL_BOOKING_ADVANCED_MASK'); + + if (!$mask) { + $this->error = 'NotConfigured'; + return 0; + } + + $date = $object->date; + + $numFinal = get_next_value($db, $mask, 'bookcal_booking', 'ref', '', null, $date); + + return $numFinal; + } +} diff --git a/htdocs/core/modules/bookcal/mod_booking_standard.php b/htdocs/core/modules/bookcal/mod_booking_standard.php new file mode 100644 index 00000000000..eff6cb23cf6 --- /dev/null +++ b/htdocs/core/modules/bookcal/mod_booking_standard.php @@ -0,0 +1,161 @@ + + * Copyright (C) 2005-2009 Regis Houssin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * Copyright (C) 2004 Eric Seigne
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2006 Andre Cianfarani
+ * Copyright (C) 2012 Juanjo Menent
+ * Copyright (C) 2014 Marcos García
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * Copyright (C) 2009-2012 Regis Houssin
+ * Copyright (C) 2023 anthony Berton
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
\n"; + $texte .= ''; + + return $texte; + } + + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + global $conf, $db, $langs, $mysoc; + + $object = new Booking($db); + $object->initAsSpecimen(); + + /*$old_code_client = $mysoc->code_client; + $old_code_type = $mysoc->typent_code; + $mysoc->code_client = 'CCCCCCCCCC'; + $mysoc->typent_code = 'TTTTTTTTTT';*/ + + $numExample = $this->getNextValue($object); + + /*$mysoc->code_client = $old_code_client; + $mysoc->typent_code = $old_code_type;*/ + + if (!$numExample) { + $numExample = $langs->trans('NotConfigured'); + } + return $numExample; + } + + /** + * Return next free value + * + * @param Object $object Object we need next value for + * @return string Value if KO, <0 if KO + */ + public function getNextValue($object) + { + global $db, $conf; + + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + + // We get cursor rule + $mask = getDolGlobalString('BOOKCAL_BOOKING_ADVANCED_MASK'); + + if (!$mask) { + $this->error = 'NotConfigured'; + return 0; + } + + $date = $object->date; + + $numFinal = get_next_value($db, $mask, 'bookcal_booking', 'ref', '', null, $date); + + return $numFinal; + } +} diff --git a/htdocs/core/modules/bookcal/mod_booking_standard.php b/htdocs/core/modules/bookcal/mod_booking_standard.php new file mode 100644 index 00000000000..eff6cb23cf6 --- /dev/null +++ b/htdocs/core/modules/bookcal/mod_booking_standard.php @@ -0,0 +1,161 @@ + + * Copyright (C) 2005-2009 Regis Houssin
';
+ // Output html code for logo
+ if ($urllogo || getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) {
+ print '
';
+
+ print '';
+ print '
';
+ }
+
+ print '';
+ if ($urllogo) {
+ print '';
+ print '
';
+ print '';
+ }
+ if (getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) {
+ print ''.(getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') ? getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') : $langs->trans("BookCalSystem")).'';
+ }
+ print '
';
+ if (!getDolGlobalInt('MAIN_HIDE_POWERED_BY')) {
+ print '';
+ }
+ print '
';
+}
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'add') {
+ $error = 0;
+ $urlback = '';
+ if (!is_object($user)) {
+ $user = new User($db);
+ }
+
+ $booking = new Booking($db);
+
+ $db->begin();
+ if (!GETPOST("lastname")) {
+ $error++;
+ $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."
\n"; + } + if (!GETPOST("firstname")) { + $error++; + $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."
\n"; + } + if (!GETPOST("email")) { + $error++; + $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."
\n"; + } + + if (!$error) { + $booking->ref = $booking->getNextNumRef(); + $booking->lastname = GETPOST("lastname"); + $booking->firstname = GETPOST("firstname"); + $booking->email = GETPOST("email"); + $booking->description = GETPOST("description"); + $booking->duration = GETPOST("duration"); + $booking->start = GETPOST("datetimebooking", 'int'); + $booking->fk_bookcal_availability = GETPOST("id", 'int'); + + $result = $booking->create($user); + if ($result <= 0) { + $error++; + $errmsg = ($booking->error ? $booking->error.'
' : '').join('
', $booking->errors); + } + } + if (!$error) { + $db->commit(); + $action = 'afteradd'; + } else { + $db->rollback(); + $action = 'create'; + } +} + +/* + * View + */ +$form = new Form($db); + +llxHeaderVierge('BookingCalendar'); + +dol_htmloutput_errors($errmsg); + +if ($action == 'create') { + $backtopage = $_SERVER["PHP_SELF"].'?id='.$id.'&datechosen='.$datechosen.'&fk_calendar='.$fk_calendar; +} else { + $backtopage = DOL_URL_ROOT.'/public/bookcal/index.php?id='.$fk_calendar; +} +print '
+ * Copyright (C) 2009-2012 Regis Houssin
+ * Copyright (C) 2023 anthony Berton
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
\n"; + } + if (!GETPOST("firstname")) { + $error++; + $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."
\n"; + } + if (!GETPOST("email")) { + $error++; + $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."
\n"; + } + + if (!$error) { + $booking->ref = $booking->getNextNumRef(); + $booking->lastname = GETPOST("lastname"); + $booking->firstname = GETPOST("firstname"); + $booking->email = GETPOST("email"); + $booking->description = GETPOST("description"); + $booking->duration = GETPOST("duration"); + $booking->start = GETPOST("datetimebooking", 'int'); + $booking->fk_bookcal_availability = GETPOST("id", 'int'); + + $result = $booking->create($user); + if ($result <= 0) { + $error++; + $errmsg = ($booking->error ? $booking->error.'
' : '').join('
', $booking->errors); + } + } + if (!$error) { + $db->commit(); + $action = 'afteradd'; + } else { + $db->rollback(); + $action = 'create'; + } +} + +/* + * View + */ +$form = new Form($db); + +llxHeaderVierge('BookingCalendar'); + +dol_htmloutput_errors($errmsg); + +if ($action == 'create') { + $backtopage = $_SERVER["PHP_SELF"].'?id='.$id.'&datechosen='.$datechosen.'&fk_calendar='.$fk_calendar; +} else { + $backtopage = DOL_URL_ROOT.'/public/bookcal/index.php?id='.$fk_calendar; +} +print '
';
+print '
';
+
+ print '';
+}
+
+llxFooter('', 'public');
+
+
+/**
+ * Show event of a particular day
+ *
+ * @param int $day Day
+ * @param int $month Month
+ * @param int $year Year
+ * @param int $today Today's day
+ * @return void
+ */
+function show_day_events($day, $month, $year, $today = 0)
+{
+ global $conf;
+ if ($conf->use_javascript_ajax) { // Enable the "Show more button..."
+ $conf->global->MAIN_JS_SWITCH_AGENDA = 1;
+ }
+
+ $dateint = sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day);
+ $eventdatetime = dol_mktime(-1, -1, -1, $month, $day, $year);
+ //print 'show_day_events day='.$day.' month='.$month.' year='.$year.' dateint='.$dateint;
+
+ print "\n";
+
+ $curtime = dol_mktime(0, 0, 0, $month, $day, $year);
+ // Line with title of day
+ print '';
+if ($action == 'afteradd') {
+ print '';
+ print '
';
+ print '
';
+ print ''; + print $langs->trans("BookingSuccessfullyBooked"); + print '
'; + print $langs->trans("BookingReservationHourAfter", dol_print_date(GETPOST("datetimebooking", 'int'), "dayhourtext")); +} else { + print '| '; + print 'Cancel'; + print ' | '; + print ''; + if ($action == 'create') { + print ''.$langs->trans("FieldsWithAreMandatory", '*').''; + } else { + print ''; + } + print ' | '; + print ''; + print ''; + print ' | '; + print '||||||
';
+
+ print ''.(!empty($availability->label) ? $availability->label : $availability->ref).''; + print ''.$langs->trans("AppointmentDuration", $availability->duration).''; + if ($action == 'create') { + print ''; + if (empty($datetimebooking)) { + $timebookingarray = explode(":", $timebooking); + $datetimebooking = dol_time_plus_duree($datetimechosen, intval($timebookingarray[0]), "h"); + $datetimebooking = dol_time_plus_duree($datetimebooking, intval($timebookingarray[1]), "i"); + } + print ''.img_picto("", "calendar")." ".dol_print_date($datetimebooking, 'dayhourtext').''; + } + print ' | ';
+
+ print '';
+ if ($action == "create") {
+ print '';
+ } else {
+ print '
| ';
+ print ''; + print ''; + + print ' | '; + } + print ''; + print '
'."\n";
+ print dol_print_date($curtime, '%d');
+ print '
'; + if ($today) { + print img_picto('today', 'fontawesome_circle_fas_black_7px'); + } else { + print '
'; + } + print '
'; // table
+ print "\n";
+}
diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php
new file mode 100644
index 00000000000..530f37fc91e
--- /dev/null
+++ b/htdocs/public/bookcal/index.php
@@ -0,0 +1,205 @@
+
+ * Copyright (C) 2006-2017 Laurent Destailleur '; + if ($today) { + print img_picto('today', 'fontawesome_circle_fas_black_7px'); + } else { + print '
'; + } + print '
';
+ // Output html code for logo
+ if ($urllogo || getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) {
+ print '
';
+
+ print '';
+ print '
';
+ }
+
+ print '';
+ if ($urllogo) {
+ print '';
+ print '';
+ print '';
+ }
+ if (getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) {
+ print ''.(getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') ? getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') : $langs->trans("BookCalSystem")).'';
+ }
+ print '
';
+ if (!getDolGlobalInt('MAIN_HIDE_POWERED_BY')) {
+ print '';
+ }
+ print '';
+}
+
+
+/*
+ * Actions
+ */
+
+ // None
+
+/*
+ * View
+ */
+$form = new Form($db);
+
+llxHeaderVierge('BookingCalendar');
+
+
+print '
';
+print '
';
+
+print '';
+
+llxFooter('', 'public');
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a46e3b329be..dc453e70d3b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5500,7 +5500,8 @@ td.event-past span {
opacity: 0.5;
}
-
+.cal_available { background: #0060d450; }
+.cal_chosen { background: #0060d4; }
/* ============================================================================== */
/* Ajax - Combo list for autocompletion */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 328d41e8720..4f943e7977c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5503,6 +5503,8 @@ td.cal_other_month {
opacity: 0.8;
}
+.cal_available { background: #0060d450; }
+.cal_chosen { background: #0060d4; }
/* ============================================================================== */
/* Ajax - Combo list for autocompletion */
';
+print '
';
+print '