Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Kalender Update

See merge request fronk/thetool!1687
This commit is contained in:
Daniel Spitzer
2025-08-28 08:37:24 +00:00
parent 7d047c345e 8cd33dc97c
commit 18a2bd632b
2 changed files with 105 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/pages/Calendar/View.js
+62 -34
View File
@@ -322,6 +322,7 @@ document.addEventListener('DOMContentLoaded', function () {
if (info.resource) {
resourceId = info.resource.id;
}
let allDay = info.allDay;
let cestDate = new Date(info.startStr);
let cestOffset = 0; // 2 Stunden in Minuten
let utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
@@ -336,22 +337,35 @@ document.addEventListener('DOMContentLoaded', function () {
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;
let EndformattedDate;
let EndformattedTime;
if (!allDay) {
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');
EndformattedDate = year + "-" + month + "-" + day;
EndformattedTime = hours + ":" + minutes;
} else {
cestDate = new Date(info.endStr);
cestOffset = 120; // 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');
EndformattedDate = year + "-" + month + "-" + day;
EndformattedTime = '23' + ":" + '59';
}
$('#EventModal').modal('show');
if (resourceId) {
@@ -362,6 +376,15 @@ document.addEventListener('DOMContentLoaded', function () {
$('#start-time').val(StarteformattedTime);
$('#end-date').val(EndformattedDate);
$('#end-time').val(EndformattedTime);
if (allDay) {
$('#allday').prop('checked', true);
$('#allday').change();
$('#end-time').val('');
$('#end-date').val(EndformattedDate);
$('#start-time').val('');
}
}, eventClick: function (info, element) {
let isOrganizer;
@@ -674,25 +697,33 @@ document.addEventListener('DOMContentLoaded', function () {
let StartformattedDate = year + "-" + month + "-" + day;
let StarteformattedTime = hours + ":" + minutes;
let EndformattedDate;
let EndformattedTime;
if (info.event.endStr) {
cestDate = new Date(info.event.endStr);
cestOffset = 0;
cestDate = new Date(info.event.endStr);
cestOffset = 0; // 2 Stunden in Minuten
// 2 Stunden in Minuten
utcTime = cestDate.getTime() - cestOffset * 60 * 1000;
if (info.event.allDay) {
utcTime = utcTime - 60;
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');
EndformattedDate = year + "-" + month + "-" + day;
EndformattedTime = hours + ":" + minutes;
} else {
EndformattedDate = StartformattedDate;
EndformattedTime = StarteformattedTime;
}
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');
@@ -2806,7 +2837,6 @@ $(document).ready(function () {
}
});
$(document).ready(function () {
// Checkbox toggelt das RRule-Panel
$('#recurringCheck').on('change', function () {
if ($(this).is(':checked')) {
$('#recurring-settings').show();
@@ -2820,8 +2850,6 @@ $(document).ready(function () {
$('#rrule-frequency').on('change', function () {
var freq = $(this).val();
// Alles erstmal verstecken
$('#weekly-options').hide();
$('#monthly-options').hide();