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

Fixed SQL query: corrected column order in subquery for Projektbetreuung

Browse Source
This commit is contained in:
Cris
2019-09-25 16:25:04 +02:00
committed by hainberg
parent 6f5de6a786
commit 61a6bc7bfc
3 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+11 -9
View File
@@ -97,15 +97,8 @@ FROM
/* Projektbetreuungsaufträge and -vertragsstati */
SELECT *,
/* concatinated and aggregated gruppen */
(SELECT
string_agg(concat(stg_oe_kurzbz, \'-\', semester, verband, gruppe,
\'\n\' || gruppe_kurzbz), \', \')
FROM
lehre.tbl_lehreinheitgruppe
WHERE
lehreinheit_id = tmp_projektbetreuung.lehreinheit_id
) AS "gruppe",
/* mitarbeiter uid retrieved by person_id */
/* NOTE: mitarbeiter MUST come after Select * to ensure correct order with select for tmp_lehrauftraege*/
(SELECT
uid
FROM
@@ -113,6 +106,15 @@ FROM
WHERE
person_id = tmp_projektbetreuung.person_id
AND aktiv = TRUE) AS "mitarbeiter_uid",
/* concatinated and aggregated gruppen */
(SELECT
string_agg(concat(stg_oe_kurzbz, \'-\', semester, verband, gruppe,
\'\n\' || gruppe_kurzbz), \', \')
FROM
lehre.tbl_lehreinheitgruppe
WHERE
lehreinheit_id = tmp_projektbetreuung.lehreinheit_id
) AS "gruppe",
/* existing contracts with status bestellt */
(SELECT
datum
application/views/lehre/lehrauftrag/approveLehrauftragData.php
+11 -9
View File
@@ -95,15 +95,8 @@ FROM
/* Projektbetreuungsaufträge and -vertragsstati */
SELECT *,
/* concatinated and aggregated gruppen */
(SELECT
string_agg(concat(stg_oe_kurzbz, \'-\', semester, verband, gruppe,
\'\n\' || gruppe_kurzbz), \', \')
FROM
lehre.tbl_lehreinheitgruppe
WHERE
lehreinheit_id = tmp_projektbetreuung.lehreinheit_id
) AS "gruppe",
/* mitarbeiter uid retrieved by person_id */
/* NOTE: mitarbeiter MUST come after Select * to ensure correct order with select for tmp_lehrauftraege*/
(SELECT
uid
FROM
@@ -111,6 +104,15 @@ FROM
WHERE
person_id = tmp_projektbetreuung.person_id
AND aktiv = TRUE) AS "mitarbeiter_uid",
/* concatinated and aggregated gruppen */
(SELECT
string_agg(concat(stg_oe_kurzbz, \'-\', semester, verband, gruppe,
\'\n\' || gruppe_kurzbz), \', \')
FROM
lehre.tbl_lehreinheitgruppe
WHERE
lehreinheit_id = tmp_projektbetreuung.lehreinheit_id
) AS "gruppe",
/* existing contracts with status bestellt */
(SELECT
datum
application/views/lehre/lehrauftrag/lehrauftragData.php
+11 -9
View File
@@ -95,15 +95,8 @@ FROM
/* Projektbetreuungsaufträge and -vertragsstati */
SELECT *,
/* concatinated and aggregated gruppen */
(SELECT
string_agg(concat(stg_oe_kurzbz, \'-\', semester, verband, gruppe,
\'\n\' || gruppe_kurzbz), \', \')
FROM
lehre.tbl_lehreinheitgruppe
WHERE
lehreinheit_id = tmp_projektbetreuung.lehreinheit_id
) AS "gruppe",
/* mitarbeiter uid retrieved by person_id */
/* NOTE: mitarbeiter MUST come after Select * to ensure correct order with select for tmp_lehrauftraege*/
(SELECT
uid
FROM
@@ -111,6 +104,15 @@ FROM
WHERE
person_id = tmp_projektbetreuung.person_id
AND aktiv = TRUE) AS "mitarbeiter_uid",
/* concatinated and aggregated gruppen */
(SELECT
string_agg(concat(stg_oe_kurzbz, \'-\', semester, verband, gruppe,
\'\n\' || gruppe_kurzbz), \', \')
FROM
lehre.tbl_lehreinheitgruppe
WHERE
lehreinheit_id = tmp_projektbetreuung.lehreinheit_id
) AS "gruppe",
/* existing contracts with status bestellt */
(SELECT
datum