blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Studienjahr model: set different default values for getAktOrNextStudienjahr und getLastOrAktStudienjahr, changed getAktOrNextStudienjahr to really return current or next semester

Browse Source
This commit is contained in:
Alexei Karpenko
2026-03-16 11:22:43 +01:00
parent 28abf64798
commit 0cedf5b42a
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/organisation/Studienjahr_model.php
+18 -14
View File
@@ -53,11 +53,9 @@ class Studienjahr_model extends DB_Model
* @param int $days
* @return array|stdClass|null
*/
public function getLastOrAktStudienjahr($days = 60)
public function getLastOrAktStudienjahr($days = 0)
{
if (!is_numeric($days)) {
$days = 60;
}
$days = is_numeric($days) ? $this->escape($days) : 0;
$query = '
SELECT *
@@ -77,19 +75,25 @@ class Studienjahr_model extends DB_Model
* @param int $days
* @return array|stdClass|null
*/
public function getAktOrNextStudienjahr($days = 62)
public function getAktOrNextStudienjahr($days = 0)
{
if (!is_numeric($days)) {
$days = 62;
}
$days = is_numeric($days) ? $this->escape($days) : 0;
$query = '
SELECT *
FROM public.tbl_studienjahr
JOIN public.tbl_studiensemester using(studienjahr_kurzbz)
WHERE start < NOW() + \'' . $days . ' DAYS\'::INTERVAL
ORDER by start DESC
LIMIT 1
SELECT * FROM (
SELECT
jahr.*, MIN(sem.start) AS beginn, MAX(sem.ende) AS ende
FROM
public.tbl_studienjahr jahr
JOIN public.tbl_studiensemester sem using(studienjahr_kurzbz)
GROUP BY
studienjahr_kurzbz
) jahre
WHERE
ende >= NOW() + \'' . $days . ' DAYS\'::INTERVAL
ORDER BY
ende
LIMIT 1
';
return $this->execQuery($query);