blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 09:52:22 +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/createAusbildungsvertrag.php
+4 -3
View File
@@ -16,8 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/* Erstellt einen Lehrauftrag im PDF Format
*
@@ -64,7 +65,7 @@ else
else
$uids = $_GET['uid'];
$qry = "SELECT student_uid, studiengang_kz FROM public.tbl_student WHERE student_uid=".$db->db_add_param($uids[1]);
$qry = "SELECT uid, studiengang_kz FROM public.tbl_prestudent WHERE uid=".$db->db_add_param($uids[1]);
if($result_std = $db->db_query($qry))
if($db->db_num_rows($result_std)==1)
{
content/pdfExport.php
+1 -1
View File
@@ -231,7 +231,7 @@ if($xsl=='AccountInfo')
}
}
$qry = "SELECT student_uid, studiengang_kz FROM public.tbl_student WHERE student_uid='".addslashes($uid)."'";
$qry = "SELECT uid, studiengang_kz FROM public.tbl_prestudent WHERE uid='".addslashes($uid)."'";
if($result_std = $db->db_query($qry))
{
if($db->db_num_rows($result_std)==1)
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 <andreas.oesterreicher@technikum-wien.at>
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
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))
{
content/student/studentDBDML.php
+9 -5
View File
@@ -135,13 +135,13 @@ function generateMatrikelnummer($studiengang_kz, $studiensemester_kurzbz)
$jahr = $jahr-1;
$matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz);
$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE '$matrikelnummer%' ORDER BY matrikelnr DESC LIMIT 1";
$qry = "SELECT perskz FROM public.tbl_prestudent WHERE perskz LIKE '$matrikelnummer%' ORDER BY perskz DESC LIMIT 1";
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
{
$max = substr($row->matrikelnr, (strlen(trim($row->matrikelnr))-3));
$max = substr($row->perskz, (strlen(trim($row->perskz))-3));
}
else
$max = 0;
@@ -1112,7 +1112,7 @@ if(!$error)
if($_POST['status_kurzbz']=='Student')
{
//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
@@ -1248,7 +1248,7 @@ if(!$error)
if($_POST['status_kurzbz']=='Student')
{
//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
@@ -3871,8 +3871,12 @@ if(!$error)
else
{
$return = false;
$errormsg = 'Unkown type: "'.$db->convert_html_chars($_POST['type']).'"';
$data = '';
if(isset($_POST['type']))
$errormsg = 'Unkown type: "'.$db->convert_html_chars($_POST['type']).'"';
else
$errormsg = 'no type provided';
}
}
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>