Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Zeiterfassung Feature

Browse Source 
* Bugfix XLS Export Bereinigungen
 * Bugfix Richtige Datumsdarstellung von Krankenständen
This commit is contained in:
Daniel Spitzer
2024-08-20 11:46:35 +02:00
parent 35e2a47fea
commit 9cf34dd0de
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/TimerecordingReport/TimerecordingReportController.php
View File

@@ -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;
}

6
public/js/pages/timerecordingReport/index.js
View File

@@ -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;
}