Merge branch 'spidev' into 'master'

Zeiterfassung Update

See merge request fronk/thetool!1838

Layout/default/Timerecording/Index.php

@@ -30,14 +30,19 @@ $monthger = [
 
 $month = [];
 $date = new DateTime('first day of this month');
+$time = time();
+$timenow = $time;
 
-for ($i = 1; $i <= 12; $i++) {
+$time = strtotime('first day of this month', $time);
-    $mon = $date->format('n');
+$time = strtotime('+3 month', $time);
-    $year = $date->format('Y');
+for ($i = 1; $i <= 15; $i++) {
-    $month[$date->getTimestamp()] = $monthger[$mon] . " " . $year;
+    $mon = date('n', $time);
-    $date->modify('-1 month');
+    $year = date('Y', $time);
+    $month[$time] = $monthger[$mon] . " " . $year;
+    $time = strtotime('-1 month', $time);
 }
 
+
 $years[time() + 31536000] = date('Y', time() + 31536000);
 $years[time()] = date('Y', time());
 $years[time() - 31536000] = date('Y', time() - 31536000);
@@ -305,7 +310,8 @@ $mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth));
                             <div class="input-group">
                                 <select id="datamonth" class="form-control select2">
                                     <?php foreach ($month as $key => $Month): ?>
-                                        <option value="<?= $key ?>"><?= $Month ?></option>
+                                        <option <?= (date("Y-m", $timenow) == date("Y-m", $key)) ? 'selected="selected"' : '' ?>
+                                                value="<?= $key ?>"><?= $Month ?></option>
                                     <?php endforeach; ?>
                                 </select>
                             </div>

public/assets/css/datatables-std.css

@@ -158,8 +158,8 @@ table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) {
 
 .display-calendar {
     color: #0d6efd;
-    font-size: 30px;
+    font-size: 28px;
-    margin-right: 10px;
+    margin-right: 0;
     cursor: pointer;
 }
 

public/js/pages/Calendar/View.js

@@ -99,9 +99,9 @@ function reinitializeAttendeesSelect() {
     // ÄNDERUNG: Verstecke/Deaktiviere Teilnehmer-Zeile wenn keine Microsoft-ID
     if (hasMicrosoftId == '0' || hasMicrosoftId === 0 || !hasMicrosoftId) {
         // Verstecke die gesamte Teilnehmer-Zeile
-        $('#calendar-attendees').closest('.row').hide();
+        // $('#calendar-attendees').closest('.row').hide();
-        // Optional: Leere auch die Auswahl
+        // // Optional: Leere auch die Auswahl
-        $('#calendar-attendees').val(null).trigger('change');
+        // $('#calendar-attendees').val(null).trigger('change');
         return; // Beende Funktion früh
     } else {
         // Zeige die Teilnehmer-Zeile wieder an