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

- replaced spaces by hyphens in lv group names

Browse Source 
- updated comment for getBenutzerFunktionen
This commit is contained in:
alex
2018-09-13 09:55:06 +02:00
parent 6695bf027e
commit 0916a27ecb
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Lehrveranstaltung_model.php
+1 -1
View File
@@ -88,7 +88,7 @@ class Lehrveranstaltung_model extends DB_Model
$query = "
SELECT lehrveranstaltung_id, ? || '_' || kuerzel || '_' || lvpostfix AS lvgroupname
SELECT lehrveranstaltung_id, ? || '_' || kuerzel || '_' || replace(lvpostfix, ' ', '-') AS lvgroupname
FROM(
SELECT DISTINCT ON (kuerzel, lvpostfix)
lehrveranstaltung_id,
application/models/person/Benutzerfunktion_model.php
+4 -2
View File
@@ -25,8 +25,10 @@ class Benutzerfunktion_model extends DB_Model
/**
* Gets all Benutzer for a given OE and specified Benutzerfunktionen
* @param $oe_kurzbz
* @param $funktion_kurzbz string with one benutzerfunktionname or array with one or more
* @param $oe_kurzbz
* @param bool $activeoeonly if true, retrieve only active Organisationseinheiten
* @param bool $activebenonly if true, retrieve only active Benutzer
* @return array|null
*/
public function getBenutzerFunktionen($funktion_kurzbz, $oe_kurzbz = null, $activeoeonly = false, $activebenonly = false)
@@ -41,7 +43,7 @@ class Benutzerfunktion_model extends DB_Model
if ($activebenonly === true)
$query .= " JOIN public.tbl_benutzer USING(uid)";
$query .= "WHERE (datum_von <= NOW() OR datum_von IS NULL) AND (datum_bis >= NOW() OR datum_bis IS NULL)";
$query .= " WHERE (datum_von <= NOW() OR datum_von IS NULL) AND (datum_bis >= NOW() OR datum_bis IS NULL)";
if (is_string($funktion_kurzbz))
{