blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-19 04:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Person_model.php getPersonStammdaten method:

Browse Source 
- added sorting order for contacts (by insertamum descending)
 - rewrote old ->retval to new isError, hasData etc. functions
This commit is contained in:
KarpAlex
2021-09-28 15:52:17 +02:00
parent 45e4d5576c
commit 76f3afdda5
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/person/Person_model.php
+9 -8
View File
@@ -159,28 +159,29 @@ class Person_model extends DB_Model
$person = $this->load($person_id);
if($person->error) return $person;
if (isError($person)) return $person;
//return null if not found
if(count($person->retval) < 1)
if (!hasData($person))
return success(null);
$this->KontaktModel->addDistinct();
$this->KontaktModel->addSelect('kontakttyp, anmerkung, kontakt, zustellung');
$this->KontaktModel->addOrder('kontakttyp');
$this->KontaktModel->addOrder('insertamum', 'DESC');
$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustellung' => true) : array('person_id' => $person_id);
$kontakte = $this->KontaktModel->loadWhere($where);
if($kontakte->error) return $kontakte;
if (isError($kontakte)) return $kontakte;
$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustelladresse' => true) : array('person_id' => $person_id);
$this->AdresseModel->addSelect('public.tbl_adresse.*, bis.tbl_nation.kurztext AS nationkurztext');
$this->AdresseModel->addJoin('bis.tbl_nation', 'tbl_adresse.nation = tbl_nation.nation_code', 'LEFT');
$this->AdresseModel->addOrder('insertamum', 'DESC');
$adressen = $this->AdresseModel->loadWhere($where);
if($adressen->error) return $adressen;
if (isError($adressen)) return $adressen;
$stammdaten = $person->retval[0];
$stammdaten->kontakte = $kontakte->retval;
$stammdaten->adressen = $adressen->retval;
$stammdaten = getData($person)[0];
$stammdaten->kontakte = hasData($kontakte) ? getData($kontakte) : array();
$stammdaten->adressen = hasData($adressen) ? getData($adressen) : array();
return success($stammdaten);
}