Merge branch 'spidev' into 'master'

Kalender

See merge request fronk/thetool!688
This commit is contained in:
Daniel Spitzer
2024-11-03 20:45:30 +00:00
2 changed files with 63 additions and 33 deletions
+35 -10
View File
@@ -251,7 +251,7 @@ document.addEventListener('DOMContentLoaded', function () {
$('#customer').select2({
placeholder: "Kunden Suche",
minimumInputLength: 3,
dropdownParent: $('#EventModal'),
// dropdownParent: $('#EventModal'),
language: "de",
ajax: {
url: requestAddressUrl,
@@ -308,8 +308,10 @@ document.addEventListener('DOMContentLoaded', function () {
}
if (isOrganizer == "1") {
$('.show-update').show();
$('.show-attendee').hide();
} else {
$('.show-update').hide();
$('.show-attendee').show();
}
});
@@ -366,8 +368,7 @@ document.addEventListener('DOMContentLoaded', function () {
$('#start-time').val(StarteformattedTime);
}
$('#calendar-users').val(info.event.extendedProps.calendar_id.calendar_id).trigger('change');
$('#calendar-users').prop("disabled", true);
$('#name').val(info.event.title);
$('#location').val(info.event.extendedProps.location);
$('#description').val(info.event.extendedProps.description);
@@ -378,6 +379,10 @@ document.addEventListener('DOMContentLoaded', function () {
$('#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) {
@@ -726,7 +731,7 @@ if (typeof (EventSource) !== 'undefined') {
console.error('Connection aborted');
}
$(document).ready(function () {
let eventdialog = $('#EventModal').html();
$('body').on('click', '.fa-window-maximize', function () {
$('.card').addClass('card-fullscreen');
$('#card-size').removeClass('fa-window-maximize').addClass('fa-window-restore');
@@ -756,7 +761,13 @@ $(document).ready(function () {
}
});
$('#EventModal').on('hide.bs.modal', function (event) {
// $('.select2-multiple').select2('destroy');
});
$('#EventModal').on('show.bs.modal', function (event) {
$('.attachment-div').empty();
$('#reminder').val('NULL');
$('#type').val('1');
@@ -774,6 +785,8 @@ $(document).ready(function () {
$('#EventModal .is-require').each(function (index, value) {
$(this).removeClass('required');
});
// $('.select2-multiple').select2();
$('#calendar-users').prop("disabled", false);
$("#calendar-users option").each(function () {
if ($(this).data('mainuser') == "1") {
@@ -786,6 +799,7 @@ $(document).ready(function () {
$('#start-time').addClass('is-require');
$('#end-time').addClass('is-require');
$('.show-update').hide();
$('.show-attendee').hide();
$('#add-event').show();
$('#attachments').data('newkey', Math.floor(Math.random() * 10000));
});
@@ -1175,7 +1189,7 @@ $(document).ready(function () {
$('#customer').select2({
placeholder: "Kunden Suche",
minimumInputLength: 3,
dropdownParent: $('#EventModal'),
// dropdownParent: $('#EventModal'),
language: "de",
ajax: {
url: requestAddressUrl,
@@ -1459,7 +1473,7 @@ Xinon GMbH`;
filter: '.no-movable',
delay: 0,
animation: 0,
onSort: function (evt) {
onEnd: function (evt) {
$('.calendar-check').eq(0).trigger('change');
},
});
@@ -1467,16 +1481,19 @@ Xinon GMbH`;
filter: '.no-movable',
handle: '.handle',
delay: 0,
onSort: function (evt) {
onEnd: function (evt) {
$('.calendar-check').eq(0).trigger('change');
},
});
if (firstcall) {
$('.color-input').trigger('change', 1);
}
$('.select2-multiple').select2({
dropdownParent: $('#EventModal')
});
$('.select2-multiple').select2(
{
}
);
$('.select2-multiple-tag').select2(
{
tags: true,
@@ -1484,6 +1501,14 @@ Xinon GMbH`;
}
);
// $(document).on("select2:opening", (e) => {
// $('.modal-body').css('overflow', 'visible');
// });
// $(document).on("select2:open", (e) => {
// $('.modal-body').css('overflow', 'auto');
// });
// $.fn.select2.defaults.set("dropdownParent", $('#EventModal'));
checkGroupCheckboxes();