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

renamed unrulyPerson api to checkPerson; built in logic into infoCenterDetails to trigger a number of checks about any changed data in the info center (in this case unruly) and update the page accordingly; Also fixed a bug when saving stammdaten without kontakt entries;

Browse Source
This commit is contained in:
Johann Hoffmann
2024-09-17 14:09:49 +02:00
parent 27c312d7d3
commit 79ea8c4521
12 changed files with 235 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/unrulyperson/UnrulyPerson.php → application/controllers/api/frontend/v1/checkperson/CheckPerson.php
+38 -7
View File
@@ -18,13 +18,15 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
class UnrulyPerson extends FHCAPI_Controller
class CheckPerson extends FHCAPI_Controller
{
public function __construct()
{
parent::__construct([
'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw')
'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
'checkUnruly' => array('basis/mitarbeiter:r', 'student/antragfreigabe:r', 'student/studierendenantrag:r', 'infocenter:r'),
'checkDuplicate' => array('infocenter:r'),
]);
$this->_ci =& get_instance();
@@ -48,13 +50,42 @@ class UnrulyPerson extends FHCAPI_Controller
}
public function checkDuplicate() {
$person_id = $this->input->post('person_id');
$result = $this->_ci->PersonModel->checkDuplicate($person_id);
if (isSuccess($result))
$this->terminateWithSuccess($result);
else
$this->terminateWithError('Error when searching for person');
}
// performs strict check over vorname, nachname, gebdatum
public function checkUnruly() {
$vorname = $this->input->post('vorname');
$nachname = $this->input->post('nachname');
$gebdatum = $this->input->post('gebdatum');
$result = $this->_ci->PersonModel->checkUnruly($vorname, $nachname, $gebdatum);
if (isSuccess($result))
$this->terminateWithSuccess($result);
else
$this->terminateWithError('Error when searching for person');
}
// filters nachname on similarity and vorname/gebdatum are optional
public function filterPerson() {
$payload = json_decode($this->input->raw_input_stream, TRUE);
$nachnameString = '';
$vornameString = '';
$filterUnruly = true;
$birthdateString = null;
$birthdateString = '';
if(array_key_exists( 'nachname', $payload) ) {
$nachnameString = $payload['nachname'];
@@ -80,16 +111,16 @@ class UnrulyPerson extends FHCAPI_Controller
$where = "p.nachname=? ";
}
if(isset($vorname) && $vorname != '')
if(isset($vornameString) && $vornameString != '')
{
$where.= " AND p.vorname~*?";
$parametersArray[] = $vorname;
$parametersArray[] = $vornameString;
}
if(isset($birthdate) && $birthdate != '')
if(isset($birthdateString) && $birthdateString != '')
{
$where.=" AND p.gebdatum=?";
$parametersArray[] = $birthdate;
$parametersArray[] = $birthdateString;
}
if(isset($filterUnruly))