From 9cf34dd0de5f31dc095377202f9f1ff8bd2b6580 Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Tue, 20 Aug 2024 11:46:35 +0200
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Feature=20=20*=20Bugfix=20XLS?=
 =?UTF-8?q?=20Export=20Bereinigungen=20=20*=20Bugfix=20Richtige=20Datumsda?=
 =?UTF-8?q?rstellung=20von=20Krankenst=C3=A4nden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TimerecordingReport/TimerecordingReportController.php   | 2 +-
 public/js/pages/timerecordingReport/index.js                | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php
index 894d02267..284ea8750 100644
--- a/application/TimerecordingReport/TimerecordingReportController.php
+++ b/application/TimerecordingReport/TimerecordingReportController.php
@@ -271,7 +271,7 @@ class TimerecordingReportController extends mfBaseController
                     $hcounter++;
                 }
                 $hidedate .= "</span>";
-                $date = date("d.m.Y", $timerecording->start) . " - " . $daysgerm[date("w", time())] . " " . date("d.m.Y", time()) . $hidedate;;
+                $date = date("d.m", $timerecording->start) . " - " . $daysgerm[date("w", time())] . " " . date("d.m.Y", time()) . $hidedate;;
                 if ($timerecording->start > $lastdate) {
                     $hiderecording = 1;
                 }
diff --git a/public/js/pages/timerecordingReport/index.js b/public/js/pages/timerecordingReport/index.js
index 65bca1253..fb373d3e2 100644
--- a/public/js/pages/timerecordingReport/index.js
+++ b/public/js/pages/timerecordingReport/index.js
@@ -175,7 +175,13 @@ table = $('#datatable').DataTable({
                         exportOptions: {
                             columns: ['th:not(:last-child)'],
                             format: {
+                                header: function (data, row, column, node) {
+                                    console.log(data);
+                                    data = data.replace(/<.*>/g, '');
+                                    return data;
+                                },
                                 body: function (data, row, column, node) {
+                                    data = data.replace(/<span class='d-none'>.*<\/span>/g, '');
                                     data = $('<p>' + data + '</p>').text();
                                     return $.isNumeric(data.replace(',', '.')) ? data.replace(',', '.') : data;
                                 }