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

tbl_student changed to tbl_prestudent

Browse Source
This commit is contained in:
Andreas Moik
2016-05-18 09:11:17 +02:00
parent 1aa2756ea8
commit 249076bfcc
49 changed files with 3451 additions and 3884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/statistik/StudierendeZGV.php
+4 -5
View File
@@ -15,7 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]>
* Authors: Andreas Oesterreicher <[email protected]> and
* Andreas Moik <[email protected]>.
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/studiengang.class.php');
@@ -140,8 +141,7 @@ if($result_zgv = $db->db_query($qry))
FROM
public.tbl_prestudent a
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_student USING(prestudent_id)
WHERE
WHERE
bismelden=true
AND EXISTS (
SELECT
@@ -150,7 +150,6 @@ if($result_zgv = $db->db_query($qry))
public.tbl_prestudentstatus
WHERE
status_kurzbz='Student'
AND prestudent_id=a.prestudent_id
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
)
AND a.studiengang_kz=".$db->db_add_param($studiengang_kz,FHC_INTEGER)."
@@ -188,4 +187,4 @@ echo '</tbody>
</table>';
echo '</body>
</html>';
?>
?>
content/statistik/anwesenheitsliste.php
+3 -2
View File
@@ -88,7 +88,7 @@ if(isset($_GET['prestudent_id']))
$idstring.=',';
$idstring.="'$id'";
}
$qry = "SELECT distinct on(person_id) foto, vorname, nachname, person_id, prestudent_id, tbl_prestudent.studiengang_kz, semester, verband, gruppe FROM public.tbl_person JOIN public.tbl_prestudent USING(person_id) LEFT JOIN public.tbl_student USING(prestudent_id) WHERE prestudent_id in($idstring)";
$qry = "SELECT distinct on(person_id) foto, vorname, nachname, person_id, prestudent_id, tbl_prestudent.studiengang_kz, semester, verband, gruppe FROM public.tbl_person JOIN public.tbl_prestudent USING(person_id) WHERE prestudent_id in($idstring)";
}
else
{
@@ -96,7 +96,8 @@ else
distinct on(person_id) foto, vorname, nachname, person_id, tbl_studentlehrverband.studiengang_kz, tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe
FROM
campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_prestudent ON(tbl_prestudent.uid=tbl_benutzer.uid)
LEFT JOIN public.tbl_studentlehrverband USING(prestudent_id)
WHERE
lehrveranstaltung_id='".addslashes($lvid)."' AND
content/statistik/studentenexport.xls.php
+1 -1
View File
@@ -195,7 +195,7 @@ loadVariables($user);
if($prestudent_ids!='')
{
// Student holen
$qry = "SELECT *, (SELECT UPPER(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_prestudent.studiengang_kz) as stgbez FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student USING(prestudent_id) WHERE prestudent_id in($prestudent_ids) ORDER BY nachname, vorname";
$qry = "SELECT *, (SELECT UPPER(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_prestudent.studiengang_kz) as stgbez FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id) WHERE prestudent_id in($prestudent_ids) ORDER BY nachname, vorname";
if($result = $db->db_query($qry))
{