diff --git a/plugin.manifest b/plugin.manifest index a5fa476c9fb1a2fa32689113a59fdcfe56d1f83b..a8383471d13f2e147a822f22024811b8930f8c11 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 97ffbcaf9e762d1bf7270b28747b7950879e2654..fbceb897c7b0dcdf315034b6d3fc9acacdf174ed 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>