From 488457ccd87e90a00e2d69fa636167c031f847a3 Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Mon, 9 Jun 2025 12:10:16 +0200 Subject: [PATCH] Kalender Anpassungen - Kalender Termin Kopierfeature --- Layout/default/Calendar/View.php | 48 ++++++++++++++++++++------ application/Calendar/CalendarModel.php | 35 ++++++++++++++++++- public/js/pages/Calendar/View.js | 41 ++++++++++++++++++++++ 3 files changed, 113 insertions(+), 11 deletions(-) diff --git a/Layout/default/Calendar/View.php b/Layout/default/Calendar/View.php index 6a232d25a..49c362364 100644 --- a/Layout/default/Calendar/View.php +++ b/Layout/default/Calendar/View.php @@ -120,7 +120,8 @@ endforeach; class="fa-duotone fa-solid fa-phone-volume fa-calendar-call fa-calendar-call-search"> @@ -664,16 +665,20 @@ endforeach;
- -
- -
@@ -689,7 +694,8 @@ endforeach;
-
+
+
+ +
+ + + +
+
+
@@ -766,16 +786,24 @@ endforeach; Absagen - - - + - diff --git a/application/Calendar/CalendarModel.php b/application/Calendar/CalendarModel.php index 0bc7d3a26..c5bad69ac 100644 --- a/application/Calendar/CalendarModel.php +++ b/application/Calendar/CalendarModel.php @@ -959,8 +959,11 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda $data['create'] = time(); $data['edit_by'] = 89; $data['create_by'] = 89; - $db->insert("TheTool_CalendarQueue", $data); + if ($r->delete_old_entry) { + CalendarModel::deleteCalendarOldEvent($r->delete_old_entry); + die(); + } } public static function insertCalendarEventAttachmentTemp($name, $contantType, $content, $size, $newkey) @@ -1021,6 +1024,36 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda die(); } + public static function deleteCalendarOldEvent($id) + { + date_default_timezone_set('Europe/Berlin'); + header('Content-Type: application/json'); + $db = self::dbKalender(); + + $res = $db->select("cal_events", 'id,microsoft_id,user_id,calendar_id', "id = '" . $id . "' LIMIT 1"); + if ($db->num_rows($res)) { + $result = $db->fetch_object($res); + $rescal = $db->select("cal_calendars", "id,ms_user_id", "id = '" . $result->calendar_id . "' LIMIT 1"); + if ($db->num_rows($res)) { + $resultcal = $db->fetch_object($rescal); + $microsoft_user_id = $resultcal->ms_user_id; + var_dump($resultcal); + } + $data = []; + $data['ms_user_id'] = $microsoft_user_id; + $data['ms_event_id'] = $result->microsoft_id; + $data['type'] = 'd'; + $data['status'] = 'p'; + $data['edit'] = time(); + $data['create'] = time(); + $data['edit_by'] = 89; + $data['create_by'] = 89; + $db->insert("TheTool_CalendarQueue", $data); + } + $db->delete("cal_events", "id = '" . $id . "'"); + die(); + } + public static function cancelCalendarEvent($r, $me) { $id = $r->id; diff --git a/public/js/pages/Calendar/View.js b/public/js/pages/Calendar/View.js index 40163d16b..d3faac38e 100644 --- a/public/js/pages/Calendar/View.js +++ b/public/js/pages/Calendar/View.js @@ -722,6 +722,7 @@ document.addEventListener('DOMContentLoaded', function () { $('#location').val(info.event.extendedProps.location); // $('#description').val(info.event.extendedProps.description); $('#delete-event').data('id', info.event.id); + $('#copy-event').data('id', info.event.id); $('#update-event').data('id', info.event.id); $('#cancel-event').data('id', info.event.id); $('#cancelled-event').data('id', info.event.id); @@ -1295,6 +1296,9 @@ $(document).ready(function () { $(document).off('focusin.modal'); $('.hide-cancelled').show(); $('.show-cancelled').hide(); + $('#delete-old-entry').val(''); + $('#delete-old-entry').prop('checked', false); + $('.delete-old-div').hide(); $('#name-col').removeClass('col-9').addClass('col-6'); $('.attachment-div').empty(); $('#reminder').val('NULL'); @@ -1424,6 +1428,11 @@ $(document).ready(function () { if ($('#allday').is(':checked')) { allday = 1; } + let delete_old_entry = ''; + if ($('#delete-old-entry').is(':checked')) { + delete_old_entry = $('#delete-old-entry').val() + } + if ($('#customer-info-check').is(':checked')) { customer_info_check = 1; } @@ -1483,6 +1492,7 @@ $(document).ready(function () { customer_info_type: customer_info_type, customer_info_type_text: customer_info_type_text, customer_info_reminder_check: customer_info_reminder_check, + delete_old_entry: delete_old_entry, newkey: newkey }, function (data) { @@ -1722,6 +1732,37 @@ $(document).ready(function () { $('#EventModal').modal('hide'); } }); + $('body').on('click', '#copy-event', function () { + let id = $(this).data('id'); + $('#EventModalLabel .fa-calendar-symbol').addClass('fa-calendar-circle-plus'); + $('#EventModalLabel .fa-calendar-symbol').removeClass('fa-calendar-lines-pen'); + $('#EventModalLabel .fa-calendar-symbol').removeClass('fa-calendar-circle-exclamation'); + $('#EventModalLabel span').text('Termin erstellen'); + + + $('#calendar-users').prop("disabled", false); + if ($('#update-event').is(':visible')) { + $('#delete-old-entry').val(id); + $('.delete-old-div').show(); + } else { + var $input = $('#name'); + var text = $input.val(); + var pos = text.indexOf(':'); + if (pos !== -1) { + var neuerText = text.substring(pos + 1).trim(); + $input.val(neuerText); + } + $('#busy').val('1'); + } + $('.hide-cancelled').show(); + $('.show-cancelled').hide(); + $('.show-update').hide(); + $('.show-attendee').hide(); + $('.event-organizer-div').hide(); + if ($('#type').val() != 5) { + $('.ticket-div').hide(); + } + }); $('body').on('change', '#allday', function () { if ($(this).is(':checked')) {