diff --git a/Layout/default/Calendar/View.php b/Layout/default/Calendar/View.php
index e6bfae677..7a855e669 100644
--- a/Layout/default/Calendar/View.php
+++ b/Layout/default/Calendar/View.php
@@ -98,6 +98,10 @@ endforeach;
class="btn btn-light btn-light-search top-search-filter">
+
@@ -369,12 +373,13 @@ endforeach;
Typ
-
diff --git a/public/css/pages/Calendar/View.css b/public/css/pages/Calendar/View.css
index b1e20751c..1af4c7d8c 100644
--- a/public/css/pages/Calendar/View.css
+++ b/public/css/pages/Calendar/View.css
@@ -736,4 +736,24 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
}
.tox .tox-tbtn--select {
max-width: 95px;
+}
+.fa-calendar-call
+{
+ font-size: 13px;
+ vertical-align: top;
+ margin-top: 0px;
+}
+
+.fa-calendar-call:after {
+ color: #ff0000;
+ opacity: 1;
+}
+.fa-calendar-call:before {
+ content: "\f2a0";
+ color: #000000;
+ opacity: 1;
+}
+.fa-calendar-call-search {
+ font-size: 21px;
+ margin-top: 0px;
}
\ No newline at end of file
diff --git a/public/js/pages/Calendar/View.js b/public/js/pages/Calendar/View.js
index bd78233bc..f943cbed1 100644
--- a/public/js/pages/Calendar/View.js
+++ b/public/js/pages/Calendar/View.js
@@ -26,8 +26,6 @@ const fileTypeClasses = {
'application/vnd.ms-project': 'fa-file-project',
'application/vnd.ms-visio': 'fa-file-visio',
'application/vnd.ms-publisher': 'fa-file-publisher',
-
- // Weitere Typen und Klassen hinzufügen...
};
let calendar;
let calendarEl = document.getElementById('calendar');
@@ -92,18 +90,15 @@ document.addEventListener('DOMContentLoaded', function () {
$.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) {
if (!value.timerecording.timerecording) {
allDAy = false;
@@ -403,7 +398,7 @@ document.addEventListener('DOMContentLoaded', function () {
if (data.data.type.type == "1") {
$('.customer-div').hide();
$('.ticket-div').hide();
- } else if (data.data.type.type == "2" || data.data.type.type == "3" || data.data.type.type == "4") {
+ } else if (data.data.type.type == "2" || data.data.type.type == "3" || data.data.type.type == "4" || data.data.type.type == "6") {
$('.ticket-div').hide();
$('.customer-div').show();
if (data.data.customer.customer) {
@@ -701,6 +696,11 @@ document.addEventListener('DOMContentLoaded', function () {
// info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "
");
info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "");
}
+ if (info.event.extendedProps['event_type'] == '6') {
+
+ // info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "
");
+ info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "
");
+ }
if (info.event.extendedProps['event_type'] == '5') {
// info.el.querySelector(".fc-event-title").insertAdjacentHTML("afterend", "
");
@@ -1738,6 +1738,34 @@ $(document).ready(function () {
};
},
+ processResults: function (data) {
+ // Transforms the top-level key of the response object from 'items' to 'results'
+ return {
+ results: data.items
+ };
+ }
+ }
+ });
+ } else if ($(this).val() == "6") {
+ $('.customer-div').show();
+ $('.ticket-div').hide();
+ $('#customer').select2({
+ placeholder: "Kunden Suche",
+ minimumInputLength: 3,
+ // dropdownParent: $('#EventModal'),
+ dropdownParent: jQuery('#relContainer2'),
+ language: "de",
+ ajax: {
+ url: requestAddressUrl,
+ dataType: 'json',
+ delay: 250,
+ data: function (params) {
+ return {
+ term: params.term,
+ xinon: 1,
+ };
+ },
+
processResults: function (data) {
// Transforms the top-level key of the response object from 'items' to 'results'
return {
@@ -2389,6 +2417,11 @@ $(document).ready(function () {
});
}
+// $('.select-2').select2({
+// containerCssClass : 'meine-custom-dropdown', // Klasse für das Dropdown-Menü
+// containerCss : "wrap",
+// selectionCssClass: 'meine-custom-selection'
+// });
$(document).on('focusin', function (e) {
if ($(e.target).closest(".tox-tinymce, .tox-tinymce-aux, .moxman-window, .tam-assetmanager-root").length) {
e.stopImmediatePropagation();