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

Ferien: adapted StudienplanLib to new table structure with oe_kurzbz

Browse Source
This commit is contained in:
Alexei Karpenko
2026-03-16 11:14:29 +01:00
parent 0e4c7dcd14
commit 4a4731e619
2 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/StundenplanLib.php
+1 -5
View File
@@ -382,11 +382,7 @@ class StundenplanLib
$tz = new DateTimeZone($this->_ci->config->item('timezone'));
$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
SELECT *
FROM lehre.tbl_ferien
WHERE (bisdatum >= ? AND vondatum < ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
", [$start_date, $end_date, $studiengang_kz]);
$ferienEvents = $this->_ci->FerienModel->getByDateRange($start_date, $end_date, $studiengang_kz);
if (isError($ferienEvents))
return $ferienEvents;
application/models/organisation/Ferien_model.php
+52
View File
@@ -11,4 +11,56 @@ class Ferien_model extends DB_Model
$this->dbTable = 'lehre.tbl_ferien';
$this->pk = 'ferien_id';
}
/**
* Loads all Ferien between two dates.
* @param $vondatum
* @param $bisdatum
* @param $studiengang_kz by default, loads only Ferien from oe of 0 Studiengang (and parents)
* @return object success or error
*/
public function getByDateRange($vondatum, $bisdatum, $studiengang_kz = 0)
{
if (!is_numeric($studiengang_kz)) return error("Invalid Studiengang Kz");
if (!is_valid_date($vondatum)) return error("Invalid von date");
if (!is_valid_date($bisdatum)) return error("Invalid bis date");
// get oe from studiengang
$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
$result = $this->StudiengangModel->loadWhere(['studiengang_kz' => $studiengang_kz]);
if (isError($result)) return $result;
if (!hasData($result)) return success([]);
$oe_kurzbz = getData($result)[0]->oe_kurzbz;
// get all parents oes
$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
$result = $this->OrganisationseinheitModel->getParents($oe_kurzbz);
if (isError($result)) return $result;
if (!hasData($result)) return success([]);
$parents = array_column(getData($result), 'oe_kurzbz');
// get ferien - use oe_kurzbz, if "old" ferien without oe, use studiengang
$qry = "
SELECT
*
FROM
lehre.tbl_ferien
WHERE
(bisdatum >= ? AND vondatum < ?)
AND (CASE
WHEN oe_kurzbz IS NOT NULL
THEN oe_kurzbz IN ?
ELSE
studiengang_kz=0
OR studiengang_kz=?
END)
ORDER BY
vondatum";
return $this->execReadOnlyQuery($qry, [$vondatum, $bisdatum, $parents, $studiengang_kz]);
}
}