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

Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt

Browse Source
This commit is contained in:
Andreas Österreicher
2021-10-15 18:30:28 +02:00
parent 4274a92854 9dcf948e7e
commit 8801b84fd3
160 changed files with 11782 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/prestudent.class.php
+61 -48
View File
@@ -44,12 +44,12 @@ class prestudent extends person
public $zgvort;
public $zgvdatum;
public $zgvnation;
public $zgv_erfuellt;
public $zgv_erfuellt;
public $zgvmas_code;
public $zgvmaort;
public $zgvmadatum;
public $zgvmanation;
public $zgvmas_erfuellt;
public $zgvmas_erfuellt;
public $ausstellungsstaat;
public $aufnahmeschluessel;
public $facheinschlberuf;
@@ -70,10 +70,12 @@ class prestudent extends person
public $zgvdoktorort;
public $zgvdoktordatum;
public $zgvdoktornation;
public $zgvdoktor_erfuellt;
public $zgvdoktor_erfuellt;
public $gsstudientyp_kurzbz='Intern';
public $aufnahmegruppe_kurzbz;
public $priorisierung = null;
public $foerderrelevant = null;
public $standort_code = null;
public $status_kurzbz;
public $studiensemester_kurzbz;
@@ -140,12 +142,12 @@ class prestudent extends person
$this->zgvort = $row->zgvort;
$this->zgvdatum = $row->zgvdatum;
$this->zgvnation = $row->zgvnation;
$this->zgv_erfuellt = $row->zgv_erfuellt;
$this->zgv_erfuellt = $row->zgv_erfuellt;
$this->zgvmas_code = $row->zgvmas_code;
$this->zgvmaort = $row->zgvmaort;
$this->zgvmadatum = $row->zgvmadatum;
$this->zgvmanation = $row->zgvmanation;
$this->zgvmas_erfuellt = $row->zgvmas_erfuellt;
$this->zgvmas_erfuellt = $row->zgvmas_erfuellt;
$this->aufnahmeschluessel = $row->aufnahmeschluessel;
$this->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
$this->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -166,10 +168,12 @@ class prestudent extends person
$this->zgvdoktorort = $row->zgvdoktorort;
$this->zgvdoktordatum = $row->zgvdoktordatum;
$this->zgvdoktornation = $row->zgvdoktornation;
$this->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;
$this->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;
$this->gsstudientyp_kurzbz = $row->gsstudientyp_kurzbz;
$this->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
$this->priorisierung = $row->priorisierung;
$this->foerderrelevant = $this->db_parse_bool($row->foerderrelevant);
$this->standort_code = $row->standort_code;
if(!person::load($row->person_id))
return false;
@@ -257,12 +261,13 @@ class prestudent extends person
{
$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id,
studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvnation, zgv_erfuellt,
zgvmas_code, zgvmaort, zgvmadatum, zgvmanation, zgvmas_erfuellt, zgvdoktor_code, zgvdoktorort, zgvdoktordatum,
zgvmas_code, zgvmaort, zgvmadatum, zgvmanation, zgvmas_erfuellt, zgvdoktor_code, zgvdoktorort, zgvdoktordatum,
zgvdoktornation,aufnahmeschluessel, facheinschlberuf,
reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte,
rt_punkte1, rt_punkte2, rt_punkte3, bismelden, insertamum, insertvon,
updateamum, updatevon, anmerkung, dual, ausstellungsstaat, mentor,
gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung,zgvdoktor_erfuellt) VALUES('.
gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, priorisierung, zgvdoktor_erfuellt, foerderrelevant, standort_code) VALUES('.
$this->db_add_param($this->aufmerksamdurch_kurzbz).",".
$this->db_add_param($this->person_id).",".
$this->db_add_param($this->studiengang_kz).",".
@@ -272,7 +277,7 @@ class prestudent extends person
$this->db_add_param($this->zgvort).",".
$this->db_add_param($this->zgvdatum).",".
$this->db_add_param($this->zgvnation).",".
$this->db_add_param($this->zgv_erfuellt).",".
$this->db_add_param($this->zgv_erfuellt).",".
$this->db_add_param($this->zgvmas_code).",".
$this->db_add_param($this->zgvmaort).",".
$this->db_add_param($this->zgvmadatum).",".
@@ -281,7 +286,7 @@ class prestudent extends person
$this->db_add_param($this->zgvdoktor_code).",".
$this->db_add_param($this->zgvdoktorort).",".
$this->db_add_param($this->zgvdoktordatum).",".
$this->db_add_param($this->zgvdoktornation).",".
$this->db_add_param($this->zgvdoktornation).",".
$this->db_add_param($this->aufnahmeschluessel).",".
$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
$this->db_add_param($this->reihungstest_id).",".
@@ -303,7 +308,9 @@ class prestudent extends person
$this->db_add_param($this->gsstudientyp_kurzbz).",".
$this->db_add_param($this->aufnahmegruppe_kurzbz).",".
$this->db_add_param($this->priorisierung).",".
$this->db_add_param($this->zgvdoktor_erfuellt).");";
$this->db_add_param($this->zgvdoktor_erfuellt).",".
$this->db_add_param($this->foerderrelevant, FHC_BOOLEAN).",".
$this->db_add_param($this->standort_code).");";
}
else
{
@@ -317,7 +324,7 @@ class prestudent extends person
' zgvort='.$this->db_add_param($this->zgvort).",".
' zgvdatum='.$this->db_add_param($this->zgvdatum).",".
' zgvnation='.$this->db_add_param($this->zgvnation).",".
' zgv_erfuellt='.$this->db_add_param($this->zgv_erfuellt).",".
' zgv_erfuellt='.$this->db_add_param($this->zgv_erfuellt).",".
' zgvmas_code='.$this->db_add_param($this->zgvmas_code).",".
' zgvmaort='.$this->db_add_param($this->zgvmaort).",".
' zgvmadatum='.$this->db_add_param($this->zgvmadatum).",".
@@ -326,7 +333,7 @@ class prestudent extends person
' zgvdoktor_code='.$this->db_add_param($this->zgvdoktor_code).",".
' zgvdoktorort='.$this->db_add_param($this->zgvdoktorort).",".
' zgvdoktordatum='.$this->db_add_param($this->zgvdoktordatum).",".
' zgvdoktornation='.$this->db_add_param($this->zgvdoktornation).",".
' zgvdoktornation='.$this->db_add_param($this->zgvdoktornation).",".
' aufnahmeschluessel='.$this->db_add_param($this->aufnahmeschluessel).",".
' facheinschlberuf='.$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
' reihungstest_id='.$this->db_add_param($this->reihungstest_id).",".
@@ -346,7 +353,9 @@ class prestudent extends person
' ausstellungsstaat='.$this->db_add_param($this->ausstellungsstaat).",".
' aufnahmegruppe_kurzbz='.$this->db_add_param($this->aufnahmegruppe_kurzbz).",".
' priorisierung='.$this->db_add_param($this->priorisierung).",".
' zgvdoktor_erfuellt='.$this->db_add_param($this->zgvdoktor_erfuellt).' '.
' zgvdoktor_erfuellt='.$this->db_add_param($this->zgvdoktor_erfuellt).', '.
' foerderrelevant='.$this->db_add_param($this->foerderrelevant, FHC_BOOLEAN).",".
' standort_code='.$this->db_add_param($this->standort_code)." ".
" WHERE prestudent_id=".$this->db_add_param($this->prestudent_id).";";
}
@@ -827,7 +836,7 @@ class prestudent extends person
elseif($stg_obj->typ=='p')
$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null AND a.zgvdoktor_erfuellt = 't'";
else
$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null AND a.zgv_erfuellt = 't'";
$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null AND a.zgv_erfuellt = 't'";
break;
case "reihungstestangemeldet":
$qry.="
@@ -924,7 +933,7 @@ class prestudent extends person
$ps->zgvort = $row->zgvort;
$ps->zgvdatum = $row->zgvdatum;
$ps->zgvnation = $row->zgvnation;
$ps->zgv_erfuellt = $row->zgv_erfuellt;
$ps->zgv_erfuellt = $row->zgv_erfuellt;
$ps->zgvmas_code = $row->zgvmas_code;
$ps->zgvmaort = $row->zgvmaort;
$ps->zgvmadatum = $row->zgvmadatum;
@@ -934,7 +943,7 @@ class prestudent extends person
$ps->zgvdoktorort = $row->zgvdoktorort;
$ps->zgvdoktordatum = $row->zgvdoktordatum;
$ps->zgvdoktornation = $row->zgvdoktornation;
$ps->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;
$ps->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;
$ps->ausstellungsstaat = $row->ausstellungsstaat;
$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
@@ -951,6 +960,8 @@ class prestudent extends person
$ps->gsstudientyp_kurzbz = $row->gsstudientyp_kurzbz;
$ps->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
$ps->priorisierung = $row->priorisierung;
$ps->foerderrelevant = $row->foerderrelevant;
$ps->standort_code = $row->standort_code;
$ps->status_kurzbz = $row->status_kurzbz;
$ps->studiensemester_kurzbz = $row->studiensemester_kurzbz;
@@ -1113,23 +1124,23 @@ class prestudent extends person
studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon,
updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, anmerkung,
bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id) VALUES('.
$this->db_add_param($this->prestudent_id).",".
$this->db_add_param($this->status_kurzbz).",".
$this->db_add_param($this->studiensemester_kurzbz).",".
$this->db_add_param($this->ausbildungssemester).",".
$this->db_add_param($this->datum).",".
$this->db_add_param($this->insertamum).",".
$this->db_add_param($this->insertvon).",".
$this->db_add_param($this->updateamum).",".
$this->db_add_param($this->updatevon).",".
$this->db_add_param($this->ext_id_prestudent).",".
$this->db_add_param($this->orgform_kurzbz).",".
$this->db_add_param($this->bestaetigtam).",".
$this->db_add_param($this->bestaetigtvon).",".
$this->db_add_param($this->anmerkung_status).",".
$this->db_add_param($this->bewerbung_abgeschicktamum).",".
$this->db_add_param($this->studienplan_id,FHC_INTEGER).",".
$this->db_add_param($this->rt_stufe,FHC_INTEGER).",".
$this->db_add_param($this->prestudent_id).",".
$this->db_add_param($this->status_kurzbz).",".
$this->db_add_param($this->studiensemester_kurzbz).",".
$this->db_add_param($this->ausbildungssemester).",".
$this->db_add_param($this->datum).",".
$this->db_add_param($this->insertamum).",".
$this->db_add_param($this->insertvon).",".
$this->db_add_param($this->updateamum).",".
$this->db_add_param($this->updatevon).",".
$this->db_add_param($this->ext_id_prestudent).",".
$this->db_add_param($this->orgform_kurzbz).",".
$this->db_add_param($this->bestaetigtam).",".
$this->db_add_param($this->bestaetigtvon).",".
$this->db_add_param($this->anmerkung_status).",".
$this->db_add_param($this->bewerbung_abgeschicktamum).",".
$this->db_add_param($this->studienplan_id,FHC_INTEGER).",".
$this->db_add_param($this->rt_stufe,FHC_INTEGER).",".
$this->db_add_param($this->statusgrund_id, FHC_INTEGER).");";
}
else
@@ -1453,12 +1464,12 @@ class prestudent extends person
$obj->zgvort = $row->zgvort;
$obj->zgvdatum = $row->zgvdatum;
$obj->zgvnation = $row->zgvnation;
$obj->zgv_erfuellt = $row->zgv_erfuellt;
$obj->zgv_erfuellt = $row->zgv_erfuellt;
$obj->zgvmas_code = $row->zgvmas_code;
$obj->zgvmaort = $row->zgvmaort;
$obj->zgvmadatum = $row->zgvmadatum;
$obj->zgvmanation = $row->zgvmanation;
$obj->zgvmas_erfuellt = $row->zgvmas_erfuellt;
$obj->zgvmas_erfuellt = $row->zgvmas_erfuellt;
$obj->aufnahmeschluessel = $row->aufnahmeschluessel;
$obj->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
$obj->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -1478,12 +1489,12 @@ class prestudent extends person
$obj->zgvdoktor_code = $row->zgvdoktor_code;
$obj->zgvdoktorort = $row->zgvdoktorort;
$obj->zgvdoktordatum = $row->zgvdoktordatum;
$obj->zgvdoktornation = $row->zgvdoktornation;
$obj->zgvdoktornation = $row->zgvdoktornation;
$obj->gsstudientyp_kurzbz = $row->gsstudientyp_kurzbz;
$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
$obj->priorisierung = $row->priorisierung;
$obj->zgvdoktor_erfuellt = $row->zgvdoktor_erfuellt;
$this->result[] = $obj;
}
return true;
@@ -2117,12 +2128,12 @@ class prestudent extends person
$this->db_add_param($this->zgvort).','.
$this->db_add_param($this->zgvdatum).','.
$this->db_add_param($this->zgvnation).','.
$this->db_add_param($this->zgv_erfuellt).','.
$this->db_add_param($this->zgv_erfuellt).','.
$this->db_add_param($this->zgvmas_code).','.
$this->db_add_param($this->zgvmaort).','.
$this->db_add_param($this->zgvmadatum).','.
$this->db_add_param($this->zgvmanation).','.
$this->db_add_param($this->zgvmas_erfuellt).','.
$this->db_add_param($this->zgvmas_erfuellt).','.
$this->db_add_param($this->aufnahmeschluessel).','.
$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).','.
$this->db_add_param($this->anmeldungreihungstest).','.
@@ -2274,7 +2285,7 @@ class prestudent extends person
$this->errormsg = 'Fehler beim Laden der Daten';
return false;
}
}
/**
@@ -2464,13 +2475,15 @@ class prestudent extends person
return false;
}
$qry = "SELECT kurzbzlang
FROM public.tbl_prestudent
JOIN public.tbl_prestudentstatus USING (prestudent_id)
JOIN public.tbl_studiengang USING (studiengang_kz)
$qry = "SELECT
UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as kuerzel
FROM
public.tbl_prestudent
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 status_kurzbz in ('Absolvent','Diplomand','Unterbrecher','Student')
AND typ in ('b','m','d')
AND status_kurzbz in ('Absolvent','Diplomand','Unterbrecher','Student')
AND typ in ('b','m','d')
ORDER BY status_kurzbz ASC
LIMIT 1;";
@@ -2478,7 +2491,7 @@ class prestudent extends person
{
if ($row = $this->db_fetch_object())
{
$stg = $row->kurzbzlang;
$stg = $row->kuerzel;
return $stg;
}
else