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!850
This commit is contained in:
Daniel Spitzer
2024-12-30 07:44:31 +00:00
parent f0092630bb 7e17983c9e
commit a91ab917cb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Timerecording/TimerecordingController.php
+2 -2
View File
@@ -687,7 +687,7 @@ class TimerecordingController 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");
@@ -1068,7 +1068,7 @@ class TimerecordingController extends mfBaseController
$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");