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

Merge branch 'master' into messages

Browse Source
This commit is contained in:
Paolo
2019-02-25 15:28:13 +01:00
parent 2d7cc09d02 e598264f30
commit 8dd7ed0335
46 changed files with 10017 additions and 8112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/crm/Prestudent_model.php
+4 -2
View File
@@ -204,8 +204,8 @@ class Prestudent_model extends DB_Model
$this->addJoin('bis.tbl_nation zgvmanat', 'zgvmanation = zgvmanat.nation_code', 'LEFT');
$prestudent = $this->load($prestudent_id);
if($prestudent->error)
return error($prestudent->retval);
if (!hasData($prestudent))
return error('prestudent could not be loaded');
//Prestudentstatus
$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
@@ -225,6 +225,7 @@ class Prestudent_model extends DB_Model
if (count($studienordnung->retval) > 0)
{
$lastStatus->retval[0]->studiengang_kz = $studienordnung->retval[0]->studiengang_kz;
$lastStatus->retval[0]->studiengangkurzbzlang = $studienordnung->retval[0]->studiengangkurzbzlang;
$lastStatus->retval[0]->studiengangbezeichnung = $studienordnung->retval[0]->studiengangbezeichnung;
$lastStatus->retval[0]->studiengangbezeichnung_englisch = $studienordnung->retval[0]->studiengangbezeichnung_englisch;
@@ -233,6 +234,7 @@ class Prestudent_model extends DB_Model
//get Sprache
$this->load->model('system/sprache_model', 'SpracheModel');
$this->SpracheModel->addSelect('sprache, locale, bezeichnung');
$language = $this->SpracheModel->load($lastStatus->retval[0]->sprache);
if ($language->error)
application/models/crm/Reihungstest_model.php
+266
View File
@@ -224,4 +224,270 @@ class Reihungstest_model extends DB_Model
return $this->execQuery($query);
}
/**
* Checks if a registration date (Anmeldefrist) of a placement test has been reached yesterday.
* @param integer $studiengang_kz Optional. Kennzahl of degree program whose registration date should be checked.
* @return array Returns object array with reihungstest_ids whose registration date has been reached yesterday.
*/
public function checkReachedRegistrationDate($studiengang_kz = null)
{
$query = '
SELECT *
FROM PUBLIC.tbl_reihungstest
WHERE anmeldefrist = (
SELECT CURRENT_DATE - 1
)
';
$parametersArray = array();
if (!isEmptyString($studiengang_kz))
{
$query .= ' AND studiengang_kz = ?';
array_push($parametersArray, $studiengang_kz);
}
return $this->execQuery($query, $parametersArray);
}
/**
* Loads all applicants of a placement test for runZentraleReihungstestAnmeldefristAssistenzJob
* @param integer $reihungstest_id ID of placement test
* @return array Returns object array with data of applicants.
*/
public function getApplicantsOfPlacementTestForCronjob($reihungstest_id)
{
$query = '
SELECT tbl_rt_person.person_id,
ps.prestudent_id,
tbl_studienplan.orgform_kurzbz,
tbl_prestudentstatus.studienplan_id,
tbl_prestudentstatus.ausbildungssemester,
nachname,
vorname,
tbl_zgv.zgv_kurzbz,
ps.studiengang_kz,
CASE WHEN tbl_prestudentstatus.statusgrund_id=9
THEN \'Ja\'
ELSE \'Nein\'
END AS "qualifikationskurs",
(
SELECT count(*) AS prio_relativ
FROM (
SELECT *,
(
SELECT status_kurzbz
FROM PUBLIC.tbl_prestudentstatus
WHERE prestudent_id = pst.prestudent_id
ORDER BY datum DESC,
tbl_prestudentstatus.insertamum DESC LIMIT 1
) AS laststatus
FROM PUBLIC.tbl_prestudent pst
JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
WHERE person_id = (
SELECT person_id
FROM PUBLIC.tbl_prestudent
WHERE prestudent_id = ps.prestudent_id
)
AND studiensemester_kurzbz = (
SELECT studiensemester_kurzbz
FROM PUBLIC.tbl_prestudentstatus
WHERE prestudent_id = ps.prestudent_id
AND status_kurzbz = \'Interessent\' LIMIT 1
)
AND status_kurzbz = \'Interessent\'
) prest
WHERE laststatus NOT IN (\'Abbrecher\', \'Abgewiesener\', \'Absolvent\')
AND priorisierung <= (
SELECT priorisierung
FROM PUBLIC.tbl_prestudent
WHERE prestudent_id = ps.prestudent_id
)
) AS "prioritaet",
(
SELECT kontakt
FROM PUBLIC.tbl_kontakt
WHERE kontakttyp = \'email\'
AND zustellung = true
AND person_id = tbl_rt_person.person_id
ORDER BY insertamum DESC,
updateamum DESC LIMIT 1
) AS "email"
FROM PUBLIC.tbl_rt_person
JOIN PUBLIC.tbl_person ON (tbl_rt_person.person_id = tbl_person.person_id)
JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = reihungstest_id)
JOIN PUBLIC.tbl_prestudent ps ON (ps.person_id = tbl_rt_person.person_id)
JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
WHERE rt_id = ?
AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
AND bewerbung_abgeschicktamum IS NOT NULL
AND bestaetigtam IS NOT NULL
ORDER BY studiengang_kz,
orgform_kurzbz,
prioritaet,
nachname,
vorname,
person_id
';
return $this->execQuery($query, array($reihungstest_id));
}
/**
* Checks if an Applicant was assigned to a plament test after Anmeldefrist and before Test-Date
* @param integer $studiengang_kz Kennzahl of degree program those tests should be checked
* @return array Returns object array with data of applicants.
*/
public function getApplicantAssignedAfterDate($studiengang_kz)
{
$query = '
SELECT tbl_rt_person.person_id,
ps.prestudent_id,
rt.datum,
rt.uhrzeit,
tbl_studienplan.orgform_kurzbz,
tbl_prestudentstatus.studienplan_id,
tbl_prestudentstatus.ausbildungssemester,
nachname,
vorname,
tbl_zgv.zgv_kurzbz,
ps.studiengang_kz,
CASE WHEN tbl_prestudentstatus.statusgrund_id=9
THEN \'Ja\'
ELSE \'Nein\'
END AS "qualifikationskurs",
(
SELECT count(*) AS prio_relativ
FROM (
SELECT *,
(
SELECT status_kurzbz
FROM PUBLIC.tbl_prestudentstatus
WHERE prestudent_id = pst.prestudent_id
ORDER BY datum DESC,
tbl_prestudentstatus.insertamum DESC LIMIT 1
) AS laststatus
FROM PUBLIC.tbl_prestudent pst
JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
WHERE person_id = (
SELECT person_id
FROM PUBLIC.tbl_prestudent
WHERE prestudent_id = ps.prestudent_id
)
AND studiensemester_kurzbz = (
SELECT studiensemester_kurzbz
FROM PUBLIC.tbl_prestudentstatus
WHERE prestudent_id = ps.prestudent_id
AND status_kurzbz = \'Interessent\' LIMIT 1
)
AND status_kurzbz = \'Interessent\'
) prest
WHERE laststatus NOT IN (\'Abbrecher\', \'Abgewiesener\', \'Absolvent\')
AND priorisierung <= (
SELECT priorisierung
FROM PUBLIC.tbl_prestudent
WHERE prestudent_id = ps.prestudent_id
)
) AS "prioritaet",
(
SELECT kontakt
FROM PUBLIC.tbl_kontakt
WHERE kontakttyp = \'email\'
AND zustellung = true
AND person_id = tbl_rt_person.person_id
ORDER BY insertamum DESC,
updateamum DESC LIMIT 1
) AS "email"
FROM PUBLIC.tbl_rt_person
JOIN PUBLIC.tbl_person ON (tbl_rt_person.person_id = tbl_person.person_id)
JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = reihungstest_id)
JOIN PUBLIC.tbl_prestudent ps ON (ps.person_id = tbl_rt_person.person_id)
JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
WHERE rt.studiengang_kz = ?
AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
AND bewerbung_abgeschicktamum IS NOT NULL
AND bestaetigtam IS NOT NULL
AND anmeldefrist < (SELECT CURRENT_DATE)
AND rt.datum > (SELECT CURRENT_DATE)
--AND tbl_rt_person.insertamum > anmeldefrist
--AND tbl_rt_person.insertamum < rt.datum
AND tbl_rt_person.insertamum::date = (SELECT CURRENT_DATE -1)
ORDER BY studiengang_kz,
orgform_kurzbz,
prioritaet,
nachname,
vorname,
person_id
';
return $this->execQuery($query, array($studiengang_kz));
}
/**
* Loads all applicants of a placement test
* @param integer $reihungstest_id ID of placement test
* @return array Returns object array with data of applicants.
*/
public function getApplicantsOfPlacementTest($reihungstest_id)
{
$query = '
SELECT DISTINCT tbl_rt_person.person_id,
anrede,
nachname,
vorname,
(
SELECT kontakt
FROM PUBLIC.tbl_kontakt
WHERE kontakttyp = \'email\'
AND zustellung = true
AND person_id = tbl_rt_person.person_id
ORDER BY insertamum DESC,
updateamum DESC LIMIT 1
) AS "email",
tbl_ort.planbezeichnung,
tbl_ort.lageplan
FROM PUBLIC.tbl_rt_person
JOIN PUBLIC.tbl_person ON (tbl_rt_person.person_id = tbl_person.person_id)
JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = reihungstest_id)
JOIN PUBLIC.tbl_prestudent ps ON (ps.person_id = tbl_rt_person.person_id)
JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
LEFT JOIN PUBLIC.tbl_ort ON (tbl_rt_person.ort_kurzbz = tbl_ort.ort_kurzbz)
WHERE rt_id = ?
AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
AND bewerbung_abgeschicktamum IS NOT NULL
AND bestaetigtam IS NOT NULL
ORDER BY nachname,
vorname,
person_id
';
return $this->execQuery($query, array($reihungstest_id));
}
/**
* Loads all placement tests of the given day and optional degree program
* @param string $date Date of the tests to be loaded (YYYY-MM-DD)
* @param integer $studiengang_kz Optional. Kennzahl of degree program to load
* @return array Returns object array with data of applicants.
*/
public function getTestsOnDate($date, $studiengang_kz = null)
{
$query = '
SELECT *
FROM PUBLIC.tbl_reihungstest
WHERE datum = ?
AND studiengang_kz = ?
';
return $this->execQuery($query, array($date, $studiengang_kz));
}
}
application/models/education/Lehreinheitgruppe_model.php
+10
View File
@@ -11,4 +11,14 @@ class Lehreinheitgruppe_model extends DB_Model
$this->dbTable = 'lehre.tbl_lehreinheitgruppe';
$this->pk = 'lehreinheitgruppe_id';
}
public function getDirectGroup($lehreinheit_id)
{
$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
return $this->loadWhere(array(
'tbl_gruppe.direktinskription' => true,
'lehreinheit_id' => $lehreinheit_id
)
);
}
}
application/models/organisation/Studiengang_model.php
+19
View File
@@ -429,4 +429,23 @@ class Studiengang_model extends DB_Model
return $this->execQuery($query, array($studiensemester_kurzbz));
}
/**
* Loads degree programs of the given type
* @param string $typ Type of degree programs to be loaded
* @return array
*/
public function loadStudiengaengeFromTyp($typ)
{
$query = "SELECT
distinct tbl_studiengang.*
FROM
public.tbl_studiengang
WHERE
tbl_studiengang.typ=?
ORDER BY
kurzbz";
return $this->execQuery($query, array($typ));
}
}
application/models/organisation/Studiensemester_model.php
+18 -3
View File
@@ -109,7 +109,7 @@ class Studiensemester_model extends DB_Model
*/
public function getAusbildungssemesterByStudiensemesterAndStudiengang($studiensemester_kurzbz, $studiengang_kz)
{
$query = "SELECT DISTINCT semester
$query = "SELECT DISTINCT semester
FROM lehre.tbl_studienplan
JOIN lehre.tbl_studienordnung USING(studienordnung_id)
JOIN lehre.tbl_studienplan_semester USING(studienplan_id)
@@ -131,9 +131,9 @@ class Studiensemester_model extends DB_Model
if (date_format(date_create($from), 'Y-m-d') > (date_format(date_create($to), 'Y-m-d')))
return success(array());
$query = "SELECT *
$query = "SELECT *
FROM public.tbl_studiensemester
WHERE
WHERE
(ende > ?::date AND start < ?::date)
OR start = ?::date
OR ende = ?::date
@@ -141,4 +141,19 @@ class Studiensemester_model extends DB_Model
return $this->execQuery($query, array($from, $to, $from, $to));
}
/**
* Liefert das Studiensemester das aktuell am naehesten zu $studiensemester_kurzbz liegt
*
* @param $studiensemester_kurzbz
* @return array | null
*/
public function getNearestFrom($studiensemester_kurzbz)
{
$query = "SELECT studiensemester_kurzbz, start, ende FROM public.vw_studiensemester
WHERE studiensemester_kurzbz <> ?
ORDER BY delta LIMIT 1";
return $this->execQuery($query, array($studiensemester_kurzbz));
}
}
application/models/ressource/Stundenplandev_model.php
+50
View File
@@ -11,4 +11,54 @@ class Stundenplandev_model extends DB_Model
$this->dbTable = 'lehre.tbl_stundenplandev';
$this->pk = 'stundenplandev_id';
}
public function getMissingDirectGroups($studiensemester_kurzbz = null)
{
$qry = "
SELECT
distinct lehreinheit_id, datum, stunde, mitarbeiter_uid, ort_kurzbz
FROM
lehre.tbl_stundenplandev stpl
WHERE
lehreinheit_id IN(
SELECT
lehreinheit_id
FROM
lehre.tbl_lehreinheit
JOIN lehre.tbl_lehreinheitgruppe USING(lehreinheit_id)
JOIN public.tbl_gruppe USING(gruppe_kurzbz)
WHERE
tbl_gruppe.direktinskription = true
";
$parametersArray = array();
if (!is_null($studiensemester_kurzbz))
{
$parametersArray[] = $studiensemester_kurzbz;
$qry .= ' AND tbl_lehreinheit.studiensemester_kurzbz = ?';
}
$qry .= ")
AND NOT EXISTS(
SELECT
1
FROM
lehre.tbl_stundenplandev
WHERE
datum=stpl.datum
AND stunde=stpl.stunde
AND lehreinheit_id=stpl.lehreinheit_id
AND gruppe_kurzbz=(SELECT
gruppe_kurzbz
FROM
lehre.tbl_lehreinheitgruppe
JOIN public.tbl_gruppe USING(gruppe_kurzbz)
WHERE
lehreinheit_id=stpl.lehreinheit_id
AND tbl_gruppe.direktinskription = true
)
)";
return $this->execQuery($qry, $parametersArray);
}
}