Merge branch 'spidev' into 'master'

Zeiterfassung Update

See merge request fronk/thetool!395

application/TimerecordingBilling/TimerecordingBillingController.php

@@ -336,6 +336,16 @@ class TimerecordingBillingController extends mfBaseController
                         fputcsv($file, $bodyarray, ";");
                     }
                 }
+                if ($timerecordingBillingEmployee->holidays>0) {
+                    //last day of month
+
+                    $month= strtotime("01." . $month);
+                    $monthend = date("d.m.Y", strtotime("last day of this month", $month));
+
+                    $bodyarray = [$companybmd, $employee_number, 1, "1", "", "4", $monthend, $monthend, $timerecordingBillingEmployee->holidays, '0'];
+                    fputcsv($file, $bodyarray, ";");
+
+                }
             }
             if ($timerecordingBillingEmployee->diet > 0 && $nlz == 0) {
                 $dietsum = round($timerecordingBillingEmployee->diet, 2);

application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeModel.php

@@ -19,6 +19,7 @@ class TimerecordingBillingEmployeeModel
     private $diet;
     private $nlz;
     private $nlz_detail;
+    private $holidays;
     private $transfer_plushours;
     private $transfer_overtime;
     private $transfer_bpahours;

application/TimerecordingReport/TimerecordingReportController.php

@@ -765,6 +765,12 @@ private $holidays ;
                 $end = "-";
                 $day = $daysgerm[date("w", $timerecording->start)];
                 $sum = $timerecording->days . " Tage";
+                if (!$daysum[$timerecording->timerecordingCategory->name]) {
+                    $daysum[$timerecording->timerecordingCategory->name] = $timerecording->days;
+                } else {
+                    $daysum[$timerecording->timerecordingCategory->name] = $daysum[$timerecording->timerecordingCategory->name] + $timerecording->days;
+                }
+
             } else if ($timerecording->timerecordingCategory->hourday == 6) {
                 $date = date("d.m.Y", $timerecording->start);
                 $datadate = date("Y-m-d", $timerecording->start);