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

Merge branch 'master' into bug-18663/fas_filter_zgv_erfuellt_zeigt_keine_daten_an

Browse Source
This commit is contained in:
Andreas Österreicher
2022-04-11 18:40:32 +02:00
parent 02330db5ec 9000cf0943
commit 68e81d1eb6
7 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/adresse.class.php
-26
View File
@@ -53,8 +53,6 @@ class adresse extends basis_db
public $rechnungsadresse=false; // boolean
public $anmerkung; // string
public $co_name;
public $adressentyp;
public $bezeichnung;
public $bezeichnung_mehrsprachig;
/**
@@ -523,29 +521,5 @@ class adresse extends basis_db
}
return true;
}
public function getAdressentyp()
{
$qry = "SELECT * FROM public.tbl_adressentyp ORDER BY sort";
if($this->db_query($qry))
{
while($row = $this->db_fetch_object())
{
$obj = new adresse();
$obj->adressentyp = $row->adressentyp_kurzbz;
$obj->bezeichnung = $row->bezeichnung;
$this->result[] = $obj;
}
return true;
}
else
{
$this->errormsg = 'Fehler beim Laden der Daten';
return false;
}
}
}
?>
include/adressentyp.class.php
+41
View File
@@ -0,0 +1,41 @@
<?php
require_once(dirname(__FILE__) . '/basis_db.class.php');
class adressentyp extends basis_db {
public $result = array();
public $adressentyp;
public $bezeichnung;
public function __construct()
{
parent::__construct();
}
public function getAll()
{
$qry = "SELECT * FROM public.tbl_adressentyp ORDER BY sort";
if($this->db_query($qry))
{
while($row = $this->db_fetch_object())
{
$obj = new adressentyp();
$obj->adressentyp = $row->adressentyp_kurzbz;
$obj->bezeichnung = $row->bezeichnung;
$this->result[] = $obj;
}
return true;
}
else
{
$this->errormsg = 'Fehler beim Laden der Daten';
return false;
}
}
}
?>
include/prestudent.class.php
+5 -1
View File
@@ -2504,10 +2504,14 @@ class prestudent extends person
$qry = "SELECT
UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as kuerzel
FROM
public.tbl_prestudent
public.tbl_prestudent pt
JOIN public.tbl_prestudentstatus USING (prestudent_id)
JOIN public.tbl_studiengang USING (studiengang_kz)
WHERE person_id = ".$this->db_add_param($person_id, FHC_INTEGER)."
AND NOT EXISTS
(SELECT * FROM public.tbl_prestudentstatus ps
WHERE ps.prestudent_id = pt.prestudent_id
AND status_kurzbz = 'Abbrecher' )
AND status_kurzbz in ('Absolvent','Diplomand','Unterbrecher','Student')
AND typ in ('b','m','d')
ORDER BY status_kurzbz ASC