mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-23 09:52:22 +00:00
Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen
This commit is contained in:
KarpAlex
+176
-1
@@ -6243,6 +6243,181 @@ if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berecht
|
||||
}
|
||||
}
|
||||
|
||||
//Add column wahlname to public.tbl_person
|
||||
if(!@$db->db_query("SELECT wahlname FROM public.tbl_person LIMIT 1"))
|
||||
{
|
||||
$qry = "ALTER TABLE public.tbl_person ADD COLUMN wahlname varchar(128);";
|
||||
|
||||
if(!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_person '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
echo '<br>public.tbl_person: Spalte wahlname hinzugefügt';
|
||||
}
|
||||
|
||||
// Adds Column wahlname to campus.vw_student
|
||||
if (!$result = @$db->db_query('SELECT wahlname FROM campus.vw_student LIMIT 1'))
|
||||
{
|
||||
$qry = "
|
||||
CREATE OR REPLACE VIEW campus.vw_student AS
|
||||
SELECT tbl_benutzer.uid,
|
||||
tbl_student.matrikelnr,
|
||||
tbl_student.prestudent_id,
|
||||
tbl_student.studiengang_kz,
|
||||
tbl_student.semester,
|
||||
tbl_student.verband,
|
||||
tbl_student.gruppe,
|
||||
tbl_benutzer.person_id,
|
||||
tbl_benutzer.alias,
|
||||
tbl_person.geburtsnation,
|
||||
tbl_person.sprache,
|
||||
tbl_person.anrede,
|
||||
tbl_person.titelpost,
|
||||
tbl_person.titelpre,
|
||||
tbl_person.nachname,
|
||||
tbl_person.vorname,
|
||||
tbl_person.vornamen,
|
||||
tbl_person.gebdatum,
|
||||
tbl_person.gebort,
|
||||
tbl_person.gebzeit,
|
||||
tbl_person.foto,
|
||||
tbl_person.anmerkung,
|
||||
tbl_person.homepage,
|
||||
tbl_person.svnr,
|
||||
tbl_person.ersatzkennzeichen,
|
||||
tbl_person.geschlecht,
|
||||
tbl_person.familienstand,
|
||||
tbl_person.anzahlkinder,
|
||||
tbl_benutzer.aktiv,
|
||||
tbl_student.updateamum,
|
||||
tbl_student.updatevon,
|
||||
tbl_student.insertamum,
|
||||
tbl_student.insertvon,
|
||||
tbl_student.ext_id,
|
||||
tbl_benutzer.updateaktivam,
|
||||
tbl_benutzer.updateaktivvon,
|
||||
tbl_benutzer.aktivierungscode,
|
||||
( SELECT tbl_kontakt.kontakt
|
||||
FROM tbl_kontakt
|
||||
WHERE tbl_kontakt.person_id = tbl_person.person_id AND tbl_kontakt.kontakttyp::text = 'email'::text
|
||||
ORDER BY tbl_kontakt.zustellung DESC
|
||||
LIMIT 1) AS email_privat,
|
||||
tbl_person.wahlname
|
||||
FROM public.tbl_student
|
||||
JOIN public.tbl_benutzer ON tbl_student.student_uid::text = tbl_benutzer.uid::text
|
||||
JOIN public.tbl_person USING (person_id);";
|
||||
|
||||
if (!$db->db_query($qry))
|
||||
echo '<strong>campus.vw_student: '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
echo '<br>campus.vw_student: added column wahlname';
|
||||
}
|
||||
|
||||
|
||||
// Adds Column wahlname to campus.vw_benutzer
|
||||
if (!$result = @$db->db_query('SELECT wahlname FROM campus.vw_benutzer LIMIT 1'))
|
||||
{
|
||||
$qry = "
|
||||
CREATE OR REPLACE VIEW campus.vw_benutzer AS
|
||||
SELECT tbl_benutzer.person_id,
|
||||
tbl_benutzer.uid,
|
||||
tbl_benutzer.alias,
|
||||
tbl_person.geburtsnation,
|
||||
tbl_person.sprache,
|
||||
tbl_person.anrede,
|
||||
tbl_person.titelpost,
|
||||
tbl_person.titelpre,
|
||||
tbl_person.nachname,
|
||||
tbl_person.vorname,
|
||||
tbl_person.vornamen,
|
||||
tbl_person.gebdatum,
|
||||
tbl_person.gebort,
|
||||
tbl_person.gebzeit,
|
||||
tbl_person.foto,
|
||||
tbl_person.geschlecht,
|
||||
tbl_person.anmerkung,
|
||||
tbl_person.homepage,
|
||||
tbl_person.svnr,
|
||||
tbl_person.ersatzkennzeichen,
|
||||
tbl_person.familienstand,
|
||||
tbl_person.anzahlkinder,
|
||||
tbl_benutzer.aktiv,
|
||||
tbl_benutzer.insertamum,
|
||||
tbl_benutzer.insertvon,
|
||||
tbl_benutzer.updateamum,
|
||||
tbl_benutzer.updatevon,
|
||||
tbl_benutzer.ext_id,
|
||||
tbl_person.wahlname
|
||||
FROM public.tbl_benutzer
|
||||
JOIN public.tbl_person USING (person_id);";
|
||||
|
||||
if (!$db->db_query($qry))
|
||||
echo '<strong>campus.vw_benutzer: '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
echo '<br>campus.vw_benutzer: added column wahlname';
|
||||
}
|
||||
|
||||
// Adds Column wahlname to campus.vw_mitarbeiter
|
||||
if (!$result = @$db->db_query('SELECT wahlname FROM campus.vw_mitarbeiter LIMIT 1'))
|
||||
{
|
||||
$qry = "
|
||||
CREATE OR REPLACE VIEW campus.vw_mitarbeiter AS
|
||||
SELECT tbl_benutzer.uid,
|
||||
tbl_mitarbeiter.ausbildungcode,
|
||||
tbl_mitarbeiter.personalnummer,
|
||||
tbl_mitarbeiter.kurzbz,
|
||||
tbl_mitarbeiter.lektor,
|
||||
tbl_mitarbeiter.fixangestellt,
|
||||
tbl_mitarbeiter.telefonklappe,
|
||||
tbl_benutzer.person_id,
|
||||
tbl_benutzer.alias,
|
||||
tbl_person.geburtsnation,
|
||||
tbl_person.sprache,
|
||||
tbl_person.anrede,
|
||||
tbl_person.titelpost,
|
||||
tbl_person.titelpre,
|
||||
tbl_person.nachname,
|
||||
tbl_person.vorname,
|
||||
tbl_person.vornamen,
|
||||
tbl_person.gebdatum,
|
||||
tbl_person.gebort,
|
||||
tbl_person.gebzeit,
|
||||
tbl_person.foto,
|
||||
tbl_mitarbeiter.anmerkung,
|
||||
tbl_person.homepage,
|
||||
tbl_person.svnr,
|
||||
tbl_person.ersatzkennzeichen,
|
||||
tbl_person.geschlecht,
|
||||
tbl_person.familienstand,
|
||||
tbl_person.anzahlkinder,
|
||||
tbl_mitarbeiter.ort_kurzbz,
|
||||
tbl_benutzer.aktiv,
|
||||
tbl_mitarbeiter.bismelden,
|
||||
tbl_mitarbeiter.standort_id,
|
||||
tbl_mitarbeiter.updateamum,
|
||||
tbl_mitarbeiter.updatevon,
|
||||
tbl_mitarbeiter.insertamum,
|
||||
tbl_mitarbeiter.insertvon,
|
||||
tbl_mitarbeiter.ext_id,
|
||||
tbl_benutzer.aktivierungscode,
|
||||
( SELECT tbl_kontakt.kontakt
|
||||
FROM tbl_kontakt
|
||||
WHERE tbl_kontakt.person_id = tbl_person.person_id AND tbl_kontakt.kontakttyp::text = 'email'::text
|
||||
ORDER BY tbl_kontakt.zustellung DESC
|
||||
LIMIT 1) AS email_privat,
|
||||
tbl_benutzer.updateaktivam,
|
||||
tbl_benutzer.updateaktivvon,
|
||||
GREATEST(tbl_person.updateamum, tbl_benutzer.updateamum, tbl_mitarbeiter.updateamum) AS lastupdate,
|
||||
tbl_person.wahlname
|
||||
FROM public.tbl_mitarbeiter
|
||||
JOIN public.tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
|
||||
JOIN public.tbl_person USING (person_id);";
|
||||
|
||||
if (!$db->db_query($qry))
|
||||
echo '<strong>campus.vw_mitarbeiter: '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
echo '<br>campus.vw_mitarbeiter: added column wahlname';
|
||||
}
|
||||
|
||||
// Creates table public.tbl_gruppe_manager if it doesn't exist and grants privileges
|
||||
if (!$result = @$db->db_query('SELECT 1 FROM public.tbl_gruppe_manager LIMIT 1'))
|
||||
{
|
||||
@@ -6815,7 +6990,7 @@ $tabellen=array(
|
||||
"public.tbl_ortraumtyp" => array("ort_kurzbz","hierarchie","raumtyp_kurzbz"),
|
||||
"public.tbl_organisationseinheit" => array("oe_kurzbz", "oe_parent_kurzbz", "bezeichnung","organisationseinheittyp_kurzbz", "aktiv","mailverteiler","freigabegrenze","kurzzeichen","lehre","standort","warn_semesterstunden_frei","warn_semesterstunden_fix","standort_id"),
|
||||
"public.tbl_organisationseinheittyp" => array("organisationseinheittyp_kurzbz", "bezeichnung", "beschreibung"),
|
||||
"public.tbl_person" => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode", "foto_sperre","matr_nr","zugangscode_timestamp","udf_values","bpk","matr_aktiv"),
|
||||
"public.tbl_person" => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode", "foto_sperre","matr_nr","zugangscode_timestamp","udf_values","bpk","matr_aktiv","wahlname"),
|
||||
"public.tbl_person_fotostatus" => array("person_fotostatus_id","person_id","fotostatus_kurzbz","datum","insertamum","insertvon","updateamum","updatevon"),
|
||||
"public.tbl_personfunktionstandort" => array("personfunktionstandort_id","funktion_kurzbz","person_id","standort_id","position","anrede"),
|
||||
"public.tbl_preincoming" => array("preincoming_id","person_id","mobilitaetsprogramm_code","zweck_code","firma_id","universitaet","aktiv","bachelorthesis","masterthesis","von","bis","uebernommen","insertamum","insertvon","updateamum","updatevon","anmerkung","zgv","zgv_ort","zgv_datum","zgv_name","zgvmaster","zgvmaster_datum","zgvmaster_ort","zgvmaster_name","program_name","bachelor","master","jahre","person_id_emergency","person_id_coordinator_dep","person_id_coordinator_int","code","deutschkurs1","deutschkurs2","research_area","deutschkurs3","ext_id"),
|
||||
|
||||
Reference in New Issue
Block a user