diff --git a/Layout/default/Calendar/View.php b/Layout/default/Calendar/View.php
index 7a855e669..b8705c7ae 100644
--- a/Layout/default/Calendar/View.php
+++ b/Layout/default/Calendar/View.php
@@ -37,6 +37,7 @@ endforeach;
 
     <script type="text/javascript"
             src="<?= self::getResourcePath() ?>assets/js/calendar/rrule/rrule.min.js?<?= $git_merge_ts ?>"></script>
+
     <script type="text/javascript"
             src="<?= self::getResourcePath() ?>assets/js/calendar/moment/moment.min.js?<?= $git_merge_ts ?>"></script>
     <script type="text/javascript"
@@ -57,6 +58,7 @@ endforeach;
             src="<?= self::getResourcePath() ?>assets/js/calendar/eventsource.min.js?<?= $git_merge_ts ?>"></script>
     <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= $git_merge_ts ?>" rel="stylesheet"
           type="text/css"/>
+
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -102,6 +104,7 @@ endforeach;
                                     class="btn btn-light btn-light-search top-search-filter"><i
                                         class="fa-duotone fa-solid fa-phone-volume fa-calendar-call fa-calendar-call-search"></i>
                             </button>
+
                         </div>
                     </div>
                     <?php if (!$rights) : ?>
@@ -109,7 +112,14 @@ endforeach;
                             <span class="font-18 font-weight-500">Du wurdest nicht für den Kalender frei geschalten.</span>
                         </div>
                         <?php die(); endif; ?>
+                    <div class="d-inline-block mr-1">
 
+                            <button title="Excel Export"
+                                    class="btn btn-light btn-xls-calendar">
+                                <i class="fa-duotone fa-solid fa-file-xls fa-xls-calendar"></i>
+
+                    </div>
+                    </button>
                     <div class="d-inline-block w-50 search-div" style="margin-top: -7px;">
                         <select id="jumpevent" class="jumpevent"></select>
                     </div>
@@ -349,129 +359,219 @@ endforeach;
 
         </div>
     </div>
-<div class="modal fade" id="EventModal" aria-labelledby="EventModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h1 class="modal-title font-18 ml-2" id="EventModalLabel"><i
-                            class="fa-duotone fa-solid fa-calendar-symbol"></i> <span>neuer Termin</span></h1>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row justify-content-center">
-
-                    <div class="col-1">
-                        <label for="name" class="col-form-label fw-medium ">Betreff</label>
-                    </div>
-                    <div class="col-6">
-                        <div class="mb-2">
-                            <input type="text" class="form-control is-require eventmodal-input" id="name">
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div class="input-group mb-2">
-                            <span title="Erinnerung" class="input-group-text spanwidht">Typ</span>
-                            <select class="form-control form-select select-2" aria-label="Default select" id="type">
-                                <option value="1">Termin</option>
-                                <option value="2">IBN Xinon</option>
-                                <option value="3">IBN ESTMK</option>
-                                <option value="4">IBN SNOPP</option>
-                                <option value="5">Störung</option>
-                                <option value="6">Support Gespräch</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-1 text-center">
-                        <i title="Normal" class="fa-duotone privacy-click fa-regular fa-unlock mt-1"></i>
-                    </div>
-
+    <div class="modal fade" id="EventModal" aria-labelledby="EventModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg modal-dialog-centered">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h1 class="modal-title font-18 ml-2" id="EventModalLabel"><i
+                                class="fa-duotone fa-solid fa-calendar-symbol"></i> <span>neuer Termin</span></h1>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
                 </div>
-                <div class="row justify-content-center">
-                    <div class="col-1">
-                        <label for="location" class="col-form-label fw-medium ">Ort</label>
-                    </div>
-                    <div class="col-6">
-                        <div class="mb-2">
-                            <input type="text" class="form-control eventmodal-input" id="location">
+                <div class="modal-body">
+                    <div class="row justify-content-center">
+
+                        <div class="col-1">
+                            <label for="name" class="col-form-label fw-medium ">Betreff</label>
                         </div>
+                        <div class="col-6">
+                            <div class="mb-2">
+                                <input type="text" class="form-control is-require eventmodal-input" id="name">
+                            </div>
+                        </div>
+                        <div class="col-3">
+                            <div class="input-group mb-2">
+                                <span title="Erinnerung" class="input-group-text spanwidht">Typ</span>
+                                <select class="form-control form-select select-2" aria-label="Default select" id="type">
+                                    <option value="1">Termin</option>
+                                    <option value="2">IBN Xinon</option>
+                                    <option value="3">IBN ESTMK</option>
+                                    <option value="4">IBN SNOPP</option>
+                                    <option value="5">Störung</option>
+                                    <option value="6">Support Gespräch</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-1 text-center">
+                            <i title="Normal" class="fa-duotone privacy-click fa-regular fa-unlock mt-1"></i>
+                        </div>
+
                     </div>
-                    <div class="col-4">
-                        <div class="input-group mb-2">
+                    <div class="row justify-content-center">
+                        <div class="col-1">
+                            <label for="location" class="col-form-label fw-medium ">Ort</label>
+                        </div>
+                        <div class="col-6">
+                            <div class="mb-2">
+                                <input type="text" class="form-control eventmodal-input" id="location">
+                            </div>
+                        </div>
+                        <div class="col-4">
+                            <div class="input-group mb-2">
                             <span title="Erinnerung" class="input-group-text spanwidht"><i
                                         class="fa-regular fa-eye"></i></span>
-                            <select class="form-control form-select" aria-label="Default select" id="busy">
-                                <option value="1">gebucht</option>
-                                <option value="0">frei</option>
-                                <option value="2">mit Vorbehalt</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row justify-content-center">
-
-                    <div class="col-4">
-                        <div class="input-group mb-2">
-                            <span class="input-group-text spanwidht">Start</span>
-                            <input id="start-date" type="date" class="form-control is-require eventmodal-input"
-                                   placeholder="Datum"
-                                   aria-label="Datum"
-                                   aria-describedby="Datum">
-                        </div>
-                    </div>
-                    <div class="col-2">
-                        <input id="start-time" type="time" class="form-control is-require eventmodal-input"
-                               placeholder="Uhrzeit"
-                               aria-label="Uhrzeit"
-                               aria-describedby="Uhrzeit">
-                    </div>
-                    <div class="col-3 text-center">
-                        <div class="form-check" style="margin-top: 7px;">
-
-                            <input class="form-check-input eventmodal-checkbox" type="checkbox" value=""
-                                   id="allday"> <label class="form-check-label fw-medium checkbox-label" for="allday">
-                                Ganztägig
-                            </label>
-
+                                <select class="form-control form-select" aria-label="Default select" id="busy">
+                                    <option value="1">gebucht</option>
+                                    <option value="0">frei</option>
+                                    <option value="2">mit Vorbehalt</option>
+                                </select>
+                            </div>
                         </div>
                     </div>
 
-                </div>
-                <div class="row  justify-content-center">
+                    <div class="row justify-content-center">
 
-                    <div class="col-4">
-                        <div class="input-group mb-2">
-                            <span class="input-group-text spanwidht">Ende</span>
-                            <input id="end-date" type="date" class="form-control is-require eventmodal-input"
-                                   placeholder="Datum"
-                                   aria-label="Datum"
-                                   aria-describedby="Datum">
+                        <div class="col-4">
+                            <div class="input-group mb-2">
+                                <span class="input-group-text spanwidht">Start</span>
+                                <input id="start-date" type="date" class="form-control is-require eventmodal-input"
+                                       placeholder="Datum"
+                                       aria-label="Datum"
+                                       aria-describedby="Datum">
+                            </div>
+                        </div>
+                        <div class="col-2">
+                            <input id="start-time" type="time" class="form-control is-require eventmodal-input"
+                                   placeholder="Uhrzeit"
+                                   aria-label="Uhrzeit"
+                                   aria-describedby="Uhrzeit">
+                        </div>
+                        <div class="col-2 text-center">
+                            <div class="form-check" style="margin-top: 7px;">
+
+                                <input class="form-check-input eventmodal-checkbox" type="checkbox" value=""
+                                       id="allday"> <label class="form-check-label fw-medium checkbox-label"
+                                                           for="allday">
+                                    Ganztägig
+                                </label>
+
+                            </div>
+                        </div>
+                        <div class="col-2 text-right">
+                            <div class="form-check" style="margin-top: 7px;">
+                                <input class="form-check-input eventmodal-checkbox" type="checkbox" value=""
+                                       id="recurringCheck">
+                                <label class="form-check-label fw-medium checkbox-label" for="recurringCheck">
+                                    Serientermin
+                                </label>
+                            </div>
                         </div>
                     </div>
-                    <div class="col-2">
-                        <input id="end-time" type="time" class="form-control is-require eventmodal-input"
-                               placeholder="Uhrzeit"
-                               aria-label="Uhrzeit"
-                               aria-describedby="Uhrzeit">
-                    </div>
-                    <div class="col-3">
-                        <div class="input-group mb-2">
+                    <div class="row  justify-content-center">
+
+                        <div class="col-4">
+                            <div class="input-group mb-2">
+                                <span class="input-group-text spanwidht">Ende</span>
+                                <input id="end-date" type="date" class="form-control is-require eventmodal-input"
+                                       placeholder="Datum"
+                                       aria-label="Datum"
+                                       aria-describedby="Datum">
+                            </div>
+                        </div>
+                        <div class="col-2">
+                            <input id="end-time" type="time" class="form-control is-require eventmodal-input"
+                                   placeholder="Uhrzeit"
+                                   aria-label="Uhrzeit"
+                                   aria-describedby="Uhrzeit">
+                        </div>
+                        <div class="col-4">
+                            <div class="input-group mb-2">
                             <span title="Erinnerung" class="input-group-text spanwidht"><i
                                         class="fa-regular fa-bell"></i></span>
-                            <select class="form-control form-select select2" aria-label="Default select" id="reminder">
-                                <option value="NULL">Keine</option>
-                                <option value="0">Zum Termin</option>
-                                <option value="300">5 Minuten</option>
-                                <option value="600">10 Minuten</option>
-                                <option value="900">15 Minuten</option>
-                                <option value="1800">30 Minuten</option>
-                                <option value="3600">1 Stunde</option>
-                                <option value="86400">1 Tag</option>
-                                <option value="604800">1 Woche</option>
+                                <select class="form-control form-select select2" aria-label="Default select"
+                                        id="reminder">
+                                    <option value="NULL">Keine</option>
+                                    <option value="0">Zum Termin</option>
+                                    <option value="300">5 Minuten</option>
+                                    <option value="600">10 Minuten</option>
+                                    <option value="900">15 Minuten</option>
+                                    <option value="1800">30 Minuten</option>
+                                    <option value="3600">1 Stunde</option>
+                                    <option value="86400">1 Tag</option>
+                                    <option value="604800">1 Woche</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- Serientermin-Checkbox und zugehörige RRule-Optionen -->
+                    <div class="row" id="recurring-settings" style="display:none;">
+                        <div class="col-1"></div>
+                        <div class="col-3"
+                        ">
+                        <!-- Frequenz: Täglich / Wöchentlich / Monatlich / Jährlich -->
+                        <div class="mb-2">
+                            <label for="rrule-frequency" class="col-form-label fw-medium">Wiederholungstyp</label>
+                            <select class="form-control" id="rrule-frequency">
+                                <option value="">Bitte wählen</option>
+                                <option value="DAILY">Täglich</option>
+                                <option value="WEEKLY">Wöchentlich</option>
+                                <option value="MONTHLY">Monatlich</option>
+                                <option value="YEARLY">Jährlich</option>
                             </select>
                         </div>
+                        <div class="mb-2">
+                            <label for="rrule-count" class="col-form-label fw-medium">Wiederhol. (optional)</label>
+                            <input type="number" min="1" class="form-control" id="rrule-count" placeholder="z.B. 10">
+                        </div>
+
+                        <!-- Enddatum der Serie (optional) -->
+                        <div class="mb-2">
+                            <label for="rrule-until" class="col-form-label fw-medium">Ende (optional)</label>
+                            <input type="date" class="form-control" id="rrule-until">
+                        </div>
+                    </div>
+                    <!-- Wöchentliche Optionen (z.B. jeden Dienstag, jeden Freitag + Montag) -->
+                    <div class="col-7">
+                        <div class="mb-2" id="weekly-options" style="display:none;">
+                            <label for="rrule-byweekday" class="col-form-label fw-medium">Wochentag(e)</label>
+                            <select class="form-control" id="rrule-byweekday" multiple>
+                                <option value="MO">Montag</option>
+                                <option value="TU">Dienstag</option>
+                                <option value="WE">Mittwoch</option>
+                                <option value="TH">Donnerstag</option>
+                                <option value="FR">Freitag</option>
+                                <option value="SA">Samstag</option>
+                                <option value="SU">Sonntag</option>
+                            </select>
+                        </div>
+
+                        <div class="mb-2" id="monthly-options" style="display:none;">
+                            <label class="col-form-label fw-medium">Monatliches Muster</label>
+                            <select class="form-control" id="monthly-type">
+                                <option value="BYMONTHDAY">Jeden X. Tag des Monats</option>
+                                <option value="BYSETPOS">Jeden X. [Wochentag] im Monat</option>
+                            </select>
+                            <div class=" mt-2 row" id="monthly-day-select">
+                                <label class="mr-2 col-form-label fw-medium col-2">Tag:</label>
+                                <select class="form-control w-auto col-3" id="rrule-bymonthday">
+                                    <!-- Auswahl 1–31 -->
+                                    <?php for ($i = 1; $i <= 31; $i++): ?>
+                                        <option value="<?= $i ?>"><?= $i ?></option>
+                                    <?php endfor; ?>
+                                </select>
+                            </div>
+                            <div class="mt-2 row" id="monthly-setpos-select" style="display:none;">
+                                <label class="mr-2 col-2 col-form-label fw-medium">Position:</label>
+                                <select class="form-control col-3 w-auto" id="rrule-setpos">
+                                    <option value="1">Erster</option>
+                                    <option value="2">Zweiter</option>
+                                    <option value="3">Dritter</option>
+                                    <option value="4">Vierter</option>
+                                    <option value="-1">Letzter</option>
+                                </select>
+                                <label class="mr-2 col-2 ml-3 col-form-label fw-medium text-center">Tag:</label>
+                                <select class="form-control col-3 w-auto" id="rrule-bynweekday">
+                                    <option value="MO">Montag</option>
+                                    <option value="TU">Dienstag</option>
+                                    <option value="WE">Mittwoch</option>
+                                    <option value="TH">Donnerstag</option>
+                                    <option value="FR">Freitag</option>
+                                    <option value="SA">Samstag</option>
+                                    <option value="SU">Sonntag</option>
+                                </select>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -570,6 +670,7 @@ endforeach;
                                 </div>
                                 <div class="d-inline-block" id="customer-info-check-info"></div>
                             </div>
+
                             <div id="relContainer2" style="position:relative">
                                 <select id="customer" class="jumpevent"></select>
                             </div>
@@ -651,13 +752,16 @@ endforeach;
     </div>
 
     <div id="output"></div>
-    <script type="text/javascript" src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js?<?= $git_merge_ts ?>"></script>
-    <script type="text/javascript" src="<?=self::getResourcePath()?>plugins/tinymce/tinymce.min.js?<?= $git_merge_ts ?>"></script>
+    <script type="text/javascript"
+            src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js?<?= $git_merge_ts ?>"></script>
+    <script type="text/javascript"
+            src="<?= self::getResourcePath() ?>plugins/tinymce/tinymce.min.js?<?= $git_merge_ts ?>"></script>
 
     <script>
         let requestUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEvents']) ?>";
         let requestEventUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEvent']) ?>";
         let requestEventSearchURL = "<?= self::getUrl("Calendar", "api", ['do' => 'searchCalendarEvents']) ?>";
+        let requestgenerateEventsxlsx = "<?= self::getUrl("Calendar", "api", ['do' => 'generateCalendarEventsXlsx']) ?>";
         let requestEventAttachmentUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEventAttachment']) ?>";
         let requestEventAttachmentTmpUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEventAttachmentTmp']) ?>";
         let requestEventAttachmentTmpDeleteUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'deleteCalendarEventAttachmentTmp']) ?>";
@@ -728,7 +832,6 @@ endforeach;
         endforeach; ?>
 
     </script>
-
     <script type="text/javascript"
             src="<?= self::getResourcePath() ?>js/pages/Calendar/View.js?<?= $git_merge_ts ?>"></script>
 
diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php
index b72257ace..cfb86fc28 100644
--- a/Layout/default/ConstructionConsent/Index.php
+++ b/Layout/default/ConstructionConsent/Index.php
@@ -184,7 +184,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
                             'key' => 'inspection_planner',
                             'header' => 'Begehung Planer durchgeführt',
                             'icon' => 'fas fa-clipboard-check',
-                            'denominator' => $stats['building'] + $stats['street'],
+                            'denominator' => $stats['building'],
                             'color' => '#28a745'
                         ],
                         [
@@ -198,7 +198,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
                             'key' => 'conduit_installed_ftu',
                             'header' => 'Leerrohr bis HAK',
                             'icon' => 'fas fa-road',
-                            'denominator' => $stats['street'],
+                            'denominator' => $stats['building'],
                             'color' => '#f5b902'
                         ],
                         [
diff --git a/Layout/default/TimerecordingBilling/Detail.php b/Layout/default/TimerecordingBilling/Detail.php
index 0ba37dd81..2aca0e0d8 100644
--- a/Layout/default/TimerecordingBilling/Detail.php
+++ b/Layout/default/TimerecordingBilling/Detail.php
@@ -142,6 +142,12 @@
             $('body').on('click', '#bmd-export-nlz', function () {
                 window.open('<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'generatebmdexportnlz']) ?>&month=' + $('#month').data('month'), '_blank');
             });
+            $('body').on('click', '#open-workdays', function () {
+                window.open('<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'generateopenworkdays']) ?>&month=' + $('#month').data('month'), '_blank');
+            });
+
+
+
             $('body').on('click', '#month-complete', function () {
                 if (confirm('Monat ' + $('#month').data('month') + ' wirklich abschließen?')) {
                     $('#datatable_wrapper').hide();
diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index 5ff85d788..d0f56a41e 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -92,7 +92,7 @@
           </li>
           <?php endif; ?>
 
-            <?php if($me->is(["Admin", "netowner", "salespartner"]) && ($me->is("employee") || $me->can(["Fibu", "Billing", "Preorderpricing", "Preorderbilling"]) || $me->address_id == 2187)): ?>
+            <?php if($me->is(["Admin", "netowner", "salespartner"]) && ($me->is("employee") || $me->can(["Fibu", "Billing", "Preorderpricing", "Preorderbilling"])) || in_array($me->address_id, [1,209,5908,2187])): ?>
                 <li class="has-submenu mobile-hide">
                     <a href="#">
                         <i class="fas fa-fw fa-money-from-bracket"></i> Backoffice <div class="arrow-down"></div>
diff --git a/application/ADBHausnummer/ADBHausnummer.php b/application/ADBHausnummer/ADBHausnummer.php
index e0e9f4ce5..df17b46b0 100644
--- a/application/ADBHausnummer/ADBHausnummer.php
+++ b/application/ADBHausnummer/ADBHausnummer.php
@@ -75,13 +75,13 @@ class ADBHausnummer extends mfBaseModel {
   }
 
   public function getBuildingType() {
-      $rimo_type = strtolower($this->rimo_type);
+      $rimo_type = $this->rimo_type === NULL ? '' : strtolower($this->rimo_type);
 
       if(array_key_exists($this->rimo_type, TT_ADB_GDA_TYPES)) {
           return TT_ADB_GDA_TYPES[$this->rimo_type];
       }
 
-      $gdaeigenschaft = strtolower($this->gdaeigenschaft);
+      $gdaeigenschaft = $this->gdaeigenschaft === NULL ? '' : strtolower($this->gdaeigenschaft);
       if(array_key_exists($gdaeigenschaft, TT_ADB_GDA_TYPES)) {
           return TT_ADB_GDA_TYPES[$gdaeigenschaft];
       }
diff --git a/application/Calendar/CalendarController.php b/application/Calendar/CalendarController.php
index cade4b5d5..8ea34fd6d 100644
--- a/application/Calendar/CalendarController.php
+++ b/application/Calendar/CalendarController.php
@@ -1,5 +1,12 @@
 <?php
 
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Helper\Html;
+
 class CalendarController extends mfBaseController
 {
 
@@ -45,6 +52,11 @@ class CalendarController extends mfBaseController
                 $calendarEvents = CalendarModel::searchCalendarEvents($r);
                 return $calendarEvents;
                 die();
+            case "generateCalendarEventsXlsx" :
+                $r = $this->request;
+                $this->generateXlsx($r);
+                return $calendarEvents;
+                die();
             case "getCalendarEventAttachment" :
                 $r = $this->request;
                 $id = ($r->id);
@@ -109,7 +121,10 @@ class CalendarController extends mfBaseController
                 die();
             case "insertCalendarEvent":
                 $r = $this->request;
-                $calendarEvents = CalendarModel::insertCalendarEvent($r, $this->me);
+                if ($r->rruleData) {
+                    $rrules = json_encode($this->generateGraphRecurrence($r->rruleData, $r->start));
+                }
+                $calendarEvents = CalendarModel::insertCalendarEvent($r, $this->me, $rrules);
                 if ($r->customer_info_check) {
                     if ($r->customer_info_type == 1) {
                         $body = $r->customer_info_text;
@@ -389,6 +404,186 @@ class CalendarController extends mfBaseController
         die();
     }
 
+    private function generateGraphRecurrence($data, $startDate)
+    {
+        $graph = [
+            'pattern' => [],
+            'range' => []
+        ];
+        $freq = strtoupper($data['rrule_frequency']);
+        switch ($freq) {
+            case 'DAILY':
+                $graph['pattern']['type'] = 'daily';
+                break;
+            case 'WEEKLY':
+                $graph['pattern']['type'] = 'weekly';
+                break;
+            case 'MONTHLY':
+                if (!empty($data['monthly_type']) && $data['monthly_type'] === 'BYMONTHDAY') {
+                    $graph['pattern']['type'] = 'absoluteMonthly';
+                    $graph['pattern']['dayOfMonth'] = intval($data['rrule_bymonthday']);
+                } elseif (!empty($data['monthly_type']) && $data['monthly_type'] === 'BYSETPOS') {
+                    $graph['pattern']['type'] = 'relativeMonthly';
+                    // Mapping: 1 => first, 2 => second, 3 => third, 4 => fourth, -1 => last
+                    $setpos = intval($data['rrule_setpos']);
+                    $indexMapping = [
+                        1 => 'first',
+                        2 => 'second',
+                        3 => 'third',
+                        4 => 'fourth',
+                        -1 => 'last'
+                    ];
+                    $graph['pattern']['index'] = isset($indexMapping[$setpos]) ? $indexMapping[$setpos] : 'first';
+                    if (!empty($data['rrule_bynweekday'])) {
+                        $graph['pattern']['daysOfWeek'] = [$this->convertDayToGraph(strtoupper($data['rrule_bynweekday']))];
+                    }
+                }
+                break;
+            case 'YEARLY':
+                $graph['pattern']['type'] = 'absoluteYearly';
+                break;
+            default:
+                $graph['pattern']['type'] = 'daily';
+        }
+
+        $graph['pattern']['interval'] = 1;
+
+        if ($freq === 'WEEKLY' && !empty($data['rrule-byweekday'])) {
+            $days = is_array($data['rrule-byweekday']) ? $data['rrule-byweekday'] : [$data['rrule-byweekday']];
+            $graphDays = [];
+            foreach ($days as $day) {
+                $graphDays[] = $this->convertDayToGraph(strtoupper($day));
+            }
+            $graph['pattern']['daysOfWeek'] = $graphDays;
+        }
+
+
+        $graph['range']['startDate'] = $startDate;
+        if (!empty($data['rrule_until'])) {
+            $graph['range']['endDate'] = $data['rrule_until'];
+            $graph['range']['type'] = 'endDate';
+        } elseif (!empty($data['rrule_count'])) {
+            $graph['range']['numberOfOccurrences'] = intval($data['rrule_count']);
+            $graph['range']['type'] = 'numbered';
+        } else {
+            $graph['range']['type'] = 'noEnd';
+        }
+        return $graph;
+    }
+
+
+    private function convertDayToGraph($dayAbbrev)
+    {
+        $mapping = [
+            'MO' => 'monday',
+            'TU' => 'tuesday',
+            'WE' => 'wednesday',
+            'TH' => 'thursday',
+            'FR' => 'friday',
+            'SA' => 'saturday',
+            'SU' => 'sunday'
+        ];
+        return isset($mapping[$dayAbbrev]) ? $mapping[$dayAbbrev] : $dayAbbrev;
+    }
+
+    private function generateXlsx($r)
+    {
+        $calendarEvents = json_decode(CalendarModel::getCalendarEvents($this->me->id, 0, $r, true), true);
+        $eventTypes = CalendarModel::$eventTypes;
+        $xls = new Spreadsheet();
+        $sheet = $xls->getActiveSheet();
+        $writer = new Xlsx($xls);
+        $sheet->getStyle('A1:AN1')->getFont()->setBold(true);
+        $sheet->getStyle('A:E')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+        $sheet->getStyle('I:L')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+        $sheet->getColumnDimension('A')->setWidth(25);
+        $sheet->getColumnDimension('B')->setWidth(15);
+        $sheet->getColumnDimension('C')->setWidth(10);
+        $sheet->getColumnDimension('D')->setWidth(15);
+        $sheet->getColumnDimension('E')->setWidth(10);
+        $sheet->getColumnDimension('F')->setWidth(40);
+        $sheet->getColumnDimension('G')->setWidth(40);
+        $sheet->getColumnDimension('H')->setWidth(20);
+        $sheet->getColumnDimension('I')->setWidth(10);
+        $sheet->getColumnDimension('J')->setWidth(10);
+        $sheet->getColumnDimension('K')->setWidth(15);
+        $sheet->getColumnDimension('L')->setWidth(15);
+
+
+        $sheet->setCellValue([1, 1], 'Kalender')
+            ->setCellValue([2, 1], 'Startdatum')
+            ->setCellValue([3, 1], 'Startzeit')
+            ->setCellValue([4, 1], 'Enddatum')
+            ->setCellValue([5, 1], 'Endzeit')
+            ->setCellValue([6, 1], 'Betreff')
+            ->setCellValue([7, 1], 'Ort')
+            ->setCellValue([8, 1], 'Beschreibung')
+            ->setCellValue([9, 1], 'Termintyp')
+            ->setCellValue([10, 1], 'Privat')
+            ->setCellValue([11, 1], 'Sichtbarkeit')
+            ->setCellValue([12, 1], 'Organisator')
+
+        ;
+        $counter = 2;
+        foreach ($calendarEvents['data'] as $event) {
+            if ($event['privateflag']['privateflag']) {
+                $event['privateflag']['privateflag'] = "Ja";
+            } else {
+                $event['privateflag']['privateflag'] = "Nein";
+            }
+            if ($event['isorganizer']['isorganizer']) {
+                $event['isorganizer']['isorganizer'] = "Ja";
+            } else {
+                $event['isorganizer']['isorganizer'] = "Nein";
+            }
+            if ($event['busy']['busy'] == 1) {
+                $event['busy']['busy'] = "gebucht";
+            } else if ($event['busy']['busy'] == 2) {
+                $event['busy']['busy'] = "mit Vorbehalt";
+            } else {
+                $event['busy']['busy'] = "frei";
+            }
+
+            if ($event['allDay']['allDay'] == 0) {
+                $starttime = date("H:i", strtotime($event['cstart']['cstart']));
+                $endtime = date("H:i", strtotime($event['cend']['cend']));
+                $startdate = date("d.m.Y", strtotime($event['cstart']['cstart']));
+                $enddate = date("d.m.Y", strtotime($event['cend']['cend']));
+            } else {
+                $starttime = "";
+                $startdate = date("d.m.Y", strtotime($event['cstart']['cstart']));
+                $endtime = "";
+                $enddate = date("d.m.Y", strtotime($event['cend']['cend']) - 7500);
+            }
+            if ($event['event_type']['event_type'] != "") {
+                $helper = new Html();
+                $richText = $helper->toRichTextObject($event['description']['description']);
+                $calendarType = $eventTypes[$event['event_type']['event_type']];
+                $sheet->setCellValue([1, $counter], $event['calendar_name']['calendar_name'])
+                    ->setCellValue([2, $counter], $startdate)
+                    ->setCellValue([3, $counter], $starttime)
+                    ->setCellValue([4, $counter], $enddate)
+                    ->setCellValue([5, $counter], $endtime)
+                    ->setCellValue([6, $counter], $event['ccategory']['ccategory'])
+                    ->setCellValue([7, $counter], $event['location']['location'])
+                    ->setCellValue([8, $counter], $richText)
+                    ->setCellValue([9, $counter], $calendarType)
+                    ->setCellValue([10, $counter], $event['privateflag']['privateflag'])
+                    ->setCellValue([11, $counter], $event['busy']['busy'])
+                    ->setCellValue([12, $counter], $event['isorganizer']['isorganizer'])
+                ;
+                $counter++;
+            }
+        }
+        header("Content-type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+
+        header('Content-disposition: attachment; filename="Kalender-' . date('Y-m-d_H-i-s') . '-' . uniqid() . '.xlsx"');
+        $writer->save('php://output');
+        exit;
+
+
+    }
+
     protected function indexAction()
     {
         $this->layout()->setTemplate("Calendar/Index");
diff --git a/application/Calendar/CalendarModel.php b/application/Calendar/CalendarModel.php
index 32bf0e89a..9d6007d21 100644
--- a/application/Calendar/CalendarModel.php
+++ b/application/Calendar/CalendarModel.php
@@ -32,6 +32,15 @@ class CalendarModel
         '690', // Spusu
         '699'  // 3 (Drei)
     );
+
+    public static $eventTypes = array(
+        1 => 'Termin',
+        2 => 'IBN Xinon',
+        3 => 'IBN  ESTMK',
+        4 => 'IBN Snopp',
+        5 => 'Störung',
+        6 => 'Support Gespräch'
+    );
     public static $standardCalendarColors = [
         '#b3d5f3', '#d0e2c0', '#bac2d4', '#c6d4c0', '#e3e3e3',
         '#acdce5', '#cdb6c0', '#aae0e1', '#d9d9d9', '#d9e5d5',
@@ -75,9 +84,13 @@ class CalendarModel
     {
         $unicode_map = [
             '\u00f6' => 'ö',
+            'u00f6' => 'ö',
             '\u00fc' => 'ü',
+            'u00fc' => 'ü',
             '\u00e4' => 'ä',
+            'u00e4' => 'ä',
             '\u00df' => 'ß',
+            'u00df' => 'ß',
             '\u00e9' => 'é',
             '\u00e0' => 'à',
             '\u00f3' => 'ó',
@@ -145,7 +158,7 @@ class CalendarModel
         die();
     }
 
-    public static function getCalendarEvents($me, $id = 0, $r = 0)
+    public static function getCalendarEvents($me, $id = 0, $r = 0, $returnvalues = false)
     {
         $rrulefreq = array('daily' => 'DAILY', 'weekly' => 'WEEKLY', 'relativeMonthly' => 'MONTHLY', 'yearly' => 'YEARLY', 'absoluteMonthly' => 'absoluteMonthly');
         $calendar = self::search(array("user_id" => $me));
@@ -192,7 +205,7 @@ class CalendarModel
         }
 
 
-        $sql = "SELECT `cal_events`.id,`cal_events`.categories, uuid, calendar_id, `cal_events`.user_id, start_time, end_time, timezone, all_day_event, `cal_events`.name,`cal_calendars`.name calendar_name, description, location, repeat_end_time, reminder, ctime,cname, mtime,mname, muser_id, busy, status, resource_event_id, private, rrule, `cal_events`.background, `cal_events`.files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, is_organizer,event_type,busy,recurrence,rrule_events FROM cal_events INNER JOIN `cal_calendars` ON (`cal_calendars`.`id`=`cal_events`.`calendar_id`) WHERE 1=1 $where ";
+        $sql = "SELECT `cal_events`.id,`cal_events`.categories, uuid, calendar_id, `cal_events`.user_id, start_time, end_time, timezone, all_day_event, `cal_events`.name,`cal_calendars`.name calendar_name, description, location, repeat_end_time, reminder, ctime,cname, mtime,mname, muser_id, busy, status, resource_event_id, private, rrule, `cal_events`.background, `cal_events`.files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, is_organizer,event_type,busy,recurrence,rrule_events FROM cal_events INNER JOIN `cal_calendars` ON (`cal_calendars`.`id`=`cal_events`.`calendar_id`) WHERE 1=1 $where ORDER BY start_time DESC";
 
         $res = $dbcal->query($sql);
         if ($dbcal->num_rows($res)) {
@@ -380,7 +393,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
 
 
         $json = json_encode($json);
-        if ($id == 0) {
+        if ($id == 0 && $returnvalues == false) {
             echo trim($json);
             die();
         } else {
@@ -445,13 +458,15 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
         }
         $Allcalendar['Daniel Whoknows'] = 2;
         $Allcalendar['Stefan Plaschg'] = 26;
-        $res = $dbcal->select("cal_events", "id, uuid, calendar_id, user_id, start_time, end_time, timezone, all_day_event, name, description, location, repeat_end_time, reminder, ctime, mtime, muser_id, busy, status, resource_event_id, private, rrule, background, files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, is_organizer,event_type,customer,customer_info,customer_info_send,customer_info_reminder,busy,attendees,organizer,is_organizer,accepted", "1=1 AND id='" . $id . "' ORDER BY id");
+        $res = $dbcal->select("cal_events", "id, uuid, calendar_id, user_id, start_time, end_time, timezone, all_day_event, name, description, location, repeat_end_time, reminder, ctime, mtime, muser_id, busy, status, resource_event_id, private, rrule, background, files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, recurrence, is_organizer,event_type,customer,customer_info,customer_info_send,customer_info_reminder,busy,attendees,organizer,is_organizer,accepted", "1=1 AND id='" . $id . "' ORDER BY id");
         if ($dbcal->num_rows($res)) {
             $data = $dbcal->fetch_array($res);
-
-
+            if ($data['recurrence']) {
+                $recurrence = self::generateDataRecurrence(json_decode($data['recurrence'], true));
+            } else {
+                $recurrence = false;
+            }
             $attachment = 0;
-
             if ($data['all_day_event'] == 1) {
                 $starttime = date("Y-m-d", $data['start_time']);
                 $endtime = date("Y-m-d", $data['end_time']);
@@ -517,6 +532,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
                     }
                 }
             }
+
             if (!$data['accepted'] && $data['busy'] == 1) {
                 $data['accepted']['ok'] = 1;
                 $data['accepted'] = json_encode($data['accepted']);
@@ -541,8 +557,9 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
                 'privateflag' => array('privateflag' => $data['private'], 'order' => $data['private']),
                 'isorganizer' => array('isorganizer' => $data['is_organizer']),
                 'attendees' => array('attendees' => json_encode($AttendeeArray)),
-                'organizer' => array('organizer' => $data['organizer']),
+                'organizer' => array('organizer' => self::replace_unicode_sequences($data['organizer'])),
                 'accepted' => array('accepted' => $data['accepted']),
+                'recurrence' => array('recurrence' => $recurrence),
                 'attachment' => array('attachment' => $attachment, 'order' => $attachment),
                 'attachments' => array('attachments' => $attachments, 'order' => $attachments)
             );
@@ -814,7 +831,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
         $db->insert("TheTool_CalendarQueue", $data);
     }
 
-    public static function insertCalendarEvent($r, $me)
+    public static function insertCalendarEvent($r, $me, $rrules = "")
     {
         $description = ($r->description);
         $attachments = ($r->attachments);
@@ -844,7 +861,10 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
             $microsoft_user_id = $result->ms_user_id;
 
         }
-
+       if (!$allday)
+       {
+           $allday=0;
+       }
         if ($reminder == 'NULL') {
             $reminder = NULL;
         }
@@ -877,7 +897,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
             $customer_info_send = NULL;
         }
 
-        $dataarray = array("start_time" => $start, 'end_time' => $end, 'name' => $title, 'description' => $description, 'location' => $location, 'calendar_id' => $user_id, 'uuid' => "a5eb79b3-fca7-5378-a09e-" . rand(100000000000, 999999999999), 'user_id' => 1, 'timezone' => 'Europe/Amsterdam', 'all_day_event' => 0, 'repeat_end_time' => 0, 'reminder' => $reminder, 'ctime' => time(), 'cname' => $me->name, 'mtime' => time(), 'mname' => $me->name, 'user_id' => 1, 'busy' => $busy, 'status' => 'CONFIRMED', 'resource_event_id' => 0, 'private' => $privateflag, 'rrule' => '', 'background' => 'EBF1E2', 'files_folder_id' => 0, 'read_only' => 0,'categories'=>$categories, 'exception_for_event_id' => 0, 'recurrence_id' => 0, 'is_organizer' => 1, 'event_type' => $type, 'customer' => $customer, 'customer_info' => $customer_info, 'customer_info_send' => $customer_info_send, 'customer_info_reminder' => $customer_info_reminder_check);
+        $dataarray = array("start_time" => $start, 'end_time' => $end, 'name' => $title, 'description' => $description, 'location' => $location, 'calendar_id' => $user_id, 'uuid' => "a5eb79b3-fca7-5378-a09e-" . rand(100000000000, 999999999999), 'user_id' => 1, 'timezone' => 'Europe/Amsterdam', 'all_day_event' => $allday, 'repeat_end_time' => 0, 'reminder' => $reminder, 'ctime' => time(), 'cname' => $me->name, 'mtime' => time(), 'mname' => $me->name, 'user_id' => 1, 'busy' => $busy, 'status' => 'CONFIRMED', 'resource_event_id' => 0, 'private' => $privateflag, 'rrule' => '', 'background' => 'EBF1E2', 'files_folder_id' => 0, 'read_only' => 0, 'categories' => $categories, 'exception_for_event_id' => 0, 'recurrence_id' => 0, 'is_organizer' => 1, 'event_type' => $type, 'customer' => $customer, 'customer_info' => $customer_info, 'customer_info_send' => $customer_info_send, 'customer_info_reminder' => $customer_info_reminder_check);
 
         $db->insert("cal_events", $dataarray);
         $event_id = $dataarray['uuid'];
@@ -898,6 +918,9 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
         if ($attendees)
             $dataarray['attendees'] = $attendees;
         $dataarray['attachments'] = $attachments;
+        if ($rrules) {
+            $dataarray['rrule'] = $rrules;
+        }
         $json_data = json_encode($dataarray);
 
         $data = [];
@@ -972,6 +995,87 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
         die();
     }
 
+    public static function generateDataRecurrence($graph)
+    {
+        $data = [];
+        switch ($graph['pattern']['type']) {
+            case 'daily':
+                $data['rrule_frequency'] = 'DAILY';
+                break;
+            case 'weekly':
+                $data['rrule_frequency'] = 'WEEKLY';
+                if (!empty($graph['pattern']['daysOfWeek'])) {
+                    $data['rrule_byweekday'] = array_map(function ($day) {
+                        return self::convertGraphToDay($day);
+                    }, $graph['pattern']['daysOfWeek']);
+                }
+                break;
+            case 'absoluteMonthly':
+                $data['rrule_frequency'] = 'MONTHLY';
+                $data['monthly_type'] = 'BYMONTHDAY';
+                $data['rrule_bymonthday'] = intval($graph['pattern']['dayOfMonth']);
+                break;
+            case 'relativeMonthly':
+                $data['rrule_frequency'] = 'MONTHLY';
+                $data['monthly_type'] = 'BYSETPOS';
+                $indexMapping = [
+                    'first' => 1,
+                    'second' => 2,
+                    'third' => 3,
+                    'fourth' => 4,
+                    'last' => -1
+                ];
+                $index = isset($graph['pattern']['index']) ? $graph['pattern']['index'] : 'first';
+                $data['rrule_setpos'] = isset($indexMapping[$index]) ? $indexMapping[$index] : 1;
+                if (!empty($graph['pattern']['daysOfWeek'])) {
+                    $data['rrule_bynweekday'] = self::convertGraphToDay($graph['pattern']['daysOfWeek'][0]);
+                }
+                break;
+            case 'absoluteYearly':
+                $data['rrule_frequency'] = 'YEARLY';
+                break;
+            default:
+                $data['rrule_frequency'] = 'DAILY';
+        }
+
+        // Falls benötigt, kann der Start-Datum-Wert übernommen werden.
+        if (!empty($graph['range']['startDate'])) {
+            $data['startDate'] = $graph['range']['startDate'];
+        }
+
+        // Wiederherstellen des Endbereichs
+        if (!empty($graph['range']['type'])) {
+            switch ($graph['range']['type']) {
+                case 'endDate':
+                    $data['rrule_until'] = $graph['range']['endDate'];
+                    break;
+                case 'numbered':
+                    $data['rrule_count'] = intval($graph['range']['numberOfOccurrences']);
+                    break;
+                case 'noEnd':
+                    break;
+            }
+        }
+
+        return $data;
+    }
+
+    public static function convertGraphToDay($graphDay)
+    {
+        $mapping = [
+            'MONDAY' => 'MO',
+            'TUESDAY' => 'TU',
+            'WEDNESDAY' => 'WE',
+            'THURSDAY' => 'TH',
+            'FRIDAY' => 'FR',
+            'SATURDAY' => 'SA',
+            'SUNDAY' => 'SU'
+        ];
+
+        $graphDay = strtoupper($graphDay);
+        return isset($mapping[$graphDay]) ? $mapping[$graphDay] : $graphDay;
+    }
+
     public static function create(array $data)
     {
         $model = new Calendar();
diff --git a/application/ConstructionConsent/ConstructionConsentController.php b/application/ConstructionConsent/ConstructionConsentController.php
index ad68e8145..43c1c079d 100644
--- a/application/ConstructionConsent/ConstructionConsentController.php
+++ b/application/ConstructionConsent/ConstructionConsentController.php
@@ -968,39 +968,24 @@ class ConstructionConsentController extends mfBaseController {
         return ["message" => "ConstructionConsent saved successfully"];
     }
 
-    private function generateStats($baseFilter = array()) {
+    private function generateStats($baseFilter = array()): array {
         function getFilteredCount($wantedFilter, $filterValue, $baseFilter) {
-            if (!empty($baseFilter[$wantedFilter]) && $baseFilter[$wantedFilter] != $filterValue) {
-                return 0;
-            } else {
-                return ConstructionConsent::count(array_merge($baseFilter, [$wantedFilter => $filterValue]));
-            }
+            if (!empty($baseFilter[$wantedFilter]) && $baseFilter[$wantedFilter] != $filterValue) return 0;
+            return ConstructionConsent::count(array_merge($baseFilter, [$wantedFilter => $filterValue]));
         }
 
-        $allCount = ConstructionConsent::count($baseFilter);
-        $streetCount = getFilteredCount("object_type", "street", $baseFilter);
-        $buildingCount = getFilteredCount("object_type", "building", $baseFilter);
-        $inspection_planner = getFilteredCount("inspection_planner", "!NULL", $baseFilter);
-        $conduit_installed_building = getFilteredCount("conduit_installed_building", "!NULL", $baseFilter);
-        $conduit_installed_ftu = getFilteredCount("conduit_installed_ftu", "!NULL", $baseFilter);
-        $inhouse_cabling = getFilteredCount("inhouse_cabling", "!NULL", $baseFilter);
-        $status_light_blue = getFilteredCount("status_light", "blue", $baseFilter);
-        $status_light_red = getFilteredCount("status_light", "red", $baseFilter);
-        $status_light_yellow = getFilteredCount("status_light", "yellow", $baseFilter);
-        $status_light_green = getFilteredCount("status_light", "green", $baseFilter);
-
-        return array(
-            "all" => $allCount,
-            "street" => $streetCount,
-            "building" => $buildingCount,
-            "inspection_planner" => $inspection_planner,
-            "conduit_installed_building" => $conduit_installed_building,
-            "conduit_installed_ftu" => $conduit_installed_ftu,
-            "inhouse_cabling" => $inhouse_cabling,
-            "status_light_blue" => $status_light_blue,
-            "status_light_red" => $status_light_red,
-            "status_light_yellow" => $status_light_yellow,
-            "status_light_green" => $status_light_green
-        );
+        return [
+            "all" => ConstructionConsent::count($baseFilter),
+            "street" => getFilteredCount("object_type", "street", $baseFilter),
+            "building" => getFilteredCount("object_type", "building", $baseFilter),
+            "inspection_planner" => getFilteredCount("inspection_planner", "!NULL", $baseFilter),
+            "conduit_installed_building" => getFilteredCount("conduit_installed_building", "!NULL", $baseFilter),
+            "conduit_installed_ftu" => getFilteredCount("conduit_installed_ftu", "!NULL", $baseFilter),
+            "inhouse_cabling" => getFilteredCount("inhouse_cabling", "!NULL", $baseFilter),
+            "status_light_blue" => getFilteredCount("status_light", "blue", $baseFilter),
+            "status_light_red" => getFilteredCount("status_light", "red", $baseFilter),
+            "status_light_yellow" => getFilteredCount("status_light", "yellow", $baseFilter),
+            "status_light_green" => getFilteredCount("status_light", "green", $baseFilter)
+        ];
     }
 }
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index ac9362696..1fee012ed 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -927,11 +927,72 @@ class PreorderModel
         return 0;
     }
 
-    public static function countHistoryStatus($filter = [], $status_code = null)
-    {
-        if ($status_code === null) {
-            die("Please select a status code");
+    public static function countActivePreorder($preorderCampaignId = null) {
+      $db = FronkDB::singleton();
+
+      $where = "1=1 ";
+      if ($preorderCampaignId) {
+        $where .= " AND p.preordercampaign_id = $preorderCampaignId";
+      }
+
+      $sql = "SELECT 
+    COALESCE(SUM(CASE 
+        WHEN LOWER(vh.gdaeigenschaft) IN ('multi dwelling', 'mehrparteienhaus', 'gebaeude mit 2 oder mehr wohnungen', 'gebäude mit 2 oder mehr wohnungen', 'wohngebaeude fuer gemeinschaften', 'wohngebäude für gemeinschaften', 'hotels und aehnliche gebaeude', 'hotels und ähnliche gebäude', 'wohngebäude mit 2 und mehr wohnungen')
+        OR LOWER(vh.rimo_type) IN ('multi dwelling', 'mehrparteienhaus', 'gebaeude mit 2 oder mehr wohnungen', 'gebäude mit 2 oder mehr wohnungen', 'wohngebaeude fuer gemeinschaften', 'wohngebäude für gemeinschaften', 'hotels und aehnliche gebaeude', 'hotels und ähnliche gebäude', 'wohngebäude mit 2 und mehr wohnungen')
+        THEN COALESCE(p.connection_count, 1)
+        ELSE 0
+    END), 0) AS md_count,
+    COALESCE(SUM(COALESCE(p.connection_count, 1)), 0) AS total_count
+
+FROM 
+    `".FRONKDB_DBNAME."`.Preorder p
+LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer vh ON p.adb_hausnummer_id = vh.hausnummer_id
+LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus tt_preorderstatus ON p.status_id = tt_preorderstatus.id
+WHERE p.deleted = 0 AND tt_preorderstatus.code < 899";
+
+      $queryStart = microtime(true);
+      $res = $db->query($sql . $where);
+      mfLoghandler::singleton()->debug("[Query took: ".(microtime(true) - $queryStart)." seconds] " . $sql);
+      if ($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            return ['md_count' => $data->md_count, 'sd_count' => $data->total_count - $data->md_count, 'total_count' => $data->total_count];
+      }
+      return ['md_count' => 0, 'sd_count' => 0, 'total_count' => 0];
+    }
+
+    public static function countTotalUnits($preorderCampaignId = null) {
+      $db = FronkDB::singleton();
+
+      $where = "1=1 ";
+      if ($preorderCampaignId) {
+        $where .= " AND pc.id = $preorderCampaignId";
+      }
+
+      $sql = "SELECT 
+    pc.id AS campaign_id,
+    COALESCE(SUM(n.unit_count), 0) AS total_unit_count,
+    COALESCE(SUM(n.unit_count_sd), 0) AS total_unit_count_sd,
+    COALESCE(SUM(n.unit_count_md), 0) AS total_unit_count_md
+FROM Preordercampaign pc
+LEFT JOIN `".FRONKDB_DBNAME."`.PreordercampaignSalescluster pcs ON pc.id = pcs.preordercampaign_id
+LEFT JOIN `".ADDRESSDB_DBNAME."`.Netzgebiet n ON pcs.salescluster_id = n.id
+WHERE $where
+GROUP BY pc.id";
+
+        $queryStart = microtime(true);
+        $res = $db->query($sql);
+        mfLoghandler::singleton()->debug("[Query took: ".(microtime(true) - $queryStart)." seconds] " . $sql);
+        if ($db->num_rows($res)) {
+                $data = $db->fetch_object($res);
+                return ['total_unit_count' => $data->total_unit_count, 'total_unit_count_sd' => $data->total_unit_count_sd, 'total_unit_count_md' => $data->total_unit_count_md];
         }
+        return ['total_unit_count' => 0, 'total_unit_count_sd' => 0, 'total_unit_count_md' => 0];
+        }
+
+    public static function countHistoryStatus($filter = [], $status_code = null) {
+      if ($status_code === null) {
+          die("Please select a status code");
+      }
 
         if (!is_array($filter)) return false;
 
diff --git a/application/Preordercampaign/PreordercampaignController.php b/application/Preordercampaign/PreordercampaignController.php
index fbc8494f0..01508ff1e 100644
--- a/application/Preordercampaign/PreordercampaignController.php
+++ b/application/Preordercampaign/PreordercampaignController.php
@@ -1,120 +1,74 @@
 <?php
 
 class PreordercampaignController extends mfBaseController {
-  
-  protected function init() {
-    $this->needlogin=true;
-    $me = new User();
-    $me->loadMe();
-    $this->me = $me;
-    $this->layout()->set("me",$me);
-    
-    if(!$me->is(["Admin", "netowner", "salespartner"]) && !$me->can("Preorder")) {
-      $this->redirect("Dashboard");
+
+    protected function init() {
+        $this->needlogin = true;
+        $me = new User();
+        $me->loadMe();
+        $this->me = $me;
+        $this->layout()->set("me", $this->me);
+
+        if (!$this->me->is(["Admin", "netowner", "salespartner"]) && !$this->me->can("Preorder")) $this->redirect("Dashboard");
+        if ($this->me->is("Preorderlogistics")) $this->redirect("Preorderlogistics");
+        if ($this->me->is("Preorderfront")) $this->redirect("Preorder");
     }
-  }
-  
-  protected function indexAction() {
-    if($this->me->is("Preorderlogistics")) {
-      $this->redirect("Preorderlogistics");
+
+    protected function indexAction() {
+        $isAdmin = $this->me->is("Admin");
+
+        $filter = [];
+        if ($isAdmin) $my_networks = NetworkModel::getAll();
+        else $filter['network_id'] = array_unique(array_merge(
+                array_column($this->me->myNetworks(["netowner", "salespartner"]), 'id'),
+                json_decode($this->me->getFlag("preorder_networks")->value() ?: '[]')
+            ));
+
+
+
+        $campaigns = array_map(function ($c) {
+            return [
+                'id' => $c->id,
+                'network_id' => $c->network_id,
+                'network_name' => $c->network->name,
+                'network_owner_name' => $c->network->owner->getCompanyOrName(),
+                'name' => $c->name,
+                'area' => $c->area,
+                'from' => $c->from,
+                'to' => $c->to,
+                'rimo_workoders' => $c->workorder_count,
+                'active_preorder_count' => PreorderModel::countActivePreorder($c->id),
+                'count_total_units' => PreorderModel::countTotalUnits($c->id),
+                ];
+        }, PreordercampaignModel::search($filter));
+
+        $net_owners = array_map(function ($n) {
+            return [
+                'value' => $n->getCompanyOrName(),
+                'text' => $n->getCompanyOrName()
+            ];
+        }, $isAdmin ? $this->getNetworkOwners(array_column($my_networks, 'id')) : []);
+
+        Helper::renderVue($this, "Preordercampaign", "Vorbestellkampagnen",
+            [
+                "NETWORK_OWNER_OPTIONS" => $net_owners,
+                "SHOW_MISC_BUTTONS" => in_array($this->me->address_id, [1, 4807], true),
+                "IS_ADMIN" => $isAdmin,
+                "CAMPAIGNS" => $campaigns,
+                "VIEW_URL" => self::getUrl("Preorder", "Index"),
+                "PREORDER_DISCOUNT_IMPORT_URL" => self::getUrl("Preorderdiscount", "import"),
+                "PREORDER_STATUS_UPDATE_IMPORT_URL" => self::getUrl("Preorder", "statusupdateimport"),
+                "ADD_PREORDER_URL" => self::getUrl("Preorder", "add"),
+                "DOWNLOAD_ADDON_SERVICES_URL" => self::getUrl("Preordercampaign", "downloadAddonServices"),
+                "PREORDER_NOTIFICATION_URL" => self::getUrl("Preordernotification", "Index"),
+                "ADD_URL" => self::getUrl("Preordercampaign", "add"),
+                "EDIT_URL" => self::getUrl("Preordercampaign", "edit"),
+                "ADMIN_URL" => self::getUrl("Preordercampaign", "admin"),
+        ]);
     }
-    
-    
-    $this->layout()->setTemplate("Preordercampaign/Index");
-    
-    $this->layout->set("filter", $this->request->filter);
-    
-    $filter = [];
-    if($this->request->filter) {
-      $filter = $this->getPreparedFilter($this->request->filter);
-    }
-    
-    // pagination defaults
-    $pagination = [];
-    $pagination['start'] = 0;
-    $pagination['count'] = 20;
-    $pagination['maxItems'] = 0;
-    
-    if(is_numeric($this->request->s)) {
-      $pagination['start'] = intval($this->request->s);
-    }
-    
-    $my_networks = [];
-    //var_dump($filter);exit;
-    if($this->me->is("Admin")) {
-      if(!is_array($filter['network_id']) && $filter['network_id']) {
-        $my_networks[] = new Network($filter['network_id']);
-      } else {
-        $my_networks = NetworkModel::getAll();
-      }
-      $this->layout()->set("mynetworks", NetworkModel::getAll());
-      
-      $netowners = $this->getNetworkOwners($my_network_ids);
-      $this->layout()->set("netowners", $netowners);
-      
-    } else {
-      $use_filter_network = false;
-      $my_networks = $this->me->myNetworks(["netowner", "salespartner"]);
-      
-      // check users allowed networks
-      $user_network_ids = $this->me->getFlag("preorder_networks")->value();
-      if($user_network_ids) {
-        $user_network_ids = json_decode($user_network_ids);
-      }
-      
-      if(is_array($user_network_ids) && count($user_network_ids)) {
-        
-        if(!$my_networks) {
-          foreach($user_network_ids as $mnid) {
-            $my_networks[] = new Network($mnid);
-          }
-        } else {
-          //var_dump($user_network_ids, $my_networks);exit;
-          $new_my_networks = [];
-          foreach($my_networks as $network) {
-            if(in_array($network->id, $user_network_ids)) {
-              $new_my_networks[$network->id] = $network;
-            }
-          }
-          $my_networks = $new_my_networks;
-        }
-      }
-      
-      //var_dump($my_networks);exit;
-      foreach($my_networks as $mn) {
-        if($mn->id == $filter['network_id']) {
-          $use_filter_network = true;
-          break;
-        }
-      }
-      
-      $this->layout()->set("mynetworks", $my_networks);
-      
-      if($use_filter_network) {
-        $my_networks = [];
-        $my_networks[] = new Network($filter['network_id']);
-      }
-      
-      $my_network_ids = [];
-      foreach($my_networks as $network) {
-        $my_network_ids[] = $network->id;
-      }
-      $filter['network_id'] = $my_network_ids;
-    }
-    
-    
-    $pagination['maxItems'] = PreordercampaignModel::count($filter);
-    $campaigns = PreordercampaignModel::search($filter, $pagination);
-    
-    $this->layout()->set("pagination", $pagination);
-    $this->layout()->set("campaigns", $campaigns);
-    
-    
-  }
-  
   private function getPreparedFilter($filter) {
     $new_filter = [];
-    
+
     if(array_key_exists("netowner", $filter) && $filter['netowner']) {
       if($this->me->is("Admin")) {
         $owner_id = $filter['netowner'];
@@ -126,7 +80,7 @@ class PreordercampaignController extends mfBaseController {
         unset($filter['netowner']);
       }
     }
-    
+
     if(array_key_exists("name", $filter) && $filter['name']) {
       $new_filter['name%'] = "%".$filter['name'];
       unset($filter['name']);
@@ -135,17 +89,17 @@ class PreordercampaignController extends mfBaseController {
       $new_filter['area%'] = "%".$filter['area'];
       unset($filter['area']);
     }
-    
+
     foreach($filter as $name => $value) {
       $new_filter[$name] = $value;
     }
-    
+
     return $new_filter;
   }
-  
+
   private function getNetworkOwners() {
     $owners = [];
-    
+
     $sql = "SELECT Address.* FROM Preordercampaign
             LEFT JOIN Network ON (Preordercampaign.network_id = Network.id)
             LEFT JOIN Address ON (Network.owner_id = Address.id)
@@ -153,65 +107,65 @@ class PreordercampaignController extends mfBaseController {
             ORDER BY Address.company, Address.lastname, Address.firstname
     ";
     $res = $this->db()->query($sql);
-    if($this->db()->num_rows($reso)) {
+    if($this->db()->num_rows($res)) {
       while($data = $this->db()->fetch_object($res)) {
         $owners[] = new Address($data->id);
       }
     }
-    
+
     return $owners;
   }
-  
+
   protected function addAction() {
     if(!$this->me->is("Admin")) {
       $this->redirect("Preordercampaign");
     }
-    
+
     $this->layout()->setTemplate("Preordercampaign/Form");
-    
+
     if($this->me->isAdmin()) {
       $this->layout()->set("networks", NetworkModel::getAll());
     } else {
       $this->layout()->set("networks", $this->me->my_networks);
     }
-    
+
     $this->layout()->set("types", BuildingtypeModel::getAll());
     $this->layout()->set("statuses", BuildingstatusModel::getAll());
-    
+
     $this->layout()->set("networksections", NetworksectionModel::getAll());
-    
+
     $this->layout()->set("adb_netzgebiete", ADBNetzgebietModel::getAll());
-    
-    
+
+
   }
-  
+
   protected function editAction() {
     if(!$this->me->is("Admin")) {
       $this->redirect("Preordercampaign");
     }
-    
+
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $this->layout()->set("campaign", $campaign);
-    
+
     return $this->addAction();
   }
-  
+
   protected function saveAction() {
     if(!$this->me->is("Admin")) {
       $this->redirect("Preordercampaign");
     }
-    
+
     $r = $this->request;
     //var_dump($r->get());exit;
     $id = $r->id;
@@ -226,7 +180,7 @@ class PreordercampaignController extends mfBaseController {
       $id = false;
       $mode = "add";
     }
-    
+
     $data = [];
     $data['network_id'] = $r->network_id;
     $data['name'] = trim($r->name);
@@ -238,15 +192,15 @@ class PreordercampaignController extends mfBaseController {
     $data["cifcableurl"] = trim($r->cifcableurl);
     $data["from_email_name"] = trim($r->from_email_name);
     $data["from_email"] = trim($r->from_email);
-    
+
     if($r->from) {
       $data['from'] = self::dateToTimestamp($r->from);
     }
-    
+
     if($r->to) {
       $data['to'] = self::dateToTimestamp($r->to);
     }
-    
+
     if($r->fulfillment == "thirdparty") {
       $data['fulfillment'] = "thirdparty";
     } elseif($r->fulfillment == "rimo") {
@@ -254,7 +208,7 @@ class PreordercampaignController extends mfBaseController {
     } else {
       $data['fulfillment'] = "thetool";
     }
-    
+
     if($r->oaid_origin == "ofaa") {
       $data['oaid_origin'] = "ofaa";
     } elseif($r->oaid_origin == "thetool") {
@@ -262,7 +216,7 @@ class PreordercampaignController extends mfBaseController {
     } else {
       $data['oaid_origin'] = "other";
     }
-    
+
     if($r->product_type == "setup_only") {
       $data['product_type'] = "setup_only";
     } elseif($r->product_type == "no_setup") {
@@ -270,7 +224,7 @@ class PreordercampaignController extends mfBaseController {
     } else {
       $data['product_type'] = "all";
     }
-    
+
     if(is_array($r->required_fields) && count($r->required_fields)) {
       $rfields = [];
       foreach(['contact_type'] as $afield) {
@@ -282,25 +236,25 @@ class PreordercampaignController extends mfBaseController {
     } else {
       $data['required_preorder_fields'] = null;
     }
-    
+
     if($r->district_is_city == 1) {
       $data['district_is_city'] = 1;
     } else {
       $data['district_is_city'] = 0;
     }
-    
+
     if($r->hausnummer_add_zusatz == 1) {
       $data['hausnummer_add_zusatz'] = 1;
     } else {
       $data['hausnummer_add_zusatz'] = 0;
     }
-    
+
     if($r->exist_is_error == 1) {
       $data['exist_is_error'] = 1;
     } else {
       $data['exist_is_error'] = 0;
     }
-    
+
     //var_dump($r->banned_rimo_fcp);exit;
     if($r->banned_rimo_fcp && is_array($r->banned_rimo_fcp) && count($r->banned_rimo_fcp)) {
       $banned_fcp_json = json_encode($r->banned_rimo_fcp);
@@ -312,27 +266,27 @@ class PreordercampaignController extends mfBaseController {
     } else {
       $data["banned_rimo_fcp"] = null;
     }
-    
+
     $data['edit_by'] = $this->me->id;
-    
+
     if($mode == "add") {
       $data['create_by'] = $this->me->id;
       $campaign = PreordercampaignModel::create($data);
     } else {
       $campaign->update($data);
     }
-    
+
     $new_id = $campaign->save();
     if(!$new_id) {
       $this->layout()->setFlash("Fehler beim Speichern", "error");
       $this->layout()->set("campaign", $campaign);
       return $this->add();
     }
-    
+
     if(is_array($r->types) && count($r->types)) {
       $campaign->addTypes($r->types);
     }
-    
+
     //var_dump($r->adb_netzgebiet_ids);exit;
     foreach(PreordercampaignSalesclusterModel::search(['preordercampaign_id' => $campaign->id]) as $pcg) {
       $pcg->delete();
@@ -342,12 +296,12 @@ class PreordercampaignController extends mfBaseController {
       foreach($r->adb_netzgebiet_ids as $netzgebiet_id) {
         $pcg = PreordercampaignSalesclusterModel::getFirst(['preordercampaign_id' => $campaign->id, 'salescluster_id' => $netzgebiet_id]);
         if($pcg) continue;
-        
+
         $pcg = PreordercampaignSalesclusterModel::create(['preordercampaign_id' => $campaign->id, 'salescluster_id' => $netzgebiet_id]);
         $pcg->save();
       }
     }
-    
+
     foreach(PreordercampaignApiuserModel::search(['preordercampaign_id' => $campaign->id]) as $pca) {
       $pca->delete();
     }
@@ -355,12 +309,12 @@ class PreordercampaignController extends mfBaseController {
       foreach($r->apiusers as $user_id) {
         $pca = PreordercampaignApiuserModel::getFirst(['preordercampaign_id' => $campaign->id, 'worker_id' => $user_id]);
         if($pca) continue;
-        
+
         $pca = PreordercampaignApiuserModel::create(['preordercampaign_id' => $campaign->id, 'worker_id' => $user_id]);
         $pca->save();
       }
     }
-    
+
     foreach(PreordercampaignOriginhostnameModel::search(['preordercampaign_id' => $campaign->id]) as $origin) {
       $origin->delete();
     }
@@ -449,7 +403,7 @@ class PreordercampaignController extends mfBaseController {
               $op->delete(); // automatically deletes isps too
           }
       }
-      
+
 
     if(is_array($r->passive_operators)) {
         if(!count($r->passive_operators)) {
@@ -548,7 +502,7 @@ class PreordercampaignController extends mfBaseController {
     }
     $this->redirect("Preordercampaign", "Edit", ['id' => $new_id]);
 
-    
+
   }
 
   protected function billingAction() {
@@ -583,28 +537,28 @@ class PreordercampaignController extends mfBaseController {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $this->layout()->set("campaign", $campaign);
     $preorders = PreorderModel::searchActive(["preordercampaign_id" => $id, "add-where" => "AND JSON_LENGTH(addon_services) > 1"]);
-    
+
     if(!count($preorders)) {
       $this->layout->setFlash("Keine Vorbestellungen mit bestellten Dienstleistungen gefunden.");
       $this->redirect("Preordercampaign");
     }
-    
+
     $csv = [];
     foreach($preorders as $preorder) {
       $sjson = json_decode($preorder->addon_services);
       if(!$sjson) {
         continue;
       }
-      
+
       // address data and stuff
       $general = [
         "ucode" => $preorder->ucode,
@@ -629,7 +583,7 @@ class PreordercampaignController extends mfBaseController {
         "phone" => $preorder->phone,
         "email" => $preorder->email,
       ];
-      
+
       if($preorder->adb_wohneinheit_id) {
         $general["block"] = $preorder->adb_wohneinheit->block;
         $general["stiege"] = $preorder->adb_wohneinheit->stiege;
@@ -637,10 +591,10 @@ class PreordercampaignController extends mfBaseController {
         $general["tuer"] = $preorder->adb_wohneinheit->tuer;
         $general["zusatz"] = $preorder->adb_wohneinheit->zusatz;
       }
-      
+
       foreach($sjson as $service) {
         if(!$service->ordered) continue;
-        
+
         $s = $general;
         $s["service"] = $service->service;
         $data = [];
@@ -654,7 +608,7 @@ class PreordercampaignController extends mfBaseController {
       $this->layout()->setTemplate("Preordercampaign/services.csv");
       $this->layout()->set("csv", $csv);
     }
-    
+
   }
 
     protected function apiAction() {
@@ -727,55 +681,55 @@ class PreordercampaignController extends mfBaseController {
 
   protected function adminAction() {
     $this->layout()->setTemplate("Preordercampaign/Admin");
-    
+
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $this->layout()->set("campaign", $campaign);
   }
-  
+
   protected function updateUnitOAIDsAction() {
     $this->layout()->setTemplate("Preordercampaign/Admin");
-    
+
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $updated_units = 0;
-    
+
     foreach(PreorderModel::searchActive(["preordercampaign_id" => $id, 'deleted' => 0]) as $preorder) {
       if(!$preorder->adb_wohneinheit_id) continue;
       if(!$preorder->oaid) continue;
       $unit = $preorder->adb_wohneinheit;
-      
+
       if(!$preorder->oaid || $unit->oaid != $preorder->oaid) {
         $preorder->save();
         $updated_units++;
       }
     }
-    
+
     $this->layout()->setFlash("$updated_units Wohneinheiten aktualisiert", "success");
     $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
-    
+
   }
-  
+
   protected function assignOpenAccessIdsToPreordersAction() {
     $this->layout()->setTemplate("Preordercampaign/Admin");
 
@@ -784,7 +738,7 @@ class PreordercampaignController extends mfBaseController {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
@@ -795,20 +749,20 @@ class PreordercampaignController extends mfBaseController {
         $this->layout()->setFlash("Kampagne unterstützt keine OAIDs", "warning");
         $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
     }
-    
+
     $assigned_oaids = 0;
     $multiple_unit = 0;
-    
+
     foreach(PreorderModel::searchActive(["preordercampaign_id" => $id, "oaid" => null, "connection_count" => 1]) as $preorder) {
       if($preorder->type == "interest") {
         continue;
       }
-      
+
       if($preorder->oaid) {
         $this->log->warning(__METHOD__.": OAID is set already");
         continue;
       }
-      
+
       if(!$preorder->adb_wohneinheit_id) {
         //echo "Keine Wohneinheit in Preorder (".$preorder->id.") ".$preorder->ucode." ".$preorder->oaid."\n";
         continue;
@@ -818,55 +772,55 @@ class PreordercampaignController extends mfBaseController {
         $this->log->error(__METHOD__.": Wohneinheit nicht gefunden (Preorder ".$preorder->id." ".$preorder->ucode." ".$preorder->oaid.")");
         continue;
       }
-      
+
       /*if(!$wohneinheit->extref) {
         continue;
       }*/
-      
+
       $wohneinheit_count = PreorderModel::countActive(["adb_wohneinheit_id" => $wohneinheit->id]);
       if($wohneinheit_count > 1) {
         $this->log->error(__METHOD__.": Wohneinheit ".$wohneinheit->id." is assigned to multiple preorders!");
         $multiple_unit++;
         continue;
       }
-      
+
       $netowner = new Address($campaign->network->owner_id);
       //var_dump($netowner);exit;
       // get random active OAID from network owner pool
-      
+
       $oaid_attributes = [
         "owner_id" => $netowner->id,
         "origin" => $campaign->oaid_origin
       ];
-      
+
       if($this->request->origin_id) {
         $oaid_attributes["origin_id"] = $this->request->origin_id;
       }
-      
+
       $preorder->setOrCreateOaid($oaid_attributes);
-      
+
       /*if($wohneinheit->oaid != $oaid->oaid) {
         $wohneinheit->oaid = $oaid->oaid;
         $wohneinheit->save();
       }*/
-      
+
       $assigned_oaids++;
-      
+
     }
-    
+
     $this->layout()->setFlash("$assigned_oaids OAIDs wurden Vorbestellungen zugewiesen", "success");
     $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
   }
-  
+
   protected function createRimoWorkordersAction() {
     $this->layout()->setTemplate("Preordercampaign/Admin");
-    
+
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
@@ -877,21 +831,21 @@ class PreordercampaignController extends mfBaseController {
           $this->layout()->setFlash("Kampagne unterstützt keine OAIDs, somit können keine Workorders erstellt werden", "warning");
           $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
       }
-    
+
     $missing_units = [];
     $missing_extrefs = [];
     $workorders_created = 0;
     $workorders_failed = 0;
-    
+
     foreach(PreorderModel::searchActive(["preordercampaign_id" => $id, "rimo_workorder" => false, "connection_count" => 1]) as $preorder) {
       if($preorder->workorder_export_date) {
         $this->log->warning(__METHOD__.": workorder_export_date not null");
       }
-      
+
       if($preorder->type == "interest" || $preorder->type == "legacytransfer") {
         continue;
       }
-      
+
       if(!$preorder->adb_wohneinheit_id) {
         //echo "Keine Wohneinheit in Preorder (".$preorder->id.") ".$preorder->ucode." ".$preorder->oaid."\n";
         $missing_units[] = $preorder;
@@ -902,19 +856,19 @@ class PreordercampaignController extends mfBaseController {
         $this->log->error(__METHOD__.": Wohneinheit nicht gefunden (Preorder ".$preorder->id." ".$preorder->ucode." ".$preorder->oaid.")");
         continue;
       }
-      
+
       if(!$wohneinheit->extref) {
         $missing_extrefs[] = $preorder;
         continue;
       }
-      
+
       if(!$preorder->oaid) {
         $preorder->setOrCreateOaid();
         if(!$preorder->oaid) {
           continue;
         }
       }
-      
+
       $oaid = OpenAccessIdModel::getFirstOaid($wohneinheit->oaid);
       if(!$oaid) {
         $this->log->warning(__METHOD__.": OAID '".$wohneinheit->oaid."' not found");
@@ -955,50 +909,50 @@ class PreordercampaignController extends mfBaseController {
       $wo->save();
       $workorders_created++;
     }
-    
+
     $errors = [];
     $warnings = [];
-    
+
     if(count($missing_units)) {
       $warnings[] = count($missing_units)." Vobestellungen ohne Wohneinheit";
     }
     if(count($missing_extrefs)) {
       $warnings[] = count($missing_extrefs)." Wohneinheiten ohne extref (SDIHome_)";
     }
-    
-    
+
+
     if($workorders_failed) {
       $errors[] = "$workorders_failed Workorders konnten nicht erstellt werden.";
     }
-    
-    
+
+
     if(count($errors)) {
       $this->layout()->setFlash(implode("<br />\n", $errors), "error");
     }
     if(count($warnings)) {
       $this->layout()->setFlash(implode("<br />\n", $warnings), "warning");
     }
-    
+
     if($workorders_created) {
       $this->layout()->setFlash("$workorders_created Workorders erfolgreich erstellt", "success");
     } else {
       $this->layout()->setFlash("Es konnten keine Workorders erstellt werden", "info");
     }
-    
+
     $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
-    
+
   }
-  
+
   protected function exportOaidsToRimoAction() {
-    
+
     $this->layout()->setTemplate("Preordercampaign/Admin");
-    
+
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
@@ -1009,19 +963,19 @@ class PreordercampaignController extends mfBaseController {
         $this->layout()->setFlash("Kampagne unterstützt keine OAIDs", "warning");
         $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
     }
-    
+
     $oaid_assigned = 0;
     $missing_units = 0;
     $missing_extrefs = 0;
     $missing_oaid = 0;
-    
+
     foreach(PreorderModel::searchActive(["preordercampaign_id" => $id, "connection_count" => 1]) as $preorder) {
 
       if($preorder->type == "interest") {
         $this->log->debug(__METHOD__.": Ignoring Preorder ".$preorder->id.": is interest");
         continue;
       }
-      
+
       if(!$preorder->adb_wohneinheit_id) {
         //echo "Keine Wohneinheit in Preorder (".$preorder->id.") ".$preorder->ucode." ".$preorder->oaid."\n";
         //$this->log->debug(__METHOD__.": Ignoring Preorder ".$preorder->id.": missing unit");
@@ -1033,17 +987,17 @@ class PreordercampaignController extends mfBaseController {
         $this->log->error(__METHOD__.": Wohneinheit nicht gefunden (Preorder ".$preorder->id." ".$preorder->ucode." ".$preorder->oaid.")");
         continue;
       }
-      
+
       if(!$wohneinheit->extref) {
         $missing_extrefs++;
         continue;
       }
-      
+
       if(!$preorder->oaid) {
         $missing_oaid++;
         continue;
       }
-      
+
       // TODO; OpenaccessID::exportToRimoFtu
       $oaid = OpenAccessIdModel::getFirstOaid($wohneinheit->oaid);
       if(!$oaid) {
@@ -1055,21 +1009,21 @@ class PreordercampaignController extends mfBaseController {
         $oaid_assigned++;
       }
     }
-    
+
     $this->layout()->setFlash("$oaid_assigned OAIDs erfolgreich erstellt und/oder FTUs zugeordnet.<br />$missing_units missing units<br />$missing_extrefs missing extref<br />$missing_oaid missing oaid");
     $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
-    
+
   }
-  
+
   protected function updateOaidFromUnitAction() {
     $this->layout()->setTemplate("Preordercampaign/Admin");
-    
+
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
@@ -1080,15 +1034,15 @@ class PreordercampaignController extends mfBaseController {
           $this->layout()->setFlash("Kampagne unterstützt keine OAIDs", "warning");
           $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
       }
-    
+
     $oaid_updated = 0;
-    
+
     foreach(PreorderModel::searchActive(["preordercampaign_id" => $id, "connection_count" => 1]) as $preorder) {
       if($preorder->type == "interest") {
         //$this->log->debug(__METHOD__.": Ignoring Preorder ".$preorder->id.": is interest");
         continue;
       }
-      
+
       if(!$preorder->adb_wohneinheit_id) {
         //echo "Keine Wohneinheit in Preorder (".$preorder->id.") ".$preorder->ucode." ".$preorder->oaid."\n";
         $this->log->debug(__METHOD__.": Ignoring Preorder ".$preorder->id.": missing unit");
@@ -1100,34 +1054,34 @@ class PreordercampaignController extends mfBaseController {
         $this->log->error(__METHOD__.": Wohneinheit nicht gefunden (Preorder ".$preorder->id." ".$preorder->ucode." ".$preorder->oaid.")");
         continue;
       }
-      
+
       if(!$wohneinheit->extref) {
         $missing_extrefs++;
         continue;
       }
-      
+
       if(!$preorder->oaid) {
         continue;
       }
-      
+
       $oaid = OpenAccessIdModel::getFirstOaid($wohneinheit->oaid);
       if(!$oaid) {
         $this->log->warning("Cannot export OAID to rimo because not found: ".$wohneinheit->oaid." (Preorder ".$preorder->id." ".$preorder->ucode." ".$preorder->oaid.")");
         continue;
       }
       //var_dump($oaid);exit;
-      
-      
-      
+
+
+
       if($oaid->adb_wohneinheit_id != $wohneinheit->id) {
         //$rimo = new OpenAccessId_Helper_Rimo($oaid->oaid);
-        
+
         $unit_ftu_data = $wohneinheit->ftu_data;
         //var_dump($unit_ftu_data);
         if(!$unit_ftu_data) {
           continue;
         }
-        
+
         $oaid_ftu = $oaid->getExportData("rimo");
         //var_dump($oaid_ftu);
         if($oaid_ftu->ftu_id) {
@@ -1149,34 +1103,34 @@ class PreordercampaignController extends mfBaseController {
         //var_dump($oaid);exit;
         $oaid->save();
 
-        
-        
-        
+
+
+
       }
     }
-    
+
     $this->layout()->setFlash("Done.", "success");
     $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
-    
+
   }
-  
+
   protected function splitMultipleConnectionsAction() {
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $orders_split = 0;
     $orders_new = 0;
     $missing_units = 0;
-    
+
     foreach(PreorderModel::searchActive(["preordercampaign_id" => $campaign->id, "connection_count" => 2]) as $preorder) {
       // check if we have enough units with extref
       $wohneinheiten = ADBWohneinheitModel::search(["hausnummer_id" => $preorder->adb_hausnummer_id]);
@@ -1199,9 +1153,9 @@ class PreordercampaignController extends mfBaseController {
           //echo $preorder->id." balh\n";
         }
       }
-      
+
       if(count($additional_units)) $available_units = array_merge($available_units, $additional_units);
-      
+
       if($preorder->connection_count > count($available_units)) {
         $missing_units++;
         continue;
@@ -1229,31 +1183,31 @@ class PreordercampaignController extends mfBaseController {
       $preorder->delete_reason = "connection_split";
       $preorder->save();
     }
-    
+
     if($missing_units) {
       $this->layout()->setFlash("$missing_units Bestellungen konnten nicht geteilt werden, da nicht genug Wohneinheiten verfügbar sind.", "warning");
     }
-    
+
     $this->layout()->setFlash("$orders_split Bestellungen in $orders_new Bestellungen aufgeteilt.", "success");
     $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
   }
-  
+
   protected function addUnitsAction() {
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $campaign = new Preordercampaign($id);
     if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
       $this->redirect("Preordercampaign");
     }
-    
+
     $units_added = 0;
     $missing_units = 0;
-    
+
     foreach(PreorderModel::searchActive(['preordercampaign_id' => $campaign->id, 'adb_wohneinheit_id' => null, 'connection_count' => 1, "connection_type" => "single-dwelling"]) as $preorder) {
       if($preorder->adb_wohneinheit_id) {
         continue;
@@ -1262,7 +1216,7 @@ class PreordercampaignController extends mfBaseController {
         echo "missing hausnummer Preorder ".$preorder->id."\n";
         continue;
       }
-      
+
       $wohneinheiten = ADBWohneinheitModel::search(['hausnummer_id' => $preorder->adb_hausnummer_id]);
       if(!count($wohneinheiten)) {
         $missing_units++;
@@ -1275,52 +1229,52 @@ class PreordercampaignController extends mfBaseController {
         $unit = $wohneinheiten[0];
         $preorder->adb_wohneinheit_id = $unit->id;
         $preorder->save();
-        
+
         $units_added++;
         continue;
       }
-      
-      
+
+
       if($unit_count > 1) {
         // legacy comment: assume its single-dwelling with erroneously high door count
         // current comment: Just use any unit
         $unit_candidates = [];
-        
+
         foreach($wohneinheiten as $unit) {
           if(!$unit->tuer) continue;
           if($unit->tuer > 1) {
             $unit_candidates[$unit->tuer] = $unit;
           }
         }
-        
+
         // no candidates with door number -> use any
         if(!count($unit_candidates)) {
           foreach($wohneinheiten as $unit) {
             $unit_candidates[] = $unit;
           }
         }
-        
+
         if(count($unit_candidates)) {
           ksort($unit_candidates, SORT_NUMERIC);
           $new_unit = array_shift($unit_candidates);
           $preorder->adb_wohneinheit_id = $new_unit->id;
           $preorder->save();
-          
+
           $units_added++;
           continue;
         }
       }
-      
+
       $i++;
     }
-    
+
     if($missing_units) {
       $this->layout()->setFlash("Für $missing_units Bestellungen wurde keine Wohneinheit gefunden.", "warning");
     }
-    
+
     $this->layout()->setFlash("$units_added Wohneinheiten eingetragen.", "success");
     $this->redirect("Preordercampaign", "Admin", ["id" => $id]);
-    
+
   }
-  
+
 }
\ No newline at end of file
diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php
index e1446ab49..c93dc6e9c 100644
--- a/application/Timerecording/TimerecordingController.php
+++ b/application/Timerecording/TimerecordingController.php
@@ -263,7 +263,7 @@ class TimerecordingController extends mfBaseController
     {
         $r = $this->request;
         $id = $r->id;
-        $oldbpseconds=0;
+        $oldbpseconds = 0;
         $enddate = $r->enddate;
         $hourday = $r->hourday;
 
@@ -530,7 +530,7 @@ class TimerecordingController extends mfBaseController
             }
             $workinghourshistory = TimerecordingEmployeeWorkingHourHistoryModel::search(['user_id' => $userid]);
             if ($workinghourshistory) {
-                $workingHoursHistory[2147483500]=$workingHours;
+                $workingHoursHistory[2147483500] = $workingHours;
                 foreach ($workinghourshistory as $workinghourhistory) {
                     $whenddate = $workinghourhistory->enddate;
                     $workinghourhistoryhours = json_decode($workinghourhistory->workinghours, true);
@@ -547,13 +547,11 @@ class TimerecordingController extends mfBaseController
             }
             //check if holiday is already in the list
             foreach ($holidayDays as $key => $holidayDay) {
-                if ($workingHoursHistory)
-                {
+                if ($workingHoursHistory) {
                     foreach ($workingHoursHistory as $whkey => $whdata) {
                         $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
                         $timestamp = strtotime($key);
-                        if ($whtimestamp >= $timestamp)
-                        {
+                        if ($whtimestamp >= $timestamp) {
                             $workingHours = $whdata;
                         }
                     }
@@ -672,7 +670,7 @@ class TimerecordingController extends mfBaseController
         }
     }
 
-    protected function getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear, $startime = null, $endtime = null, $userid = null)
+    public function getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear, $startime = null, $endtime = null, $userid = null, $ajax = 1)
     {
         $holidayrows = [];
         $mustSeconds = 0;
@@ -680,7 +678,7 @@ class TimerecordingController extends mfBaseController
         $holiDays = 0;
         $plusHours = 0;
         $startdate = time();
-        $allhours=0;
+        $allhours = 0;
         if (!$userid) {
             $userid = $this->me->id;
         }
@@ -699,8 +697,8 @@ class TimerecordingController extends mfBaseController
 
             $overtime = $employee[0]->overtime_now;
             if ($employee[0]->only_admin) {
-                $getAllHours=TimerecordingModel::getAllHours($userid);
-                $getAllHours=$getAllHours[0]->gesamt_summe;
+                $getAllHours = TimerecordingModel::getAllHours($userid);
+                $getAllHours = $getAllHours[0]->gesamt_summe;
             }
         }
         $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $userid]);
@@ -718,7 +716,7 @@ class TimerecordingController extends mfBaseController
 
         $workinghourshistory = TimerecordingEmployeeWorkingHourHistoryModel::search(['user_id' => $userid]);
         if ($workinghourshistory) {
-            $workingHoursHistory[2147483500]=$workingHours;
+            $workingHoursHistory[2147483500] = $workingHours;
             foreach ($workinghourshistory as $workinghourhistory) {
                 $whenddate = $workinghourhistory->enddate;
                 $workinghourhistoryhours = json_decode($workinghourhistory->workinghours, true);
@@ -757,12 +755,10 @@ class TimerecordingController extends mfBaseController
                 }
                 $dDate = date('Y-m-d', $timestamp + $WintertimeCompensation);
                 $dDay = date('w', $timestamp + $WintertimeCompensation);
-                if ($workingHoursHistory)
-                {
+                if ($workingHoursHistory) {
                     foreach ($workingHoursHistory as $whkey => $whdata) {
                         $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
-                        if ($whtimestamp >= $timestamp)
-                        {
+                        if ($whtimestamp >= $timestamp) {
                             unset($workingHours);
                             $workingHours = $whdata;
                         }
@@ -792,12 +788,10 @@ class TimerecordingController extends mfBaseController
                 }
                 $dDate = date('Y-m-d', $timestamp + $WintertimeCompensation);
                 $dDay = date('w', $timestamp + $WintertimeCompensation);
-                if ($workingHoursHistory)
-                {
+                if ($workingHoursHistory) {
                     foreach ($workingHoursHistory as $whkey => $whdata) {
                         $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
-                        if ($whtimestamp >= $timestamp)
-                        {
+                        if ($whtimestamp >= $timestamp) {
                             unset($workingHours);
                             $workingHours = $whdata;
                         }
@@ -826,12 +820,10 @@ class TimerecordingController extends mfBaseController
                 }
                 $dDate = date('Y-m-d', $timestamp + $WintertimeCompensation);
                 $dDay = date('w', $timestamp + $WintertimeCompensation);
-                if ($workingHoursHistory)
-                {
+                if ($workingHoursHistory) {
                     foreach ($workingHoursHistory as $whkey => $whdata) {
                         $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
-                        if ($whtimestamp >= $timestamp)
-                        {
+                        if ($whtimestamp >= $timestamp) {
                             unset($workingHours);
                             $workingHours = $whdata;
                         }
@@ -859,12 +851,10 @@ class TimerecordingController extends mfBaseController
                 if (date('I', $timestamp) == 0) {
                     $WintertimeCompensation = 3600;
                 }
-                if ($workingHoursHistory)
-                {
+                if ($workingHoursHistory) {
                     foreach ($workingHoursHistory as $whkey => $whdata) {
                         $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
-                        if ($whtimestamp >= $timestamp)
-                        {
+                        if ($whtimestamp >= $timestamp) {
                             unset($workingHours);
                             $workingHours = $whdata;
 //                            echo date('Y-m-d 23:59:59', $whkey).PHP_EOL;
@@ -908,6 +898,9 @@ class TimerecordingController extends mfBaseController
                 $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
                 $day = $daysgerm[date("w", $timerecording->start)];
                 $isSeconds = $isSeconds + $seconds;
+                if ($ajax == 0) {
+                    $workdaycheck[] = $datadate;
+                }
             } else if ($timerecording->timerecordingCategory->hourday == 2 || ($timerecording->timerecordingCategory->hourday == 3 && $timerecording->end)) {
 
                 $date = date("d.m.", $timerecording->start) . " - " . $daysgerm[date("w", $timerecording->end)] . " " . date("d.m.Y", $timerecording->end);
@@ -931,12 +924,10 @@ class TimerecordingController extends mfBaseController
                 $savecounter = 0;
                 $sumdays = 0;
                 for ($i = $starttimecalc; $i <= $endtimecalc; $i = $i + 86400) {
-                    if ($workingHoursHistory)
-                    {
+                    if ($workingHoursHistory) {
                         foreach ($workingHoursHistory as $whkey => $whdata) {
                             $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
-                            if ($whtimestamp >= $i)
-                            {
+                            if ($whtimestamp >= $i) {
                                 unset($workingHours);
                                 $workingHours = $whdata;
                             }
@@ -944,6 +935,10 @@ class TimerecordingController extends mfBaseController
                     }
                     $holidaycounter = $workingHours[date("w", $i)];
                     $daycheck = date("Y-m-d", $i);
+                    if ($ajax == 0) {
+                        $workdaycheck[] = $daycheck;
+                    }
+
                     if (!$holiDay[$daycheck]) {
                         if ($holidaycounter) {
                             $isSeconds = $isSeconds + $holidaycounter;
@@ -991,17 +986,19 @@ class TimerecordingController extends mfBaseController
                 $savecounter = 0;
 //                echo $starttimecalc."<br>";
                 for ($i = $starttimecalc; $i <= $endtimecalc; $i = $i + 86400) {
-                    if ($workingHoursHistory)
-                    {
+                    if ($workingHoursHistory) {
                         foreach ($workingHoursHistory as $whkey => $whdata) {
                             $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
-                            if ($whtimestamp >= $i)
-                            {
+                            if ($whtimestamp >= $i) {
                                 unset($workingHours);
                                 $workingHours = $whdata;
                             }
                         }
                     }
+                    if ($ajax == 0) {
+                        $daycheck = date("Y-m-d", $i);
+                        $workdaycheck[] = $daycheck;
+                    }
                     $holidaycounter = $workingHours[$timerecording->user_id][date("w", $i)];
                     $daycheck = date("Y-m-d", $i);
                     if (!$holiDay[$daycheck]) {
@@ -1049,6 +1046,10 @@ class TimerecordingController extends mfBaseController
                 $sum = "-" . sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
                 $day = $daysgerm[date("w", $timerecording->start)];
                 $isSeconds = $isSeconds + $seconds;
+                if ($ajax == 0) {
+                    $workdaycheck[] = $datadate;
+                }
+
             } else if ($timerecording->timerecordingCategory->hourday == 7) {
                 $date = date("d.m.Y", $timerecording->start);
                 $datadate = date("Y-m-d", $timerecording->start);
@@ -1164,9 +1165,15 @@ class TimerecordingController extends mfBaseController
             $json['data'] = $rows;
             $json['recordsFiltered'] = $responsecount;
             $json['recordsTotal'] = $responsecount;
-            $json = json_encode($json);
-            echo trim($json);
-            die();
+
+            if ($ajax == 1) {
+                $json = json_encode($json);
+                echo trim($json);
+                die();
+            } else {
+                $json['workcheck'] = $workdaycheck;
+                return $json;
+            }
         }
     }
 
diff --git a/application/TimerecordingBilling/TimerecordingBillingController.php b/application/TimerecordingBilling/TimerecordingBillingController.php
index ce4b9ae42..118e0995a 100644
--- a/application/TimerecordingBilling/TimerecordingBillingController.php
+++ b/application/TimerecordingBilling/TimerecordingBillingController.php
@@ -107,6 +107,9 @@ class TimerecordingBillingController extends mfBaseController
             case "generatebmdexportnlz":
                 $return = $this->generateBmdExport($month, 1);
                 break;
+            case "generateopenworkdays":
+                $return = $this->generateopenworkdays($month);
+                break;
             case "generatebmdexportclosed":
                 $return = $this->generateBmdExportClosed($month);
                 break;
@@ -383,6 +386,37 @@ class TimerecordingBillingController extends mfBaseController
         exit;
     }
 
+    protected function generateopenworkdays($month)
+    {
+        $filename = "open_workdays_" . $month . ".csv";
+        $file = fopen("php://output", 'w');
+        header('Content-Type: text/csv; charset=utf-8');
+        header('Content-Disposition: attachment; filename=' . $filename);
+        $headerarray = ["Monat", "Mitarbeiter", "Tag"];
+        fputcsv($file, $headerarray, ";");
+        $month = strtotime("01." . $month);
+        //last of month
+        $monthend = date("Y-m-d", strtotime("last day of this month", $month));
+        $monthend = strtotime($monthend . " 23:59:59");
+        $monthbmd = date("n", $month);
+        $timerecordingsEmolyees = TimerecordingEmployeeModel::getAll();
+        foreach ($timerecordingsEmolyees as $timerecordingsEmolyee) {
+            unset($bodyarray);
+            if ($timerecordingsEmolyee->bmd_active == 0 || $timerecordingsEmolyee->startdate > $monthend || ($timerecordingsEmolyee->enddate && $timerecordingsEmolyee->enddate < $month)) continue;
+            $user = new User($timerecordingsEmolyee->user_id);
+            $employee_number = (string)$user->getFlag('employee_number');
+
+            $WorkingDays = $this->checkWorkingDays($user->id, $month, $timerecordingsEmolyee);
+            foreach ($WorkingDays as $WorkingDay) {
+                $bodyarray = [date("m-Y", $month), mb_convert_encoding($user->name, 'ISO-8859-1', 'UTF-8'), date("d.m.Y", strtotime($WorkingDay))];
+                fputcsv($file, $bodyarray, ";");
+            }
+        }
+
+        fclose($file);
+        exit;
+    }
+
     protected function generateBmdExport($month, $nlz = 0, $export = 1)
     {
         //create and download csv file
@@ -606,8 +640,8 @@ class TimerecordingBillingController extends mfBaseController
             }
             if ($timerecording['daysum']) {
                 $data['nlz'] = $timerecording['daysum'];
-                if (strpos($data['nlz'],"Urlaub aufbuchen") !== false) {
-                    $holidays=$this->getholidays($timerecording['user_id'], $enddate);
+                if (strpos($data['nlz'], "Urlaub aufbuchen") !== false) {
+                    $holidays = $this->getholidays($timerecording['user_id'], $enddate);
                     $data['holidays'] = $holidays;
                 }
             }
@@ -879,4 +913,94 @@ class TimerecordingBillingController extends mfBaseController
 
         return $holidays_now;
     }
+
+    protected function checkWorkingDays($user_id, $month, $employee)
+    {
+        $holidays = TimerecordingHolidayModel::getAll();
+        $datamonth = $month;
+        $firstdate = strtotime(date("Y-m-01", $datamonth));
+        $lastdate = strtotime(date("Y-m-t", $datamonth));
+        $daycount = date("t", $datamonth);
+        $lastdate = strtotime(date("Y-m-d", $lastdate) . ' 23:59:59');
+
+        $startdate = $employee->startdate;
+        if ($employee->enddate) {
+            $enddate = strtotime(date('Y-m-d', $employee->enddate) . " 23:59:59");
+        } else {
+            $enddate = 2208985200;
+        }
+        $bpahours = $employee->bpahours;
+
+        $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $user_id]);
+        foreach ($workinghours as $workinghour) {
+
+            $whstart = strtotime(date('Y-m-d', time()) . " " . $workinghour->start . ":00");
+            $whend = strtotime(date('Y-m-d', time()) . " " . $workinghour->end . ":00");
+            if (!$workingHours[$workinghour->day]) {
+                $workingHours[$workinghour->day] = $whend - $whstart;
+            } else {
+                $workingHours[$workinghour->day] = $workingHours[$workinghour->day] + $whend - $whstart;
+            }
+        }
+        $workinghourshistory = TimerecordingEmployeeWorkingHourHistoryModel::search(['user_id' => $user_id]);
+        if ($workinghourshistory) {
+            $workingHoursHistory[9732489200] = $workingHours;
+            foreach ($workinghourshistory as $workinghourhistory) {
+                $whenddate = $workinghourhistory->enddate;
+                $workinghourhistoryhours = json_decode($workinghourhistory->workinghours, true);
+                foreach ($workinghourhistoryhours as $workinghourhistoryhour) {
+                    $whstart = strtotime(date('Y-m-d', time()) . " " . $workinghourhistoryhour['start'] . ":00");
+                    $whend = strtotime(date('Y-m-d', time()) . " " . $workinghourhistoryhour['end'] . ":00");
+                    if (!$workingHoursHistory[$whenddate][$workinghourhistoryhour['day']]) {
+                        $workingHoursHistory[$whenddate][$workinghourhistoryhour['day']] = $whend - $whstart;
+                    } else {
+                        $workingHoursHistory[$whenddate][$workinghourhistoryhour['day']] = $workingHoursHistory[$whenddate][$workinghourhistoryhour['day']] + $whend - $whstart;
+                    }
+                }
+            }
+        }
+        foreach ($holidays as $holiday) {
+            $holiDay[date('Y-m-d', $holiday->timestamp)] = $holiday->timestamp;
+        }
+
+        //Lastdate staticmust deleted
+//            $lastdate = strtotime("2024-03-22 23:59:59");
+//            $daycount=22;
+
+        $searchArray = ['user_id' => $user_id, 'start' => $firstdate, 'end' => $lastdate];
+        $timestamp = $firstdate;
+        for ($i = 1; $i <= $daycount; $i++) {
+            $WintertimeCompensation = 0;
+            if (date('I', $timestamp) == 0) {
+                $WintertimeCompensation = 3600;
+            }
+            $dDate = date('Y-m-d', $timestamp + $WintertimeCompensation);
+            $dDay = date('w', $timestamp + $WintertimeCompensation);
+            if ($workingHoursHistory) {
+                foreach ($workingHoursHistory as $whkey => $whdata) {
+                    $whtimestamp = strtotime(date('Y-m-d 23:59:59', $whkey));
+                    if ($whtimestamp >= $timestamp) {
+                        $workingHours = $whdata;
+                    }
+                }
+            }
+
+            if (!$holiDay[$dDate] && $dDate >= date('Y-m-d', $startdate) && $dDate <= date('Y-m-d', $enddate)) {
+                $mustSeconds = $mustSeconds + $workingHours[$dDay];
+                if ($workingHours[$dDay]) {
+                    $workDays[$dDate] = $dDate;
+                }
+            }
+
+            $timestamp = $timestamp + 86400;
+        }
+        $timerecordingC = new TimerecordingController();
+        $timerecordingC = $timerecordingC->getTimerecordingsApi('2', $month, $month, $month, 0, 0, $user_id, 0);
+        foreach ($timerecordingC['workcheck'] as $key => $value) {
+            unset($workDays[$value]);
+        }
+
+        return $workDays;
+    }
+
 }
diff --git a/db/migrations/20250305160000_add_preorder_db_improvements.php b/db/migrations/20250305160000_add_preorder_db_improvements.php
new file mode 100644
index 000000000..425413f3b
--- /dev/null
+++ b/db/migrations/20250305160000_add_preorder_db_improvements.php
@@ -0,0 +1,20 @@
+<?php /** @noinspection ALL */
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddPreorderDbImprovements extends AbstractMigration {
+    public function up(): void {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table("PreordercampaignSalescluster")->addIndex(["preordercampaign_id","salescluster_id"])->save();
+            $this->table("RimoWorkorder")->addIndex(["adb_wohneinheit_id"])->save();
+        }
+    }
+
+    public function down(): void {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table("PreordercampaignSalescluster")->removeIndex(["preordercampaign_id","salescluster_id"])->save();
+            $this->table("RimoWorkorder")->removeIndex(["adb_wohneinheit_id"])->save();
+        }
+    }
+}
diff --git a/lib/FronkDB/FronkDB.php b/lib/FronkDB/FronkDB.php
index 7bce93c99..98dc060fd 100644
--- a/lib/FronkDB/FronkDB.php
+++ b/lib/FronkDB/FronkDB.php
@@ -1,17 +1,16 @@
 <?php
 
 class FronkDB {
-
     public $link;
     private $result;
     private $lastError;
     private $log;
-
     public $insert_id;
-
     private static $instances = [];
-
-    //private static $instance;
+    public $host;
+    public $user;
+    public $pass;
+    public $db;
 
     public function __construct($host = false, $user = false, $pass = false, $db = false) {
         $this->host = $host;
diff --git a/public/assets/js/datatables-std2.js b/public/assets/js/datatables-std2.js
index 7d4fc120a..0d15ab5dd 100644
--- a/public/assets/js/datatables-std2.js
+++ b/public/assets/js/datatables-std2.js
@@ -89,6 +89,7 @@ table = $('#datatable').DataTable({
         });
         if (initc === 2) {
             $('.buttons-excel').closest('div').append('<div ><button id="month-complete" class="btn btn-danger margina">Monats Abschluss</button></div>');
+            $('.buttons-excel').closest('div').append('<div ><button id="open-workdays" class="btn btn-info margina">Offene Arbeitstage</button></div>');
             $('.buttons-excel').closest('div').append('<div ><button id="bmd-export" class="btn btn-info margina">BMD Import</button></div>');
             $('.buttons-excel').closest('div').append('<div ><button id="bmd-export-nlz" class="btn btn-info margina">BMD NLZ Import</button></div>');
         }
diff --git a/public/css/pages/Calendar/View.css b/public/css/pages/Calendar/View.css
index 1af4c7d8c..bf51586b5 100644
--- a/public/css/pages/Calendar/View.css
+++ b/public/css/pages/Calendar/View.css
@@ -673,11 +673,12 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
     margin-left: -28px;
     margin-top: 4px;
 }
-.cursor-alias{
+
+.cursor-alias {
     cursor: alias;
 }
-.fa-calendar-alert
-{
+
+.fa-calendar-alert {
     font-size: 15px;
     vertical-align: top;
     margin-top: -1px;
@@ -688,57 +689,65 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
     color: #ff0000;
     opacity: 0.7;
 }
+
 .fa-calendar-alert:before {
     color: #fff;
 
 }
-.fa-calendar-alert-search
-{
+
+.fa-calendar-alert-search {
     font-size: 22px;
 
 }
-.logo-top-search
-{
+
+.logo-top-search {
     height: 20px;
     vertical-align: top;
     cursor: pointer;
 }
-.btn-light-search
-{
+
+.btn-light-search {
     border-color: #e5e5e5;
     padding: 3px 6px;
 }
-.top-search-filter
-{
-    filter:grayscale(100%);
+
+.top-search-filter {
+    filter: grayscale(100%);
 }
+
 .fc-event-time {
     z-index: 100;
 }
+
 .note-editor .dropdown-item {
     padding: .15rem 1.2rem;
 }
+
 .note-editable p {
     line-height: 1.2;
     margin-bottom: 0;
 }
+
 .tooltip-description p {
     margin-bottom: 0;
     line-height: 1.2;
 }
+
 .note-dropdown-menu {
     max-height: 250px !important;
     overflow-y: auto !important;
     z-index: 99999 !important;
 }
+
 .tox-dialog {
     z-index: 1060 !important; /* oder ein höherer Wert, je nach Bedarf */
 }
+
 .tox .tox-tbtn--select {
     max-width: 95px;
 }
-.fa-calendar-call
-{
+
+.fa-calendar-call {
     font-size: 13px;
     vertical-align: top;
     margin-top: 0px;
@@ -748,12 +757,30 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
     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
+}
+
+.fa-xls-calendar {
+    font-size: 24px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+}
+
+.btn-xls-calendar {
+    padding: 3px 6px;
+    background-color: #ffffff;
+}
+
+.btn-xls-calendar:hover, .btn-xls-calendar:focus, .btn-xls-calendar:active {
+    background-color: #ffffff !important;
+    border-color: #ffffff !important;
+}
diff --git a/public/js/pages/Calendar/View.js b/public/js/pages/Calendar/View.js
index f943cbed1..bcb318675 100644
--- a/public/js/pages/Calendar/View.js
+++ b/public/js/pages/Calendar/View.js
@@ -554,6 +554,18 @@ document.addEventListener('DOMContentLoaded', function () {
                                 $('#delete-event').hide();
                                 $('#update-event').hide();
                                 $('.show-attendee').hide();
+                                $('#recurringCheck').prop('checked', true);
+                                $('#recurringCheck').change();
+                                if (data.data.recurrence) {
+                                    $('#rrule-frequency').val(data.data.recurrence.recurrence.rrule_frequency);
+                                    $('#rrule-frequency').trigger('change');
+                                    $('#rrule-interval').val(data.data.recurrence.recurrence.rrule_interval);
+                                    $('#rrule-byweekday').val(data.data.recurrence.recurrence.rrule_byweekday);
+                                    $('#rrule-until').val(data.data.recurrence.recurrence.rrule_until);
+                                    $('#monthly-type').val(data.data.recurrence.recurrence.monthly_type);
+                                    $('#monthly-type').trigger('change');
+                                    $('#rrule-bymonthday').val(data.data.recurrence.recurrence.rrule_bymonthday);
+                                }
 
                             }
 
@@ -914,9 +926,11 @@ if (typeof (EventSource) !== 'undefined') {
             let rruleflag = false;
             let cursorclass = '';
             if (event.rrule) {
+                $('.calendar-check').eq(0).trigger('change');
                 rrule = event.rrule;
                 duration = event.duration;
                 rruleflag = true;
+                return;
             }
             if (event.calendar_id in calendarRights) {
                 if (calendarRights[event.calendar_id] == 'all') {
@@ -1190,7 +1204,15 @@ $(document).ready(function () {
         $('#EventModal .is-require').each(function (index, value) {
             $(this).removeClass('required');
         });
-
+        $('#recurring-settings').hide();
+        $('#weekly-options').hide();
+        $('#monthly-type').val('BYMONTHDAY');
+        $('#rrule-frequency').val('');
+        $('#rrule-count').val('');
+        $('#rrule-until').val('');
+        $('#rrule-byweekday').val('');
+        $('#rrule-bymonthday').val('1');
+        $('#monthly-options').hide();
         // $('.select2-multiple').select2();
         $('#calendar-users').prop("disabled", false);
         $("#calendar-users option").each(function () {
@@ -1298,6 +1320,27 @@ $(document).ready(function () {
             users.push($(this).val());
         });
 
+        if ($('#recurringCheck').is(':checked') && $('#rrule-frequency').val() !== '') {
+            var rruleData = {};
+            rruleData.rrule_frequency = $('#rrule-frequency').val();
+
+            if (rruleData.rrule_frequency === 'WEEKLY') {
+                // Mehrere Wochentage als Array
+                rruleData['rrule-byweekday'] = $('#rrule-byweekday').val();
+            } else if (rruleData.rrule_frequency === 'MONTHLY') {
+                rruleData.monthly_type = $('#monthly-type').val();
+                if (rruleData.monthly_type === 'BYMONTHDAY') {
+                    rruleData.rrule_bymonthday = $('#rrule-bymonthday').val();
+                } else if (rruleData.monthly_type === 'BYSETPOS') {
+                    rruleData.rrule_setpos = $('#rrule-setpos').val();
+                    rruleData.rrule_bynweekday = $('#rrule-bynweekday').val();
+                }
+            }
+            // Optionale Felder
+            rruleData.rrule_count = $('#rrule-count').val();
+            rruleData.rrule_until = $('#rrule-until').val();
+        }
+
 
         $.post(requestInsertUrl, {
             start: start,
@@ -1312,6 +1355,7 @@ $(document).ready(function () {
             attachments: attachments,
             users: users,
             privateflag: privateflag,
+            rruleData: rruleData,
             attendees: $('#calendar-attendees').val(),
             customer: customer,
             customer_info_check: customer_info_check,
@@ -2049,6 +2093,63 @@ $(document).ready(function () {
         }
     });
 
+    $("body").on("click", ".fa-xls-calendar", function (e) {
+        let checkbox = $(".calendar-check");
+        let calendarFilter = $('.btn-light-search');
+        let visibleCalendars = [];
+        let visibleCalendarTypes = [];
+        let mycalendar_id = $('#calendar-id').data('calendarid');
+        visibleCalendars.push(0);
+        checkbox.each(function () {
+            if ($(this).prop('checked')) {
+                visibleCalendars.push($(this).data('calendar_id'));
+            }
+        });
+        calendarFilter.each(function () {
+            if (!$(this).hasClass('top-search-filter')) {
+                visibleCalendarTypes.push($(this).data('ctype'));
+            }
+        });
+
+
+        $.ajax({
+            url: requestgenerateEventsxlsx,
+            method: 'POST',
+            data: {
+                visibleCalendars: visibleCalendars,
+                visibleCalendarTypes: visibleCalendarTypes
+            },
+            xhrFields: {
+                responseType: 'blob' // Erwartet binäre Daten als Blob
+            },
+            success: function (data, status, xhr) {
+                // Header auslesen, um den Dateinamen zu erhalten
+                var disposition = xhr.getResponseHeader('Content-Disposition');
+                var filename = "download.xlsx";
+                if (disposition && disposition.indexOf('attachment') !== -1) {
+                    var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+                    var matches = filenameRegex.exec(disposition);
+                    if (matches != null && matches[1]) {
+                        filename = matches[1].replace(/['"]/g, '');
+                    }
+                }
+                // Blob in eine URL umwandeln und Download auslösen
+                var url = window.URL.createObjectURL(data);
+                var a = document.createElement('a');
+                a.href = url;
+                a.download = filename;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                window.URL.revokeObjectURL(url);
+            },
+            error: function (jqXHR, status, error) {
+                console.error("Download error:", error);
+            }
+        });
+    });
+
+
     $("body").on("blur", ".cal-group-name-input", function (e) {
         let groupname = $.trim($(this).val());
         if (groupname.length > 3) {
@@ -2417,14 +2518,54 @@ $(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();
         }
     });
+    $(document).ready(function () {
+        // Checkbox toggelt das RRule-Panel
+        $('#recurringCheck').on('change', function () {
+            if ($(this).is(':checked')) {
+                $('#recurring-settings').show();
+                $('#rrule-until').attr('min', $('#start-date').val());
+            } else {
+                $('#recurring-settings').hide();
+                $('#weekly-options').hide();
+                $('#monthly-options').hide();
+            }
+        });
+
+        // Falls eine Frequenz gewählt wird, passende Felder (weekly/monthly) einblenden
+        $('#rrule-frequency').on('change', function () {
+            var freq = $(this).val();
+
+            // Alles erstmal verstecken
+            $('#weekly-options').hide();
+            $('#monthly-options').hide();
+
+            if (freq === 'WEEKLY') {
+                $('#weekly-options').show();
+            } else if (freq === 'MONTHLY') {
+                $('#monthly-options').show();
+            }
+        });
+
+        // Zeige/Verstecke im monatlichen Bereich "Tag des Monats" oder "X. Wochentag"
+        $('#monthly-type').on('change', function () {
+            var monthlyType = $(this).val();
+            if (monthlyType === 'BYMONTHDAY') {
+                $('#monthly-day-select').show();
+                $('#monthly-setpos-select').hide();
+            } else {
+                $('#monthly-day-select').hide();
+                $('#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).
+
+    });
+
 });
diff --git a/public/js/pages/Pop/Pop.js b/public/js/pages/Pop/Pop.js
index abe006daf..b8465cb28 100644
--- a/public/js/pages/Pop/Pop.js
+++ b/public/js/pages/Pop/Pop.js
@@ -50,9 +50,12 @@ Vue.component('Pop', {
                 defaultPageSize: 25,
                 headers: [
                     {text: 'Name', key: 'name', priority: 10},
-                    {text: 'Netzgebiet', key: 'networkArea', class: 'text-center',  filter: 'autocomplete',
-                        filterOptions: window['TT_CONFIG']['NETWORKS'],
-                        priority: 8},
+                    {text: 'Netzgebiet', key: 'networkArea', class: 'text-center',  
+                    // TODO: fix autocomplete Filter
+                    //    filter: 'autocomplete',
+                    //    filterOptions: window['TT_CONFIG']['NETWORKS'],
+                    //    priority: 8
+                    },
                     {text: 'Zutritt', key: 'location', class: 'text-center',  priority: 1},
                     {text: 'Standort', key: 'gps', class: 'text-center',  priority: 2},
                     {text: 'Vlan Public/Nat/ipv6', key: 'vlan', class: 'text-center',  priority: 7},
diff --git a/public/js/pages/Preordercampaign/Preordercampaign.css b/public/js/pages/Preordercampaign/Preordercampaign.css
new file mode 100644
index 000000000..3899b6cc7
--- /dev/null
+++ b/public/js/pages/Preordercampaign/Preordercampaign.css
@@ -0,0 +1,36 @@
+.campaign-grid {
+    display: grid;
+    grid-template-columns: auto 1fr;
+    gap: 0.75rem;
+    align-items: center;
+}
+
+.campaign-icon,
+.campaign-icon > i{
+    font-size: 24px !important;
+    padding: 0.25rem;
+}
+
+.campaign-icon:hover {
+    opacity: 0.8;
+}
+
+.progress-grid {
+    display: grid;
+    grid-template-columns: auto repeat(3, max-content);
+    gap: 0.4rem;
+}
+
+.progress-row > *:nth-child(n+2) {
+    text-align: right;
+    font-variant-numeric: tabular-nums;
+}
+
+.preorder-campaign-table-actions > a > i {
+    font-size: 17px !important;
+}
+
+.preorder-campaign-table-actions {
+    display: flex;
+    justify-content: space-between;
+}
\ No newline at end of file
diff --git a/public/js/pages/Preordercampaign/Preordercampaign.js b/public/js/pages/Preordercampaign/Preordercampaign.js
new file mode 100644
index 000000000..d033dd557
--- /dev/null
+++ b/public/js/pages/Preordercampaign/Preordercampaign.js
@@ -0,0 +1,103 @@
+Vue.component('Preordercampaign', {
+    template: `
+                <tt-card>
+                  <tt-table :data="window['TT_CONFIG']['CAMPAIGNS']" :config="PreordercampaignTableConfig">
+                    <template v-slot:top-buttons>
+                      <button v-if="window['TT_CONFIG']['IS_ADMIN'] === '1'" type="button" class="btn btn-primary" @click="window.location = window['TT_CONFIG']['ADD_URL']">
+                        <i class="fas fa-plus"></i> Vorbestellung hinzufügen
+                      </button>
+                      <a v-if="window['TT_CONFIG']['SHOW_MISC_BUTTONS'] === '1'" class="btn btn-purple" :href="window['TT_CONFIG']['PREORDER_DISCOUNT_IMPORT_URL']">
+                        <i class="fas fa-tags fa-fw"></i> Gutscheincodes importieren</a>
+                      <a v-if="window['TT_CONFIG']['SHOW_MISC_BUTTONS'] === '1'" class="btn btn-purple ml-1" :href="window['TT_CONFIG']['PREORDER_STATUS_UPDATE_IMPORT_URL']">
+                        <i class="fas fa-retweet fa-fw"></i> Statusupdates importieren</a>
+                    </template>
+
+                    <template v-slot:status="{ row: campaign }">
+                      <span class="fa-stack" title="Vorbestellkampagne aktiv" v-if="campaign.from <= Date.now()/1000 && campaign.to >= Date.now()/1000">
+                        <i class="fas fa-alarm-clock fa-stack-1x text-success" style="z-index:20"></i>
+                        <i class="fas fa-circle-check" style="color:Tomato;font-size:.7em"></i>
+                      </span>
+                    </template>
+
+                    <template v-slot:add="{ row: campaign }">
+                      <a class="btn btn-sm btn-outline-primary" :href="window['TT_CONFIG']['ADD_PREORDER_URL'] + '?preordercampaign_id=' + campaign.id">
+                        <i class="fas fa-plus" title="Vorbestellung hinzufügen"></i></a>
+                    </template>
+
+                    <template v-slot:progress="{ row: campaign }">
+                      <div class="campaign-grid">
+                        <a :href="window['TT_CONFIG']['VIEW_URL'] + '?filter[preordercampaign_id]=' + campaign.id" class="campaign-icon">
+                          <i class="fas fa-list-alt" title="Bestellungen anzeigen"></i></a>
+                        <div class="progress-grid">
+                          <template v-if="campaign.count_total_units.total_unit_count_sd > 0">
+                            <span>EFH:</span><span>{{ campaign.active_preorder_count.sd_count }} /</span>
+                            <span>{{ campaign.count_total_units.total_unit_count_sd }}</span>
+                            <span>({{ ((campaign.active_preorder_count.sd_count / campaign.count_total_units.total_unit_count_sd) * 100 || 0).toFixed(2) }} %)</span>
+                          </template>
+                          <template v-if="campaign.count_total_units.total_unit_count_md > 0">
+                            <span>MPH:</span><span>{{ campaign.active_preorder_count.md_count }} /</span>
+                            <span>{{ campaign.count_total_units.total_unit_count_md }}</span>
+                            <span>({{ ((campaign.active_preorder_count.md_count / campaign.count_total_units.total_unit_count_md) * 100 || 0).toFixed(2) }} %)</span>
+                          </template>
+                          <template v-if="campaign.count_total_units.total_unit_count > 0">
+                            <span>Gesamt:</span><span>{{ campaign.active_preorder_count.total_count }} /</span>
+                            <span>{{ campaign.count_total_units.total_unit_count * 2 }}</span>
+                            <span>({{ ((campaign.active_preorder_count.total_count / (campaign.count_total_units.total_unit_count * 2)) * 100 || 0).toFixed(1) }} %)</span>
+                          </template>
+                        </div>
+                      </div>
+                    </template>
+
+                    <template v-slot:from="{ row: campaign }">{{ formatDate(campaign.from) }}</template>
+                    <template v-slot:to="{ row: campaign }">{{ formatDate(campaign.to) }}</template>
+                    <template v-slot:rimo_workoders="{ row: campaign }">{{ campaign.rimo_workoders }} / {{ campaign.active_preorder_count.total_count }}</template>
+
+                    <template v-slot:actions="{ row: campaign }">
+                      <div class="preorder-campaign-table-actions">
+                         <a :href="window['TT_CONFIG']['PREORDER_NOTIFICATION_URL'] + '?filter[preordercampaign_id]=' + campaign.id" title="Email Aussendungen"><i class="far fa-envelope"></i></a>
+                        <template v-if="window['TT_CONFIG']['IS_ADMIN'] === '1'">
+                            <a class="ml-2" :href="window['TT_CONFIG']['EDIT_URL'] + '?id=' + campaign.id"><i class="far fa-edit" title="Bearbeiten"></i></a>
+                            <a class="ml-2" :href="window['TT_CONFIG']['ADMIN_URL'] + '?id=' + campaign.id"><i class="far fa-a" title="Adminfunktionen"></i></a>
+                        </template>
+                      </div>
+                    </template>
+                  </tt-table>
+                </tt-card>
+
+              `,
+
+    data() {
+        return {
+            window:                      window,
+            PreordercampaignTableConfig: {
+                key:             'PreordercampaignTable',
+                tableHeader:     'Vorbestellkampagnen',
+                defaultPageSize: 25,
+                headers:         [
+                    {text: 'Status', key: 'status', class: 'text-center',sortable: false,filter:false, priority: 20},
+                    {text: '', key: 'add', class: 'text-center',filter:false, sortable: false, priority: 18},
+                    {text: 'Netzgebiet', key: 'network_name', priority: 19},
+                    {text: 'Name', key: 'name', priority: 14},
+                    {text: 'Fortschritt', key: 'progress', priority: 17,filter:false,sortable: false},
+                    {text: 'Workorders', key: 'rimo_workoders', class: 'text-center', priority: 16,filter:false},
+                    {text: 'Von', key: 'from', class: 'text-center', priority: 13,filter:false,sortable: false},
+                    {text: 'Bis', key: 'to', class: 'text-center', priority: 12,filter:false,sortable: false},
+                    {text: 'Aktionen', key: 'actions', class: 'text-center', sortable: false, priority: 21,filter:false}
+                ],
+                customRowClass: (row) => {
+                    if (row.from <= Date.now()/1000 && row.to >= Date.now()/1000) {
+                        return 'active';
+                    }
+                }
+            }
+        }
+    },
+    mounted() {
+        if (window.TT_CONFIG.IS_ADMIN === "1") {
+            this.PreordercampaignTableConfig.headers.splice(3, 0, {text: 'Netzbesitzer', key: 'network_owner_name', priority: 4, filter: 'select', filterOptions: window['TT_CONFIG']['NETWORK_OWNER_OPTIONS']});
+        }
+    },
+    methods: {
+        formatDate:  date => window.moment(date * 1000).format('DD.MM.YYYY'),
+    }
+});
diff --git a/public/plugins/vue/tt-components/css/tt-table.css b/public/plugins/vue/tt-components/css/tt-table.css
index 02fa54d34..e52c028a5 100644
--- a/public/plugins/vue/tt-components/css/tt-table.css
+++ b/public/plugins/vue/tt-components/css/tt-table.css
@@ -83,7 +83,7 @@
 }
 
 .tt-table.table-sm > tbody > tr > td * {
-    font-size: 13px;
+    font-size: 14px;
 }
 
 .tt-table.table-sm > tbody > tr {
diff --git a/public/plugins/vue/tt-components/tt-table-crud.js b/public/plugins/vue/tt-components/tt-table-crud.js
index 0df34a368..2c1894797 100644
--- a/public/plugins/vue/tt-components/tt-table-crud.js
+++ b/public/plugins/vue/tt-components/tt-table-crud.js
@@ -66,8 +66,9 @@ Vue.component('tt-table-crud', {
                            <tt-select v-show="crudModalColumnVisibility[column.key]" v-else-if="column.type === 'select'" v-model="crudModalData[column.key]" :label="column.text" :options="column.items" sm row/>
                            <tt-autocomplete v-show="crudModalColumnVisibility[column.key]" v-else-if="column.type === 'autocomplete'" v-model="crudModalData[column.key]" :label="column.text" :api-url="column.apiUrl" :items="column.items" sm row :return-text="column.returnText" />
                            <tt-date-picker v-show="crudModalColumnVisibility[column.key]" v-else-if="column.type === 'datepicker'" v-model="crudModalData[column.key]" :label="column.text" sm row :date-range="false" :ref="column.key.toLowerCase() + '-modal-input'"/>
-                           <tt-icon-select v-show="crudModalColumnVisibility[column.key]" v-else-if="column.type === 'icon-select'" v-model="crudModalData[column.key]" :label="column.text" sm row/>
+                           <tt-icon-select v-show="crudModalColumnVisibility[column.key]" v-else-if="column.type === 'icon-select'" v-model="crudModalData[column.key]" :options="column.items" :label="column.text" sm row/>
                            <tt-checkbox v-show="crudModalColumnVisibility[column.key]" v-else-if="column.type === 'checkbox'" v-model="crudModalData[column.key]" :label="column.text" sm row/>
+                           <tt-positions-manager v-show="crudModalColumnVisibility[column.key]" v-else-if="column.type === 'positions-manager'" v-model="crudModalData[column.key]" :config="column.config" sm row/>
                          </slot>
                          <!-- @formatter:on -->
                        </template>
diff --git a/public/plugins/vue/tt-components/tt-table.js b/public/plugins/vue/tt-components/tt-table.js
index cde183b3b..f543b07a9 100644
--- a/public/plugins/vue/tt-components/tt-table.js
+++ b/public/plugins/vue/tt-components/tt-table.js
@@ -825,16 +825,16 @@ Vue.component('tt-table', {
     }
 })
 
-Vue.config.errorHandler = function (err, vm, info) {
-    // still log errors to the console
-    console.error(info, err, vm);
-
-    if (typeof vm.config.key === 'string') {
-        // check if document.querySelector table.tt-table exists aswell if it has atleast 3 <tr> elements
-        const table = document.querySelector('table.tt-table');
-        if (!table || !table.querySelectorAll('tr').length > 2) {
-            // localStorage.removeItem(`tt-table-${vm.config.key}`);
-            // window.location.reload();
-        }
-    }
-}
\ No newline at end of file
+// Vue.config.errorHandler = function (err, vm, info) {
+//     // still log errors to the console
+//     console.error(info, err, vm);
+//
+//     if (typeof vm.config.key === 'string') {
+//         // check if document.querySelector table.tt-table exists aswell if it has atleast 3 <tr> elements
+//         const table = document.querySelector('table.tt-table');
+//         if (!table || !table.querySelectorAll('tr').length > 2) {
+//             // localStorage.removeItem(`tt-table-${vm.config.key}`);
+//             // window.location.reload();
+//         }
+//     }
+// }
\ No newline at end of file