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

Zeiterfassung

Browse Source 
Bugfix:
* PHP Date statt Y o genommen damit die Kalenderwoche sich auf das richtige Jahr bezieht
This commit is contained in:
Daniel Spitzer
2024-12-30 08:43:54 +01:00
parent 085d8facdc
commit 7e17983c9e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ $monthger[12] = "Dezember";
$time = time();
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");
$weeks[$time] = "KW" . $kw . " " . $year . " (" . date('d.m', $timestamp_montag) . "-" . date('d.m', $timestamp_freitag) . ")";

4
application/Timerecording/TimerecordingController.php
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");