diff --git a/public/js/pages/Calendar/View.js b/public/js/pages/Calendar/View.js index 5a069bec0..9fa9c12a2 100644 --- a/public/js/pages/Calendar/View.js +++ b/public/js/pages/Calendar/View.js @@ -1,7 +1,7 @@ var hidesearch = [2, 3, 4, 8]; var columnfilter = [7]; var columnoptions = ''; -var localsorageEvent = null; +var localsorageEvent=null; const fileTypeClasses = { 'image/png': 'fa-file-png', 'image/jpeg': 'fa-file-jpg', @@ -1227,6 +1227,12 @@ if (typeof (EventSource) !== 'undefined') { console.error('Connection aborted'); } $(document).ready(function () { + let create_event = localStorage.getItem('Calendar_create'); + if (create_event) { + localsorageEvent = JSON.parse(create_event); + $('#EventModal').modal('show'); + } + let eventdialog = $('#EventModal').html(); @@ -1283,7 +1289,6 @@ $(document).ready(function () { // Sobald der Link-Dialog geschlossen wird, fügen wir die "modal-open"-Klasse wieder hinzu, falls noch ein Modal offen ist. $('#EventModal').on('hidden.bs.modal', function (event) { tinymce.activeEditor.setContent(''); - localStorage.removeItem('Calendar_create'); }); @@ -1348,25 +1353,11 @@ $(document).ready(function () { $('.show-attendee').hide(); $('#add-event').show(); $('#attachments').data('newkey', Math.floor(Math.random() * 10000)); - if (localsorageEvent) { - $('#type').val(localsorageEvent.type).trigger('change'); + if (localsorageEvent) + { + console.log('cool'); + console.log(localsorageEvent.location); $('#location').val(localsorageEvent.location); - $('#name').val(localsorageEvent.subject); - const datetime = localsorageEvent.cstart.split(' '); - $('#start-date').val(datetime[0]); - $('#start-time').val(datetime[1]); - const datetimeend = localsorageEvent.cend.split(' '); - $('#end-date').val(datetimeend[0]); - $('#end-time').val(datetimeend[1]); - if (localsorageEvent.customer_phone) - { - $('#customer-info-type').val('2').trigger('change'); - $('#customer-info-type-text').val(localsorageEvent.customer_phone); - } else if (localsorageEvent.customer_email) - { - $('#customer-info-type').val('1').trigger('change'); - } - } }); tinymce.init({ @@ -1391,11 +1382,7 @@ $(document).ready(function () { content_style: "body { font-family: 'Calibri', sans-serif; }", font_family_formats: "Calibri=Calibri, sans-serif;Arial=arial,sans-serif; Courier New=courier new,courier,monospace; Georgia=georgia,palatino,serif; Helvetica=helvetica,sans-serif; Lucida Sans=lucida sans unicode,sans-serif; Tahoma=tahoma,arial,helvetica,sans-serif; Times New Roman=times new roman,times,serif", setup: function (editor) { - editor.on('init', function () { - if (localsorageEvent) { - this.setContent(localsorageEvent.description || ''); - } - }); + } }); $('body').on('click', '#add-event', function () { @@ -1527,7 +1514,6 @@ $(document).ready(function () { }, function (data) { }).done(function (data) { - localStorage.removeItem('Calendar_create'); }); $('#EventModal').modal('hide'); }); @@ -2898,10 +2884,6 @@ $(document).ready(function () { } }); }); - let create_event = localStorage.getItem('Calendar_create'); - if (create_event) { - localsorageEvent = JSON.parse(create_event); - $('#EventModal').modal('show'); - } + });