diff --git a/Layout/default/Calendar/View.php b/Layout/default/Calendar/View.php
index f13832785..ea5b508fa 100644
--- a/Layout/default/Calendar/View.php
+++ b/Layout/default/Calendar/View.php
@@ -479,7 +479,7 @@ endforeach;
 
                 <div class="row justify-content-center mt-2">
                     <div class="col-2">
-                        <label for="name" class="col-form-label fw-medium ">Teilnehmer</label>
+                        <label for="name" class="col-form-label fw-medium ">Teilnehmer <span class="ml-1 calendar-users-all" style="display: none"><i title="Alle von Planungsansicht" class="fa-solid fa-arrow-right-from-bracket"></i></span></label>
                     </div>
                     <div class="col-8">
                         <select class="form-control form-select select2-multiple-tag" id="calendar-attendees"
@@ -651,7 +651,6 @@ endforeach;
         if ($timerecordingemployee->enddate && $timerecordingemployee->enddate < time()) {
             continue;
         }
-
         ?>
         birthdays.push({
             id: <?= $counter ?>,
diff --git a/public/css/pages/Calendar/View.css b/public/css/pages/Calendar/View.css
index 803cbace0..d1be4b71d 100644
--- a/public/css/pages/Calendar/View.css
+++ b/public/css/pages/Calendar/View.css
@@ -593,4 +593,9 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
 
 .event-status .fa-circle-info:before {
     color: #0029ff;
+}
+
+.fa-arrow-right-from-bracket {
+    color: #0600ff;
+    cursor: pointer;
 }
\ No newline at end of file
diff --git a/public/js/pages/Calendar/View.js b/public/js/pages/Calendar/View.js
index b9ad2c82d..73e444254 100644
--- a/public/js/pages/Calendar/View.js
+++ b/public/js/pages/Calendar/View.js
@@ -74,309 +74,156 @@ document.addEventListener('DOMContentLoaded', function () {
     $.post(requestUrl, {visibleCalendars: visibleCalendars}, function (data) {
 
     }, 'json').done(function (json) {
-        if (json.success == true) {
-            var userevents = [];
-            var otherevents = [];
-            var resources = [];
-            var category = "";
-            var rights = false;
-            var movable = false;
-            var resourceCounter = 0;
-            $.each($('.calendar-check'), function (index, value) {
-                if ($(this).prop('checked')) {
-                    rights = true;
-
-                    resources.push({
-                        id: $(this).data('calendar_id'),
-                        title: $.trim($(this).closest('div').find('label').text()),
-                        order: resourceCounter
-                    });
-
-                    resourceCounter++;
-                }
-            });
-
-
-            $.each(json.data, function (index, value) {
-                category = value.ccategory.ccategory;
-
-                if (value.calendar_id.calendar_id in calendarRights) {
-                    if (calendarRights[value.calendar_id.calendar_id] == 'all') {
+            if (json.success == true) {
+                var userevents = [];
+                var otherevents = [];
+                var resources = [];
+                var category = "";
+                var rights = false;
+                var movable = false;
+                var resourceCounter = 0;
+                $.each($('.calendar-check'), function (index, value) {
+                    if ($(this).prop('checked')) {
                         rights = true;
-                    } else {
-                        rights = false;
-                    }
-                    if (value.isorganizer.isorganizer == '1' && rights) {
-                        movable = true;
-                    } else {
-                        movable = false;
-                    }
 
-                    userevents.push({
-                        id: value.id.id,
-                        start: value.cstart.cstart,
-                        end: value.cend.cend,
-                        title: category,
-                        description: value.description.description,
-                        location: value.location.location,
-                        attachment: value.attachment.attachment,
-                        attachments: value.attachments.attachments,
-                        calendar_id: value.calendar_id,
-                        event_type: value.event_type.event_type,
-                        classNames: ['cal-class-group-' + value.calendar_id.calendar_id, 'cal-class-id-' + value.id.id],
-                        textColor: value.txtColor.txtColor,
-                        backgroundColor: value.bgColor.bgColor,
-                        editable: rights,
-                        droppable: movable,
-                        startEditable: movable,
-                        durationEditable: movable,
-                        resizableFromStart: movable,
-                        resourceId: value.calendar_id.calendar_id,
-                        calendar_name: value.calendar_name.calendar_name,
-                        clickable: rights,
-                        mtime: value.mtime.mtime,
-                        mname: value.mname.mname,
-                        ctime: value.ctime.ctime,
-                        cname: value.cname.cname,
-                        busy: value.busy.busy
-                    });
-                } else {
-                    otherevents.push({
-                        id: value.id.id,
-                        start: value.cstart.cstart,
-                        end: value.cend.cend,
-                        title: category,
-                        description: category,
-                        color: 'red',
-                        editable: false,
-                        calendar_id: value.calendar_id,
-                        event_type: value.event_type.event_type,
-                        classNames: ['cal-class-group-' + value.calendar_id.calendar_id, 'cal-class-id-' + value.id.id],
-                        attachment: value.attachment.attachment,
-                        attachments: value.attachments.attachments,
-                        resourceId: value.calendar_id.calendar_id,
-                        calendar_name: value.calendar_name.calendar_name,
-                        clickable: rights,
-                        mtime: value.mtime.mtime,
-                        mname: value.mname.mname,
-                        ctime: value.ctime.ctime,
-                        cname: value.cname.cname,
-                        busy: value.busy.busy
-                    });
+                        resources.push({
+                            id: $(this).data('calendar_id'),
+                            title: $.trim($(this).closest('div').find('label').text()),
+                            order: resourceCounter
+                        });
 
+                        resourceCounter++;
+                    }
+                });
+
+
+                $.each(json.data, function (index, value) {
+                    category = value.ccategory.ccategory;
+
+                    if (value.calendar_id.calendar_id in calendarRights) {
+                        if (calendarRights[value.calendar_id.calendar_id] == 'all') {
+                            rights = true;
+                        } else {
+                            rights = false;
+                        }
+                        if (value.isorganizer.isorganizer == '1' && rights) {
+                            movable = true;
+                        } else {
+                            movable = false;
+                        }
+
+                        userevents.push({
+                            id: value.id.id,
+                            start: value.cstart.cstart,
+                            end: value.cend.cend,
+                            title: category,
+                            description: value.description.description,
+                            location: value.location.location,
+                            attachment: value.attachment.attachment,
+                            attachments: value.attachments.attachments,
+                            calendar_id: value.calendar_id,
+                            event_type: value.event_type.event_type,
+                            classNames: ['cal-class-group-' + value.calendar_id.calendar_id, 'cal-class-id-' + value.id.id],
+                            textColor: value.txtColor.txtColor,
+                            backgroundColor: value.bgColor.bgColor,
+                            editable: rights,
+                            droppable: movable,
+                            startEditable: movable,
+                            durationEditable: movable,
+                            resizableFromStart: movable,
+                            resourceId: value.calendar_id.calendar_id,
+                            calendar_name: value.calendar_name.calendar_name,
+                            clickable: rights,
+                            mtime: value.mtime.mtime,
+                            mname: value.mname.mname,
+                            ctime: value.ctime.ctime,
+                            cname: value.cname.cname,
+                            busy: value.busy.busy
+                        });
+                    } else {
+                        otherevents.push({
+                            id: value.id.id,
+                            start: value.cstart.cstart,
+                            end: value.cend.cend,
+                            title: category,
+                            description: category,
+                            color: 'red',
+                            editable: false,
+                            calendar_id: value.calendar_id,
+                            event_type: value.event_type.event_type,
+                            classNames: ['cal-class-group-' + value.calendar_id.calendar_id, 'cal-class-id-' + value.id.id],
+                            attachment: value.attachment.attachment,
+                            attachments: value.attachments.attachments,
+                            resourceId: value.calendar_id.calendar_id,
+                            calendar_name: value.calendar_name.calendar_name,
+                            clickable: rights,
+                            mtime: value.mtime.mtime,
+                            mname: value.mname.mname,
+                            ctime: value.ctime.ctime,
+                            cname: value.cname.cname,
+                            busy: value.busy.busy
+                        });
+
+                    }
+                });
+
+                function sleep(ms) {
+                    return new Promise(resolve => setTimeout(resolve, ms));
                 }
-            });
 
-            function sleep(ms) {
-                return new Promise(resolve => setTimeout(resolve, ms));
-            }
-
-            const eventSources = [];
-            eventSources.push(userevents);
-            eventSources.push(otherevents);
-            if (visibleCalendars.includes(997)) {
-                eventSources.push(holiDays);
-            }
-            if (visibleCalendars.includes(998)) {
-                eventSources.push(birthdays);
-            }
+                const eventSources = [];
+                eventSources.push(userevents);
+                eventSources.push(otherevents);
+                if (visibleCalendars.includes(997)) {
+                    eventSources.push(holiDays);
+                }
+                if (visibleCalendars.includes(998)) {
+                    eventSources.push(birthdays);
+                }
 
 
-            calendar = new FullCalendar.Calendar(calendarEl, {
-                schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
-                timeZone: 'UTC',
-                locale: 'de',
+                calendar = new FullCalendar.Calendar(calendarEl, {
+                    schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
+                    timeZone: 'UTC',
+                    locale: 'de',
 
 
-                themeSystem: 'bootstrap4',
-                snapDuration: '00:15:00',
-                selectable: true,
-                headerToolbar: {
-                    left: "prev,today,next",
-                    center: 'title',
-                    right: 'dayGridMonth,timeGridWeek,timeGridDay,resourceTimelineDay,listMonth'
-                },
-                buttonText: {
-                    resourceTimelineDay: 'Planung'
-                },
-                select: function (info) {
-                    let cestDate = new Date(info.startStr);
-                    let cestOffset = 0; // 2 Stunden in Minuten
-                    let utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
-
-                    let utcDate = new Date(utcTime);
-                    let year = utcDate.getUTCFullYear();
-                    let month = String(utcDate.getUTCMonth() + 1).padStart(2, '0');
-                    let day = String(utcDate.getUTCDate()).padStart(2, '0');
-                    let hours = String(utcDate.getUTCHours()).padStart(2, '0');
-                    let minutes = String(utcDate.getUTCMinutes()).padStart(2, '0');
-                    let seconds = String(utcDate.getUTCSeconds()).padStart(2, '0');
-
-                    let StartformattedDate = year + "-" + month + "-" + day;
-                    let StarteformattedTime = hours + ":" + minutes;
-
-                    cestDate = new Date(info.endStr);
-                    cestOffset = 0; // 2 Stunden in Minuten
-                    utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
-
-                    utcDate = new Date(utcTime);
-                    year = utcDate.getUTCFullYear();
-                    month = String(utcDate.getUTCMonth() + 1).padStart(2, '0');
-                    day = String(utcDate.getUTCDate()).padStart(2, '0');
-                    hours = String(utcDate.getUTCHours()).padStart(2, '0');
-                    minutes = String(utcDate.getUTCMinutes()).padStart(2, '0');
-                    seconds = String(utcDate.getUTCSeconds()).padStart(2, '0');
-
-                    let EndformattedDate = year + "-" + month + "-" + day;
-                    let EndformattedTime = hours + ":" + minutes;
-
-
-                    $('#EventModal').modal('show');
-                    $('#start-date').val(StartformattedDate);
-                    $('#start-time').val(StarteformattedTime);
-                    $('#end-date').val(EndformattedDate);
-                    $('#end-time').val(EndformattedTime);
-
-                }, eventClick: function (info, element) {
-                    let isOrganizer;
-
-                    $.getJSON(requestEventUrl, {
-                        id: info.event.id
-                    }, function (data) {
-
-                    }).done(function (data) {
-                        // console.log(data);
-                        if (data.data.attachment.attachment) {
-                            let docs = "";
-                            $.each(data.data.attachments.attachments, function (index, value) {
-                                docs += `<div data-docid="` + value.id + `" class="doc-main-div"><div  class="d-inline-block doc-icon-div"><i class="fa-duotone fa-solid ` + value.icon + `"></i></div><div class="d-inline-block doc-content-div"><a href="` + requestEventAttachmentUrl + `&id=` + value.id + `" target="_blank" >` + value.name + `</a></div><span class="float-right"><i title="` + value.name + ` entfernen" class="fas fa-trash fa-del-attachment ml-2"></i></span><span class="float-right">` + formatFileSize(value.size) + `</span></div>`;
-                            });
-                            $('.attachment-div').append(docs);
-                        }
-                        if (data.data.reminder.reminder) {
-                            $('#reminder').val(data.data.reminder.reminder);
-                        } else {
-                            $('#reminder').val('NULL');
-                        }
-                        $('#type').val(data.data.type.type);
-                        $('#busy').val(data.data.busy.busy);
-                        isOrganizer = data.data.isorganizer.isorganizer;
-                        if (data.data.type.type == "1") {
-                            $('.customer-div').hide();
-                        } else if (data.data.type.type == "2") {
-                            $('.customer-div').show();
-                            if (data.data.customer.customer) {
-                                $('#customer').html('<option>' + data.data.customer.customer + '</option>');
-                            } else {
-                                $('#customer').html('<option></option>');
+                    themeSystem: 'bootstrap4',
+                    snapDuration: '00:15:00',
+                    selectable: true,
+                    headerToolbar: {
+                        left: "prev,today,next",
+                        center: 'title',
+                        right: 'dayGridMonth,timeGridWeek,timeGridDay,resourceTimelineDay,listMonth'
+                    },
+                    views: {
+                        timeGridDay: {
+                            titleFormat: {
+                                weekday: 'long',
+                                year: 'numeric',
+                                month: 'short',
+                                day: 'numeric'
                             }
-                            if (data.data.customer_info_reminder.customer_info_reminder) {
-                                $('#customer-info-reminder-check').prop('checked', true);
-                            }
-                            $('#customer').select2({
-                                placeholder: "Kunden Suche",
-                                minimumInputLength: 3,
-                                // dropdownParent: $('#EventModal'),
-                                language: "de",
-                                ajax: {
-                                    url: requestAddressUrl,
-                                    dataType: 'json',
-                                    delay: 250,
-                                    processResults: function (data) {
-                                        // Transforms the top-level key of the response object from 'items' to 'results'
-                                        return {
-                                            results: data.items
-                                        };
-                                    }
-                                }
-                            });
-                            if (data.data.customer_info.customer_info) {
-                                const obj = JSON.parse(data.data.customer_info.customer_info);
-                                $('#customer-info-text').val(obj.customer_info_text);
-                                $('#customer-info-type').val(obj.customer_info_type);
-                                $('#customer-info-type-text').val(obj.customer_info_type_text);
-                            }
-                            if (data.data.customer_info_send.customer_info_send) {
-                                const obj = JSON.parse(data.data.customer_info_send.customer_info_send);
-                                $('#customer-info-check-info').html('<i class="fa-sharp-duotone fa-solid fa-circle-info"></i>');
-                                const unixTime = obj.sendtime;
-                                const date = new Date(unixTime * 1000);
-                                const germanDateTime = date.toLocaleString('de-DE', {
-                                    day: '2-digit',
-                                    month: '2-digit',
-                                    year: 'numeric',
-                                    hour: '2-digit',
-                                    minute: '2-digit',
-                                    second: '2-digit',
-                                });
-                                var typeText;
-                                if (obj.customer_info_type == 1) {
-                                    typeText = 'E-Mail';
-                                } else if (obj.customer_info_type == 2) {
-                                    typeText = 'SMS';
-                                }
-                                var title = `<div class="text-center font-weight-500">Letzte gesendete Info (` + typeText + `):</div>
-                                                    <div class="text-left">` + obj.customer_info_text.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br />$2') + `</div>  
-                                                    <div class="text-left"><span class="font-weight-500">gesendet an:</span> ` + obj.customer_info_type_text + `</div>
-                                                    <div class="text-left"><span class="font-weight-500">gesendet von:</span> ` + obj.sendby + `</div>
-                                                    <div class="text-left"><span class="font-weight-500">gesendet am:</span> ` + germanDateTime + `</div>
-                                                                                     
-`;
-                                var tooltip = new Tooltip($('.fa-circle-info'), {
-                                    title: title,
-                                    placement: 'right',
-                                    trigger: 'hover',
-                                    container: 'body',
-                                    html: true
-                                });
+                        },
+                        resourceTimelineDay: {
+                            titleFormat: {
+                                weekday: 'long',
+                                year: 'numeric',
+                                month: 'short',
+                                day: 'numeric'
                             }
                         }
-                        if (isOrganizer == "1") {
-                            $('.event-organizer-div').hide();
-                            $('.show-update').show();
-                            $('.show-attendee').hide();
-                        } else {
-                            const organizer = JSON.parse(data.data.organizer.organizer);
-                            $('.event-organizer-div').show();
-                            $('.event-organizer').text(organizer.name);
-                            $('.accepted-status').removeClass('fa-circle-check');
-                            $('.accepted-status').removeClass('fa-circle-info');
-                            let accepted = data.data.accepted.accepted;
-                            if (accepted) {
-                                const accept = JSON.parse(accepted);
-                                const datetime = new Date(accept.time * 1000);
-                                const germanDateTime = datetime.toLocaleString('de-DE');
-                                $('.accepted-status').addClass('fa-circle-check');
-                                $('.accepted-status').prop('title', accept.user + ' (' + germanDateTime + ')');
-                                $('.event-accepted').text('Akzeptiert');
-                            } else {
-                                $('.accepted-status').addClass('fa-circle-info');
-                                $('.accepted-status').prop('title', 'Termin wurde noch nicht bestätigt');
-                                $('.event-accepted').text('Offen');
-                            }
-                            $('.show-update').hide();
-                            $('.show-attendee').show();
-                            $('.show-attendee').data('id', info.event.id);
+                    },
+                    buttonText: {
+                        resourceTimelineDay: 'Planung'
+                    },
+                    select: function (info) {
+                        let resourceId = "";
+                        if (info.resource) {
+                            console.log(info.resource.id);
+                            resourceId = info.resource.id;
                         }
-                        if (data.data.attendees.attendees) {
-                            let attendees = JSON.parse(data.data.attendees.attendees);
-                            $.each(attendees, function (index, value) {
-                                if (!Number.isInteger(value)) {
-                                    var valueExists = $("#calendar-attendees option").filter(function () {
-                                        return $(this).val() === value;
-                                    }).length > 0;
-                                    if (!valueExists) {
-                                        $("#calendar-attendees").append(new Option(value, value, true, true))
-                                    }
-                                }
-                            });
-
-                            $('#calendar-attendees').val(attendees).trigger('change');
-                        }
-
-                    });
-                    if (info.event.extendedProps.clickable) {
-                        let cestDate = new Date(info.event.startStr);
+                        let cestDate = new Date(info.startStr);
                         let cestOffset = 0; // 2 Stunden in Minuten
                         let utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
 
@@ -391,14 +238,10 @@ document.addEventListener('DOMContentLoaded', function () {
                         let StartformattedDate = year + "-" + month + "-" + day;
                         let StarteformattedTime = hours + ":" + minutes;
 
-                        cestDate = new Date(info.event.endStr);
+                        cestDate = new Date(info.endStr);
                         cestOffset = 0; // 2 Stunden in Minuten
-
-
                         utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
-                        if (info.event.allDay) {
-                            utcTime = utcTime - 60;
-                        }
+
                         utcDate = new Date(utcTime);
                         year = utcDate.getUTCFullYear();
                         month = String(utcDate.getUTCMonth() + 1).padStart(2, '0');
@@ -412,226 +255,413 @@ document.addEventListener('DOMContentLoaded', function () {
 
 
                         $('#EventModal').modal('show');
+                        if (resourceId) {
+                            $('#calendar-users').val(resourceId).trigger('change');
+                            $('.calendar-users-all').show();
+                        }
                         $('#start-date').val(StartformattedDate);
                         $('#start-time').val(StarteformattedTime);
                         $('#end-date').val(EndformattedDate);
                         $('#end-time').val(EndformattedTime);
 
-                        $('#EventModal').modal('show');
-                        if (info.event.allDay) {
-                            $('#allday').prop('checked', true)
-                            $('#allday').change();
+                    }, eventClick: function (info, element) {
 
-                            $('#end-time').val('');
-                            $('#end-date').val(EndformattedDate);
-                            $('#start-time').val('');
-                        } else {
-                            $('#end-date').val(EndformattedDate);
-                            $('#allday').prop('checked', false);
-                            $('#end-time').val(EndformattedTime);
-                            $('#start-time').val(StarteformattedTime);
-                        }
+                        let isOrganizer;
 
+                        $.getJSON(requestEventUrl, {
+                            id: info.event.id
+                        }, function (data) {
 
-                        $('#name').val(info.event.title);
-                        $('#location').val(info.event.extendedProps.location);
-                        $('#description').val(info.event.extendedProps.description);
-                        $('#delete-event').data('id', info.event.id);
-                        $('#update-event').data('id', info.event.id);
-                        $('#EventModalLabel').data('id', info.event.id);
-                        $('#EventModalLabel span').text('Termin bearbeiten');
-                        $('#EventModalLabel .fa-calendar-symbol').removeClass('fa-calendar-circle-plus');
-                        $('#EventModalLabel .fa-calendar-symbol').addClass('fa-calendar-lines-pen');
-                        $('#add-event').hide();
-                        // $('#calendar-users').select2('destroy');
-                        // $('#calendar-users').select2();
-                        $('#calendar-users').val(info.event.extendedProps.calendar_id.calendar_id).trigger('change');
-                        $('#calendar-users').select2("enable", false)
-                    }
-                },
-                eventDidMount: function (info) {
-                    // console.log(info);
-                    var eventstart = new Date(info.event.startStr);
-                    var eventend = new Date(info.event.endStr);
-
-                    var title;
-                    if (!info.event.allDay) {
-                        eventstart = String(eventstart.getUTCHours()).padStart(2, '0') + ':' + String(eventstart.getUTCMinutes()).padStart(2, '0');
-                        eventend = String(eventend.getUTCHours()).padStart(2, '0') + ':' + String(eventend.getUTCMinutes()).padStart(2, '0');
-                        title = '<div class="tooltip-description text-center">von ' + eventstart + ' bis ' + eventend + '</div>';
-                    } else {
-                        eventstart = String(eventstart.getUTCDate()).padStart(2, '0') + '.' + String(eventstart.getUTCMonth() + 1).padStart(2, '0') + '.' + eventstart.getUTCFullYear();
-                        eventend = String(eventend.getUTCDate()).padStart(2, '0') + '.' + String(eventend.getUTCMonth() + 1).padStart(2, '0') + '.' + eventend.getUTCFullYear();
-                        if (eventend == "NaN.NaN.NaN") {
-                            eventend = eventstart;
-                        }
-                        // console.log(eventend);
-                        title = '<div class="tooltip-description text-center">Ganztägig von ' + eventstart + ' bis ' + eventend + ' </div>';
-                    }
-
-
-                    title += info.event.title;
-                    if (info.event.extendedProps['description']) {
-                        title += '<div class="tooltip-description text-left">' + info.event.extendedProps['description'] + '</div>';
-                    }
-                    if (info.event.extendedProps['location']) {
-                        title += '<div class="text-left tooltip-location">@ ' + info.event.extendedProps['location'] + '</div>';
-                    }
-                    if (info.event.extendedProps['attachment'] == 1) {
-                        const obj = JSON.parse(info.event.extendedProps['attachments']);
-                        let docs = "";
-                        $.each(obj, function (index, value) {
-                            var filename;
-                            if (fileTypeClasses[value.contentType]) {
-                                filename = fileTypeClasses[value.contentType];
-                            } else {
-                                filename = 'fa-file';
+                        }).done(function (data) {
+                            // console.log(data);
+                            if (data.data.attachment.attachment) {
+                                let docs = "";
+                                $.each(data.data.attachments.attachments, function (index, value) {
+                                    docs += `<div data-docid="` + value.id + `" class="doc-main-div"><div  class="d-inline-block doc-icon-div"><i class="fa-duotone fa-solid ` + value.icon + `"></i></div><div class="d-inline-block doc-content-div"><a href="` + requestEventAttachmentUrl + `&id=` + value.id + `" target="_blank" >` + value.name + `</a></div><span class="float-right"><i title="` + value.name + ` entfernen" class="fas fa-trash fa-del-attachment ml-2"></i></span><span class="float-right">` + formatFileSize(value.size) + `</span></div>`;
+                                });
+                                $('.attachment-div').append(docs);
                             }
-                            docs += `<div class="doc-main-div font-13"><div  class="d-inline-block doc-icon-div"><i class="fa-duotone fa-solid ` + filename + ` font-15"></i></div><div class="d-inline-block doc-content-tooltip-div"><a href="` + requestEventAttachmentUrl + `&id=` + value.id + `" target="_blank" >` + value.name + `</a></div><span class="float-right d-inline-block ml-1 font-12">` + formatFileSize(value.size) + `</span></div>`;
+                            if (data.data.reminder.reminder) {
+                                $('#reminder').val(data.data.reminder.reminder);
+                            } else {
+                                $('#reminder').val('NULL');
+                            }
+                            $('#type').val(data.data.type.type);
+                            $('#busy').val(data.data.busy.busy);
+                            isOrganizer = data.data.isorganizer.isorganizer;
+                            if (data.data.type.type == "1") {
+                                $('.customer-div').hide();
+                            } else if (data.data.type.type == "2") {
+                                $('.customer-div').show();
+                                if (data.data.customer.customer) {
+                                    $('#customer').html('<option>' + data.data.customer.customer + '</option>');
+                                } else {
+                                    $('#customer').html('<option></option>');
+                                }
+                                if (data.data.customer_info_reminder.customer_info_reminder) {
+                                    $('#customer-info-reminder-check').prop('checked', true);
+                                }
+                                $('#customer').select2({
+                                    placeholder: "Kunden Suche",
+                                    minimumInputLength: 3,
+                                    // dropdownParent: $('#EventModal'),
+                                    language: "de",
+                                    ajax: {
+                                        url: requestAddressUrl,
+                                        dataType: 'json',
+                                        delay: 250,
+                                        processResults: function (data) {
+                                            // Transforms the top-level key of the response object from 'items' to 'results'
+                                            return {
+                                                results: data.items
+                                            };
+                                        }
+                                    }
+                                });
+                                if (data.data.customer_info.customer_info) {
+                                    const obj = JSON.parse(data.data.customer_info.customer_info);
+                                    $('#customer-info-text').val(obj.customer_info_text);
+                                    $('#customer-info-type').val(obj.customer_info_type);
+                                    $('#customer-info-type-text').val(obj.customer_info_type_text);
+                                }
+                                if (data.data.customer_info_send.customer_info_send) {
+                                    const obj = JSON.parse(data.data.customer_info_send.customer_info_send);
+                                    $('#customer-info-check-info').html('<i class="fa-sharp-duotone fa-solid fa-circle-info"></i>');
+                                    const unixTime = obj.sendtime;
+                                    const date = new Date(unixTime * 1000);
+                                    const germanDateTime = date.toLocaleString('de-DE', {
+                                        day: '2-digit',
+                                        month: '2-digit',
+                                        year: 'numeric',
+                                        hour: '2-digit',
+                                        minute: '2-digit',
+                                        second: '2-digit',
+                                    });
+                                    var typeText;
+                                    if (obj.customer_info_type == 1) {
+                                        typeText = 'E-Mail';
+                                    } else if (obj.customer_info_type == 2) {
+                                        typeText = 'SMS';
+                                    }
+                                    var title = `<div class="text-center font-weight-500">Letzte gesendete Info (` + typeText + `):</div>
+                                                    <div class="text-left">` + obj.customer_info_text.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br />$2') + `</div>  
+                                                    <div class="text-left"><span class="font-weight-500">gesendet an:</span> ` + obj.customer_info_type_text + `</div>
+                                                    <div class="text-left"><span class="font-weight-500">gesendet von:</span> ` + obj.sendby + `</div>
+                                                    <div class="text-left"><span class="font-weight-500">gesendet am:</span> ` + germanDateTime + `</div>
+                                                                                     
+`;
+                                    var tooltip = new Tooltip($('.fa-circle-info'), {
+                                        title: title,
+                                        placement: 'right',
+                                        trigger: 'hover',
+                                        container: 'body',
+                                        html: true
+                                    });
+                                }
+                            }
+                            if (isOrganizer == "1") {
+                                $('.event-organizer-div').hide();
+                                $('.show-update').show();
+                                $('.show-attendee').hide();
+                            } else {
+                                const organizer = JSON.parse(data.data.organizer.organizer);
+                                $('.event-organizer-div').show();
+                                $('.event-organizer').text(organizer.name);
+                                $('.accepted-status').removeClass('fa-circle-check');
+                                $('.accepted-status').removeClass('fa-circle-info');
+                                let accepted = data.data.accepted.accepted;
+                                if (accepted) {
+                                    const accept = JSON.parse(accepted);
+                                    const datetime = new Date(accept.time * 1000);
+                                    const germanDateTime = datetime.toLocaleString('de-DE');
+                                    $('.accepted-status').addClass('fa-circle-check');
+                                    $('.accepted-status').prop('title', accept.user + ' (' + germanDateTime + ')');
+                                    $('.event-accepted').text('Akzeptiert');
+                                } else {
+                                    $('.accepted-status').addClass('fa-circle-info');
+                                    $('.accepted-status').prop('title', 'Termin wurde noch nicht bestätigt');
+                                    $('.event-accepted').text('Offen');
+                                }
+                                $('.show-update').hide();
+                                $('.show-attendee').show();
+                                $('.show-attendee').data('id', info.event.id);
+                            }
+                            if (data.data.attendees.attendees) {
+                                let attendees = JSON.parse(data.data.attendees.attendees);
+                                $.each(attendees, function (index, value) {
+                                    if (!Number.isInteger(value)) {
+                                        var valueExists = $("#calendar-attendees option").filter(function () {
+                                            return $(this).val() === value;
+                                        }).length > 0;
+                                        if (!valueExists) {
+                                            $("#calendar-attendees").append(new Option(value, value, true, true))
+                                        }
+                                    }
+                                });
+
+                                $('#calendar-attendees').val(attendees).trigger('change');
+                            }
+
                         });
-                        title += '<div class="text-left tooltip-attachments font-13">' + docs + '</div>';
-                    }
-                    if (info.event.extendedProps['ctime']) {
-                        title += '<div class="text-left font-13"><span class="font-weight-500">Kalender: </span>' + info.event.extendedProps['calendar_name'] + '</div>';
-                        title += '<div class="text-left font-13"><span class="font-weight-500">erstellt am </span>' + info.event.extendedProps['ctime'] + '</div>';
-                        title += '<div class="text-left font-13"><span class="font-weight-500">erstellt von </span>' + info.event.extendedProps['cname'] + '</div>';
-                        title += '<div class="text-left font-13"><span class="font-weight-500">geändert am </span> ' + info.event.extendedProps['mtime'] + '</div>';
-                        title += '<div class="text-left font-13"><span class="font-weight-500">geändert von </span> ' + info.event.extendedProps['mname'] + '</div>';
-                    }
-                    // console.log(info);
-                    if ($('.fc-button-active').hasClass('fc-timeGridWeek-button') || $('.fc-button-active').hasClass('fc-timeGridDay-button')) {
-                        if (info.event.extendedProps['attachment']) {
-                            info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "<div class=\"fc-event-attachment\"><i class=\"fa-light fa-paperclip-vertical\"></i></div>");
+                        if (info.event.extendedProps.clickable) {
+                            let cestDate = new Date(info.event.startStr);
+                            let cestOffset = 0; // 2 Stunden in Minuten
+                            let utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
+
+                            let utcDate = new Date(utcTime);
+                            let year = utcDate.getUTCFullYear();
+                            let month = String(utcDate.getUTCMonth() + 1).padStart(2, '0');
+                            let day = String(utcDate.getUTCDate()).padStart(2, '0');
+                            let hours = String(utcDate.getUTCHours()).padStart(2, '0');
+                            let minutes = String(utcDate.getUTCMinutes()).padStart(2, '0');
+                            let seconds = String(utcDate.getUTCSeconds()).padStart(2, '0');
+
+                            let StartformattedDate = year + "-" + month + "-" + day;
+                            let StarteformattedTime = hours + ":" + minutes;
+
+                            cestDate = new Date(info.event.endStr);
+                            cestOffset = 0; // 2 Stunden in Minuten
+
+
+                            utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
+                            if (info.event.allDay) {
+                                utcTime = utcTime - 60;
+                            }
+                            utcDate = new Date(utcTime);
+                            year = utcDate.getUTCFullYear();
+                            month = String(utcDate.getUTCMonth() + 1).padStart(2, '0');
+                            day = String(utcDate.getUTCDate()).padStart(2, '0');
+                            hours = String(utcDate.getUTCHours()).padStart(2, '0');
+                            minutes = String(utcDate.getUTCMinutes()).padStart(2, '0');
+                            seconds = String(utcDate.getUTCSeconds()).padStart(2, '0');
+
+                            let EndformattedDate = year + "-" + month + "-" + day;
+                            let EndformattedTime = hours + ":" + minutes;
+
+
+                            $('#EventModal').modal('show');
+                            $('#start-date').val(StartformattedDate);
+                            $('#start-time').val(StarteformattedTime);
+                            $('#end-date').val(EndformattedDate);
+                            $('#end-time').val(EndformattedTime);
+
+                            $('#EventModal').modal('show');
+                            if (info.event.allDay) {
+                                $('#allday').prop('checked', true)
+                                $('#allday').change();
+
+                                $('#end-time').val('');
+                                $('#end-date').val(EndformattedDate);
+                                $('#start-time').val('');
+                            } else {
+                                $('#end-date').val(EndformattedDate);
+                                $('#allday').prop('checked', false);
+                                $('#end-time').val(EndformattedTime);
+                                $('#start-time').val(StarteformattedTime);
+                            }
+
+
+                            $('#name').val(info.event.title);
+                            $('#location').val(info.event.extendedProps.location);
+                            $('#description').val(info.event.extendedProps.description);
+                            $('#delete-event').data('id', info.event.id);
+                            $('#update-event').data('id', info.event.id);
+                            $('#EventModalLabel').data('id', info.event.id);
+                            $('#EventModalLabel span').text('Termin bearbeiten');
+                            $('#EventModalLabel .fa-calendar-symbol').removeClass('fa-calendar-circle-plus');
+                            $('#EventModalLabel .fa-calendar-symbol').addClass('fa-calendar-lines-pen');
+                            $('#add-event').hide();
+                            // $('#calendar-users').select2('destroy');
+                            // $('#calendar-users').select2();
+                            $('#calendar-users').val(info.event.extendedProps.calendar_id.calendar_id).trigger('change');
+                            $('#calendar-users').select2("enable", false)
                         }
-                        if (info.event.extendedProps['event_type'] == '2') {
+                    },
+                    eventDidMount: function (info) {
+                        // console.log(info);
+                        var eventstart = new Date(info.event.startStr);
+                        var eventend = new Date(info.event.endStr);
 
-                            info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "<div class=\"fc-event-type\"><i class=\"fa-light fa-user-helmet-safety\"></i></div>");
+                        var title;
+                        if (!info.event.allDay) {
+                            eventstart = String(eventstart.getUTCHours()).padStart(2, '0') + ':' + String(eventstart.getUTCMinutes()).padStart(2, '0');
+                            eventend = String(eventend.getUTCHours()).padStart(2, '0') + ':' + String(eventend.getUTCMinutes()).padStart(2, '0');
+                            title = '<div class="tooltip-description text-center">von ' + eventstart + ' bis ' + eventend + '</div>';
+                        } else {
+                            eventstart = String(eventstart.getUTCDate()).padStart(2, '0') + '.' + String(eventstart.getUTCMonth() + 1).padStart(2, '0') + '.' + eventstart.getUTCFullYear();
+                            eventend = String(eventend.getUTCDate()).padStart(2, '0') + '.' + String(eventend.getUTCMonth() + 1).padStart(2, '0') + '.' + eventend.getUTCFullYear();
+                            if (eventend == "NaN.NaN.NaN") {
+                                eventend = eventstart;
+                            }
+                            // console.log(eventend);
+                            title = '<div class="tooltip-description text-center">Ganztägig von ' + eventstart + ' bis ' + eventend + ' </div>';
                         }
-                    }
 
-                    var tooltip = new Tooltip(info.el, {
-                        title: title,
-                        placement: 'right',
-                        delay: {hide: 50},
-                        trigger: 'hover',
-                        container: 'body',
-                        html: true,
-                    });
 
-                    var tooltips = info.event.extendedProps['tooltips'] || [];
-                    tooltips.push(tooltip);
-                    info.event.setExtendedProp('tooltips', tooltips);
-                },
+                        title += info.event.title;
+                        if (info.event.extendedProps['description']) {
+                            title += '<div class="tooltip-description text-left">' + info.event.extendedProps['description'] + '</div>';
+                        }
+                        if (info.event.extendedProps['location']) {
+                            title += '<div class="text-left tooltip-location">@ ' + info.event.extendedProps['location'] + '</div>';
+                        }
+                        if (info.event.extendedProps['attachment'] == 1) {
+                            const obj = JSON.parse(info.event.extendedProps['attachments']);
+                            let docs = "";
+                            $.each(obj, function (index, value) {
+                                var filename;
+                                if (fileTypeClasses[value.contentType]) {
+                                    filename = fileTypeClasses[value.contentType];
+                                } else {
+                                    filename = 'fa-file';
+                                }
+                                docs += `<div class="doc-main-div font-13"><div  class="d-inline-block doc-icon-div"><i class="fa-duotone fa-solid ` + filename + ` font-15"></i></div><div class="d-inline-block doc-content-tooltip-div"><a href="` + requestEventAttachmentUrl + `&id=` + value.id + `" target="_blank" >` + value.name + `</a></div><span class="float-right d-inline-block ml-1 font-12">` + formatFileSize(value.size) + `</span></div>`;
+                            });
+                            title += '<div class="text-left tooltip-attachments font-13">' + docs + '</div>';
+                        }
+                        if (info.event.extendedProps['ctime']) {
+                            title += '<div class="text-left font-13"><span class="font-weight-500">Kalender: </span>' + info.event.extendedProps['calendar_name'] + '</div>';
+                            title += '<div class="text-left font-13"><span class="font-weight-500">erstellt am </span>' + info.event.extendedProps['ctime'] + '</div>';
+                            title += '<div class="text-left font-13"><span class="font-weight-500">erstellt von </span>' + info.event.extendedProps['cname'] + '</div>';
+                            title += '<div class="text-left font-13"><span class="font-weight-500">geändert am </span> ' + info.event.extendedProps['mtime'] + '</div>';
+                            title += '<div class="text-left font-13"><span class="font-weight-500">geändert von </span> ' + info.event.extendedProps['mname'] + '</div>';
+                        }
+                        // console.log(info);
+                        if ($('.fc-button-active').hasClass('fc-timeGridWeek-button') || $('.fc-button-active').hasClass('fc-timeGridDay-button')) {
+                            if (info.event.extendedProps['attachment']) {
+                                info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "<div class=\"fc-event-attachment\"><i class=\"fa-light fa-paperclip-vertical\"></i></div>");
+                            }
+                            if (info.event.extendedProps['event_type'] == '2') {
 
-                eventWillUnmount: function (info) {
-                    for (var tooltip of info.event.extendedProps['tooltips']) {
-                        tooltip.dispose();
-                    }
-                },
-                eventResize: function (info) {
+                                info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "<div class=\"fc-event-type\"><i class=\"fa-light fa-user-helmet-safety\"></i></div>");
+                            }
+                        }
 
-                    var start = info.event.start.getTime();
-                    const offsetstart = getOffset(start);
-                    start = (start / 1000 + offsetstart) * 1000;
-                    var end = info.event.end.getTime();
-                    const offsetend = getOffset(end);
-                    end = (end / 1000 + offsetend) * 1000;
-                    var id = info.event.id;
-                    $.post(requestUpdateUrl, {
-                        start: start,
-                        end: end,
-                        id: id
-                    }, function (data) {
-
-                    }).done(function (data) {
                         var tooltip = new Tooltip(info.el, {
-                            title: info.event.extendedProps.description,
+                            title: title,
                             placement: 'right',
+                            delay: {hide: 50},
                             trigger: 'hover',
-                            container: 'body'
+                            container: 'body',
+                            html: true,
                         });
 
                         var tooltips = info.event.extendedProps['tooltips'] || [];
                         tooltips.push(tooltip);
                         info.event.setExtendedProp('tooltips', tooltips);
-                    });
+                    },
 
-                },
-                eventDrop: function (info) {
-                    // sleep(2000).then(() => {
-                    var start = info.event.start.getTime();
-                    const offsetstart = getOffset(start);
-                    start = (start / 1000 + offsetstart) * 1000;
-                    var end = info.event.end.getTime();
-                    const offsetend = getOffset(end);
-                    end = (end / 1000 + offsetend) * 1000;
-                    var id = info.event.id;
-                    $.post(requestUpdateUrl, {
-                        start: start,
-                        end: end,
-                        id: id
-                    }, function (data) {
-
-                    }).done(function (data) {
-                    });
-                    // });
-                },
-                eventClassNames: function (info) {
-
-                    let result = '';
-
-                    if (typeof info.event.extendedProps.calendar_id === 'undefined') {
-                        return '';
-                    }
-                    let checkbox = $(".form-check-input");
-                    checkbox.each(function () {
-                        if ($(this).prop('checked')) {
-                            if (Number(info.event.extendedProps.calendar_id.calendar_id) === $(this).data('calendar_id')) {
-
-                            }
-                        } else {
-                            if (Number(info.event.extendedProps.calendar_id.calendar_id) === $(this).data('calendar_id')) {
-                                result = "";
-                            }
+                    eventWillUnmount: function (info) {
+                        for (var tooltip of info.event.extendedProps['tooltips']) {
+                            tooltip.dispose();
+                        }
+                    },
+                    eventResize: function (info) {
+
+                        var start = info.event.start.getTime();
+                        const offsetstart = getOffset(start);
+                        start = (start / 1000 + offsetstart) * 1000;
+                        var end = info.event.end.getTime();
+                        const offsetend = getOffset(end);
+                        end = (end / 1000 + offsetend) * 1000;
+                        var id = info.event.id;
+                        $.post(requestUpdateUrl, {
+                            start: start,
+                            end: end,
+                            id: id
+                        }, function (data) {
+
+                        }).done(function (data) {
+                            var tooltip = new Tooltip(info.el, {
+                                title: info.event.extendedProps.description,
+                                placement: 'right',
+                                trigger: 'hover',
+                                container: 'body'
+                            });
+
+                            var tooltips = info.event.extendedProps['tooltips'] || [];
+                            tooltips.push(tooltip);
+                            info.event.setExtendedProp('tooltips', tooltips);
+                        });
+
+                    },
+                    eventDrop: function (info) {
+                        // sleep(2000).then(() => {
+                        var start = info.event.start.getTime();
+                        const offsetstart = getOffset(start);
+                        start = (start / 1000 + offsetstart) * 1000;
+                        var end = info.event.end.getTime();
+                        const offsetend = getOffset(end);
+                        end = (end / 1000 + offsetend) * 1000;
+                        var id = info.event.id;
+                        $.post(requestUpdateUrl, {
+                            start: start,
+                            end: end,
+                            id: id
+                        }, function (data) {
+
+                        }).done(function (data) {
+                        });
+                        // });
+                    },
+                    eventClassNames: function (info) {
+
+                        let result = '';
+
+                        if (typeof info.event.extendedProps.calendar_id === 'undefined') {
+                            return '';
+                        }
+                        let checkbox = $(".form-check-input");
+                        checkbox.each(function () {
+                            if ($(this).prop('checked')) {
+                                if (Number(info.event.extendedProps.calendar_id.calendar_id) === $(this).data('calendar_id')) {
+
+                                }
+                            } else {
+                                if (Number(info.event.extendedProps.calendar_id.calendar_id) === $(this).data('calendar_id')) {
+                                    result = "";
+                                }
+                            }
+                        });
+                        if (info.event.extendedProps.busy == '0') {
+                            result += ' event-free';
+                        } else if (info.event.extendedProps.busy == '1') {
+                            result += ' event-busy';
+                        } else if (info.event.extendedProps.busy == '2') {
+                            result += ' event-tentative';
                         }
-                    });
-                    if (info.event.extendedProps.busy == '0') {
-                        result += ' event-free';
-                    } else if (info.event.extendedProps.busy == '1') {
-                        result += ' event-busy';
-                    } else if (info.event.extendedProps.busy == '2') {
-                        result += ' event-tentative';
-                    }
 
 
-                    return result;
-                },
-                datesSet: function (dateInfo) {
-                    $('.event-search-result').removeClass('event-search-result');
-                    $('#jumpevent').val(null).trigger('change');
-                    ;
-                    // $('#jumpevent').change();
-                },
-                editable: true,
-                droppable: true, // this allows things to be dropped onto the calendar
-                fixedWeekCount: true,
-                // height: 300,
-                initialView: 'timeGridWeek',
-                timeZone: 'UTC',
-                hiddenDays: [],
-                navLinks: 'true',
-                events: [],
-                height: 800,
-                eventSources: eventSources,
-                resourceOrder: 'order',
-                resources: resources,
-            });
-            calendar.render();
+                        return result;
+                    },
+                    datesSet: function (dateInfo) {
+                        $('.event-search-result').removeClass('event-search-result');
+                        $('#jumpevent').val(null).trigger('change');
+                        ;
+                        // $('#jumpevent').change();
+                    },
+                    editable: true,
+                    droppable: true, // this allows things to be dropped onto the calendar
+                    fixedWeekCount: true,
+                    // height: 300,
+                    initialView: 'timeGridWeek',
+                    timeZone: 'UTC',
+                    hiddenDays: [],
+                    navLinks: 'true',
+                    events: [],
+                    height: 800,
+                    eventSources: eventSources,
+                    resourceOrder: 'order',
+                    resources: resources,
+                });
+                calendar.render();
 
-        } else {
-            $('#calendar').closest('.row').html('<div class="col-12"><h3 class="alert alert-danger text-center">' + json.errormessage + '</h3></div>');
+            } else {
+                $('#calendar').closest('.row').html('<div class="col-12"><h3 class="alert alert-danger text-center">' + json.errormessage + '</h3></div>');
+            }
         }
-    });
+    )
+    ;
 });
 
 
@@ -865,6 +895,7 @@ $(document).ready(function () {
         $('.event-organizer-div').hide();
         $('#calendar-attendees').val('').trigger('change');
         $('.customer-div').hide();
+        $('.calendar-users-all').hide();
         $('#EventModalLabel span').text('Termin erstellen');
         $('#EventModalLabel .fa-calendar-symbol').addClass('fa-calendar-circle-plus');
         $('#EventModalLabel .fa-calendar-symbol').removeClass('fa-calendar-lines-pen');
@@ -1497,7 +1528,18 @@ Xinon GMbH`;
         $(".color-input").eq(0).trigger("change", 1);
         checkGroupCheckboxes();
     });
+    $("body").on("click", ".calendar-users-all", function () {
+        const resources = calendar.getResources();
+        let users = [];
+        $.each(resources, function (index, value) {
 
+            if (value.id < 900 && $('#calendar-users').val() != value.id) {
+                users.push(value.id);
+            }
+        });
+        $('#calendar-attendees').val(users).trigger('change');
+
+    });
     $("body").on("click", ".dropdown-group", function () {
         if ($(this).hasClass('fa-square-arrow-up')) {
             $(this).removeClass('fa-square-arrow-up');