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 .= ""; - $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>/g, ''); data = $('

' + data + '

').text(); return $.isNumeric(data.replace(',', '.')) ? data.replace(',', '.') : data; }