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

Merge branch 'spidev' into 'master'

Browse Source 
Zeiterfassung

See merge request fronk/thetool!851
This commit is contained in:
Daniel Spitzer
2024-12-30 07:49:24 +00:00
parent a91ab917cb 8100e9c8d3
commit 931548ecd2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/TimerecordingReport/Index.php
View File

@@ -24,7 +24,7 @@ ksort($timerecordingUsers);
for ($i = 1; $i <= 25; $i++) {
$kw = date('W', $time);
$year = date('Y', $time);
$year = date('o', $time);
$timestamp_montag = strtotime("{$year}-W{$kw}");
$timestamp_freitag = strtotime("{$year}-W{$kw}-7");

4
application/TimerecordingReport/TimerecordingReportController.php
View File

@@ -101,7 +101,7 @@ class TimerecordingReportController extends mfBaseController
if ($datatype == 1) {
$kw = date('W', $dataweek);
$year = date('Y', $dataweek);
$year = date('o', $dataweek);
$timestamp_montag = strtotime("{$year}-W{$kw}");
$timestamp_sonntag = strtotime("{$year}-W{$kw}-7");
$firstdate = strtotime(date("Y-m-d", $timestamp_montag) . " 00:00:00");
@@ -562,7 +562,7 @@ class TimerecordingReportController extends mfBaseController
if ($datatype == 1) {
$kw = date('W', $dataweek);
$year = date('Y', $dataweek);
$year = date(o, $dataweek);
$timestamp_montag = strtotime("{$year}-W{$kw}");
$timestamp_sonntag = strtotime("{$year}-W{$kw}-7");
$firstdate = strtotime(date("Y-m-d", $timestamp_montag) . " 00:00:00");