From cb2bc491343b5f605acda5ce3a4578800865a289 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Wed, 15 Jul 2020 13:11:09 +0200
Subject: [PATCH] fix start week day
---
plugin.manifest | 2 +-
views/copy/semester_start_und_ende.php | 16 ++++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/plugin.manifest b/plugin.manifest
index a5fa476..a838347 100755
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,6 +1,6 @@
pluginname=CourseCopy
pluginclassname=CourseCopy
-version=1.5
+version=1.5.1
origin=data-quest
studipMinVersion=4.0
studipMaxVersion=4.99.99
diff --git a/views/copy/semester_start_und_ende.php b/views/copy/semester_start_und_ende.php
index 97ffbca..fbceb89 100755
--- a/views/copy/semester_start_und_ende.php
+++ b/views/copy/semester_start_und_ende.php
@@ -2,9 +2,13 @@
<?= _("Startwoche") ?>
<select name="week_offset">
<? $i = 0 ?>
- <? while ($semester['vorles_beginn'] + 86400 * 7 * $i < $semester['vorles_ende']) : ?>
+ <? while ($semester['vorles_beginn'] + 43200 + 86400 * 7 * $i < $semester['vorles_ende']) : ?>
<option value="<?= $i ?>"<?= UserConfig::get($GLOBALS['user']->id)->COURSECOPY_SETTINGS_WEEK_OFFSET == $i ? " checked" : "" ?>>
- <?= sprintf(_("%s. Semesterwoche (ab %s)"), $i + 1, date("d.m.Y", $semester['vorles_beginn'] + 86400 * 7 * $i)) ?>
+ <?
+ $timestamp = $semester['vorles_beginn'] + 43200 + 86400 * 7 * $i;
+ $timestamp = $timestamp - ((date("w", $timestamp) - 1) % 7) * 86400;
+ ?>
+ <?= sprintf(_("%s. Semesterwoche (ab %s)"), $i + 1, date("d.m.Y", $timestamp)) ?>
</option>
<? $i++ ?>
<? endwhile ?>
@@ -20,9 +24,13 @@
<? $i = floor(($semester['vorles_ende'] - $semester['vorles_beginn']) / (86400 * 7)) - 1 ?>
<? while ($i >= 0) : ?>
<option value="<?= $i ?>"<?= UserConfig::get($GLOBALS['user']->id)->COURSECOPY_SETTINGS_END_OFFSET == $i ? " checked" : "" ?>>
- <?= sprintf(_("%s. Semesterwoche (ab %s)"), $i + 1, date("d.m.Y", $semester['vorles_beginn'] + 86400 * 7 * $i)) ?>
+ <?
+ $timestamp = $semester['vorles_beginn'] + 43200 + 86400 * 7 * $i;
+ $timestamp = $timestamp - ((date("w", $timestamp) - 1) % 7) * 86400;
+ ?>
+ <?= sprintf(_("%s. Semesterwoche (ab %s)"), $i + 1, date("d.m.Y", $timestamp)) ?>
</option>
<? $i-- ?>
<? endwhile ?>
</select>
-</label>
\ No newline at end of file
+</label>
--
GitLab