Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt

This commit is contained in:
Andreas Österreicher
2022-01-07 11:27:41 +01:00
109 changed files with 59864 additions and 54560 deletions
+11
View File
@@ -26,6 +26,7 @@ require_once(dirname(__FILE__).'/log.class.php');
require_once(dirname(__FILE__).'/phrasen.class.php');
require_once(dirname(__FILE__).'/globals.inc.php');
require_once(dirname(__FILE__).'/sprache.class.php');
require_once(dirname(__FILE__).'/udf.class.php');
$sprache = getSprache();
$lang = new sprache();
@@ -76,6 +77,7 @@ class prestudent extends person
public $priorisierung = null;
public $foerderrelevant = null;
public $standort_code = null;
public $udf_values = null;
public $status_kurzbz;
public $studiensemester_kurzbz;
@@ -1449,6 +1451,9 @@ class prestudent extends person
person_id=".$this->db_add_param($person_id, FHC_INTEGER)."
ORDER BY prestudent_id";
$udf = new UDF();
$hasUDF = $udf->prestudentHasUDF();
if($this->db_query($qry))
{
while($row = $this->db_fetch_object())
@@ -1495,6 +1500,12 @@ class prestudent extends person
$obj->priorisierung = $row->priorisierung;
$obj->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;
if ($hasUDF)
{
$obj->udf_values = $row->udf_values;
}
$this->result[] = $obj;
}
return true;