Merge branch 'spidev' into 'master'

Zeiterfassung

See merge request fronk/thetool!750

Layout/default/TimerecordingCalendar/Index.php

@@ -186,12 +186,13 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
             color: #fff;
         }
 
-        .fa-window-maximize, .fa-window-restore{
+        .fa-window-maximize, .fa-window-restore {
             font-size: 20px;
             cursor: pointer;
             color: #323a36;
 
         }
+
         .card-fullscreen {
             display: block;
             z-index: 1040;
@@ -219,7 +220,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
     <script>
         var calendar;
         document.addEventListener('DOMContentLoaded', function () {
-            let requestUrl = "<?= self::getUrl("TimerecordingReport", "api", ['do' => 'getTimerecordings', 'datatype' => '3', 'datayear' => time()]) ?>";
+            let requestUrl = "<?= self::getUrl("TimerecordingReport", "api", ['do' => 'getTimerecordings', 'datatype' => '3', 'datayear' => time(),'calendar'=>'1']) ?>";
             var cindex = 1;
             var holiDays = [];
             var birthdays = [];
@@ -338,6 +339,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
                 var initialLocaleCode = 'en';
                 var calendarEl = document.getElementById('calendar');
                 calendar = new FullCalendar.Calendar(calendarEl, {
+                    schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
                     locale: 'de',
                     themeSystem: 'bootstrap4',
                     headerToolbar: {

application/TimerecordingReport/TimerecordingReportController.php

@@ -38,11 +38,17 @@ class TimerecordingReportController extends mfBaseController
         $dataweek = $this->request->dataweek;
         $datamonth = $this->request->datamonth;
         $datayear = $this->request->datayear;
+        $calendar = $this->request->calendar;
+        if ($calendar) {
+            $calendar = 1;
+        } else {
+            $calendar = 0;
+        }
         $data = [];
 
         switch ($do) {
             case "getTimerecordings":
-                $return = $this->getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear);
+                $return = $this->getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear, $calendar);
                 break;
             case "getTimerecordingsTimes":
                 $return = $this->getTimerecordingsTimes($datatype, $dataweek, $datamonth, $datayear);
@@ -60,7 +66,8 @@ class TimerecordingReportController extends mfBaseController
         $this->returnJson($data);
     }
 
-    public function getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear)
+    public
+    function getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear, $calendar = 0)
     {
         $mustSeconds = 0;
         $isSeconds = 0;
@@ -131,6 +138,9 @@ class TimerecordingReportController extends mfBaseController
             $lastdate = strtotime(date("Y-12-31 23:59:59", $datayear));
             $daycount = date("t", $datamonth);
             $lastdate = strtotime(date("Y-m-d", $lastdate) . ' 23:59:59');
+            if ($calendar == "1") {
+                $lastdate = strtotime(" +3 years", $lastdate);
+            }
             $searchArray = ['start' => $firstdate, 'end' => $lastdate];
             $timestamp = $firstdate;