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

Merge branch 'master' into feature-14811/neuer_adresstyp_fuer_homeoffice

Browse Source
This commit is contained in:
Andreas Österreicher
2022-01-03 13:45:34 +01:00
parent 525b8a04d3 e12e68c1c2
commit 7753ca8cf2
23 changed files with 582 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/person.class.php
+13 -2
View File
@@ -24,6 +24,7 @@
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/udf.class.php');
class person extends basis_db
{
@@ -64,6 +65,7 @@ class person extends basis_db
public $foto_sperre = false; // boolean
public $matr_nr; //varchar(32)
public $bpk; //varchar(255)
public $udf_values; //json
/**
* Konstruktor - Uebergibt die Connection und laedt optional eine Person
@@ -84,6 +86,8 @@ class person extends basis_db
**/
public function load($personId)
{
$udf = new UDF();
//person_id auf gueltigkeit pruefen
if (is_numeric($personId) && $personId != '')
{
@@ -91,8 +95,11 @@ class person extends basis_db
gebdatum, gebort, gebzeit, foto, anmerkung, homepage, svnr, ersatzkennzeichen,
familienstand, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id,
geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode, foto_sperre,
matr_nr, bpk
FROM public.tbl_person
matr_nr, bpk";
if ($hasUDF = $udf->personHasUDF())
$qry .= ", udf_values ";
$qry .= "FROM public.tbl_person
WHERE person_id = " . $this->db_add_param($personId, FHC_INTEGER);
if (!$this->db_query($qry))
@@ -135,6 +142,10 @@ class person extends basis_db
$this->foto_sperre = $this->db_parse_bool($row->foto_sperre);
$this->matr_nr = $row->matr_nr;
$this->bpk = $row->bpk;
if ($hasUDF)
{
$this->udf_values = $row->udf_values;
}
}
else
{
include/prestudent.class.php
+9
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();
@@ -73,6 +74,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;
@@ -1413,6 +1415,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())
@@ -1455,6 +1460,10 @@ class prestudent extends person
$obj->gsstudientyp_kurzbz = $row->gsstudientyp_kurzbz;
$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
$obj->priorisierung = $row->priorisierung;
if ($hasUDF)
{
$obj->udf_values = $row->udf_values;
}
$this->result[] = $obj;
}