mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 08:34:29 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5c882a4658 |
@@ -424,15 +424,12 @@ class Person_model extends DB_Model
|
||||
public function loadAllStudentUIDSForPersonID($person_id) {
|
||||
$qry = "SELECT
|
||||
CONCAT(tp.vorname, ' ', tp.nachname) AS name,
|
||||
ARRAY_AGG(DISTINCT b.uid ORDER BY b.uid) AS uids,
|
||||
ARRAY_AGG(DISTINCT CONCAT(stg.typ, stg.kurzbz)) AS stg_oes,
|
||||
s.semester
|
||||
ARRAY_AGG(DISTINCT b.uid ORDER BY b.uid) AS uids
|
||||
FROM public.tbl_student s
|
||||
JOIN public.tbl_benutzer b ON s.student_uid = b.uid
|
||||
JOIN public.tbl_person tp ON b.person_id = tp.person_id
|
||||
JOIN public.tbl_studiengang stg ON s.studiengang_kz = stg.studiengang_kz
|
||||
GROUP BY tp.vorname, tp.nachname, b.aktiv, b.person_id, s.semester
|
||||
HAVING b.person_id = ? AND b.aktiv IS TRUE";
|
||||
GROUP BY tp.vorname, tp.nachname, b.aktiv, b.person_id
|
||||
HAVING b.person_id = ? AND b.aktiv IS TRUE;";
|
||||
|
||||
return $this->execReadOnlyQuery($qry, [$person_id]);
|
||||
}
|
||||
|
||||
@@ -197,11 +197,14 @@ else if (isset($_SESSION['pruefling_id']))
|
||||
)
|
||||
|
||||
|
||||
SELECT DISTINCT ON
|
||||
SELECT *
|
||||
FROM
|
||||
(SELECT DISTINCT ON
|
||||
(gebiet_id, semester, reihung)
|
||||
semester,
|
||||
gebiet_id,
|
||||
STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
|
||||
MIN(studiengang_kz) AS sort_stg,
|
||||
bezeichnung,
|
||||
MIN(reihung) AS reihung,
|
||||
". $bezeichnung_mehrsprachig_sel. "
|
||||
@@ -274,6 +277,11 @@ else if (isset($_SESSION['pruefling_id']))
|
||||
ORDER BY
|
||||
semester,
|
||||
reihung,
|
||||
gebiet_id) tmp3
|
||||
ORDER BY
|
||||
semester,
|
||||
sort_stg,
|
||||
reihung,
|
||||
gebiet_id
|
||||
";
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 88 KiB |
@@ -35089,26 +35089,6 @@ array(
|
||||
)
|
||||
)
|
||||
),
|
||||
array(
|
||||
'app' => 'anwesenheiten',
|
||||
'category' => 'global',
|
||||
'phrase' => 'oldEntsWithoutDocumentFound',
|
||||
'insertvon' => 'system',
|
||||
'phrases' => array(
|
||||
array(
|
||||
'sprache' => 'German',
|
||||
'text' => 'Alte Entschuldigungen ohne Dateiupload gefunden',
|
||||
'description' => '',
|
||||
'insertvon' => 'system'
|
||||
),
|
||||
array(
|
||||
'sprache' => 'English',
|
||||
'text' => 'Old excuse notes without file upload detected',
|
||||
'description' => '',
|
||||
'insertvon' => 'system'
|
||||
)
|
||||
)
|
||||
),
|
||||
//
|
||||
// DIGITALE ANWESENHEITEN PHRASEN END
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user