Merge branch 'spidev' into 'master'

Kalender

See merge request fronk/thetool!1525

public/js/pages/Calendar/View.js

@@ -2,7 +2,6 @@ var hidesearch = [2, 3, 4, 8];
 var columnfilter = [7];
 var columnoptions = '<option value=""></option><option value="Offen">Offen</option><option value="Genehmigt">Genehmigt</option><option value="Abgelehnt">Abgelehnt</option>';
 
-
 const fileTypeClasses = {
     'image/png': 'fa-file-png',
     'image/jpeg': 'fa-file-jpg',
@@ -929,18 +928,14 @@ document.addEventListener('DOMContentLoaded', function () {
                         } 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
+                    droppable: true,
                     fixedWeekCount: true,
                     // height: 300,
                     initialView: 'timeGridWeek',
@@ -1100,40 +1095,6 @@ if (typeof (EventSource) !== 'undefined') {
                             cname: event.cname,
                             busy: event.busy
                         });
-                        // cevent.setProp('title', event.name);
-                        // console.log(event.start_time);
-                        // console.log(event.end_time);
-                        // console.log(event.name);
-                        // cevent.setDates(event.start_time, event.end_time);
-                        //
-                        // // Farben und Klassennamen
-                        // cevent.setProp('backgroundColor', event.bgColor);
-                        // cevent.setProp('textColor', event.txtColor);
-                        // cevent.setProp('classNames', [
-                        //     'cal-class-group-' + event.calendar_id,
-                        //     'cal-class-id-' + event.cal_events_id,
-                        //     cursorclass
-                        // ]);
-                        // cevent.setExtendedProp('description', event.description);
-                        // cevent.setExtendedProp('calendar_id', event.calendar_id_check);
-                        // cevent.setExtendedProp('location', event.location);
-                        // cevent.setExtendedProp('event_type', event.event_type);
-                        // cevent.setExtendedProp('attachment', event.attachment);
-                        // cevent.setExtendedProp('attachments', event.attachments);
-                        // cevent.setExtendedProp('privateflag', event.privateflag);
-                        // cevent.setExtendedProp('rruleflag', event.rruleflag);
-                        // cevent.setExtendedProp('rrule', event.rrule);
-                        // cevent.setExtendedProp('duration', event.duration);
-                        // cevent.setExtendedProp('resourceId', event.calendar_id);
-                        // cevent.setExtendedProp('calendar_name', event.calendar_name);
-                        // cevent.setExtendedProp('clickable', event.rights);
-                        // cevent.setExtendedProp('mtime', event.mtime);
-                        // cevent.setExtendedProp('mname', event.mname);
-                        // cevent.setExtendedProp('ctime', event.ctime);
-                        // cevent.setExtendedProp('cname', event.cname);
-                        // cevent.setExtendedProp('busy', event.busy);
-                        // cevent.setProp('editable', movable);
-
                     } else {
                         cevent.remove();
                         calendar.addEvent({
@@ -1392,9 +1353,7 @@ $(document).ready(function () {
             }
         });
 
-        if (!valid) {
-            return;
-        }
+
         let attachments = [];
         $('.doc-main-div').each(function (index, value) {
             if ($(this).data('docid')) {
@@ -1428,6 +1387,20 @@ $(document).ready(function () {
         if ($('#allday').is(':checked')) {
             allday = 1;
         }
+        if (allday != 1) {
+            const isostart = start.replace(' ', 'T');
+            const isoend = end.replace(' ', 'T');
+            const startdate = new Date(isostart);
+            const enddate = new Date(isoend);
+            if (startdate >= enddate) {
+                $('#end-time').addClass('required');
+                valid = false;
+            }
+
+        }
+        if (!valid) {
+            return;
+        }
         let delete_old_entry = '';
         if ($('#delete-old-entry').is(':checked')) {
             delete_old_entry = $('#delete-old-entry').val()
@@ -1594,9 +1567,7 @@ $(document).ready(function () {
             }
         });
 
-        if (!valid) {
-            return;
-        }
+
         let attachments = [];
         $('.doc-main-div').each(function (index, value) {
             if ($(this).data('docid')) {
@@ -1633,6 +1604,20 @@ $(document).ready(function () {
         if ($('#allday').is(':checked')) {
             allday = 1;
         }
+        if (allday != 1) {
+            const isostart = start.replace(' ', 'T');
+            const isoend = end.replace(' ', 'T');
+            const startdate = new Date(isostart);
+            const enddate = new Date(isoend);
+            if (startdate >= enddate) {
+                $('#end-time').addClass('required');
+                valid = false;
+            }
+
+        }
+        if (!valid) {
+            return;
+        }
 
         if ($('#customer-info-check').is(':checked')) {
             customer_info_check = 1;
@@ -2833,7 +2818,6 @@ $(document).ready(function () {
             }
         });
 
-        // Falls eine Frequenz gewählt wird, passende Felder (weekly/monthly) einblenden
         $('#rrule-frequency').on('change', function () {
             var freq = $(this).val();
 
@@ -2848,7 +2832,6 @@ $(document).ready(function () {
             }
         });
 
-        // Zeige/Verstecke im monatlichen Bereich "Tag des Monats" oder "X. Wochentag"
         $('#monthly-type').on('change', function () {
             var monthlyType = $(this).val();
             if (monthlyType === 'BYMONTHDAY') {
@@ -2859,10 +2842,6 @@ $(document).ready(function () {
                 $('#monthly-setpos-select').show();
             }
         });
-
-        // Du kannst bei Klick auf "Hinzufügen" oder "Speichern" dann aus den ausgewählten Werten
-        // dein RRule-String generieren (z.B. mit rrule.js oder manuell).
-
     });
 
 });