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

Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user

Browse Source
This commit is contained in:
Paolo
2020-01-16 16:36:57 +01:00
parent 415b37a8f4 908d63f07e
commit 47682f37df
457 changed files with 39585 additions and 46623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/crm/Prestudent_model.php
+6 -8
View File
@@ -10,6 +10,8 @@ class Prestudent_model extends DB_Model
parent::__construct();
$this->dbTable = 'public.tbl_prestudent';
$this->pk = 'prestudent_id';
$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
}
/**
@@ -208,12 +210,11 @@ class Prestudent_model extends DB_Model
return error('prestudent could not be loaded');
//Prestudentstatus
$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
if ($lastStatus->error)
{
return error($lastStatus->retval);
return $lastStatus;
}
if (count($lastStatus->retval) > 0)
@@ -221,7 +222,7 @@ class Prestudent_model extends DB_Model
//get Studiengangname from Studienplan and -ordnung
$studienordnung = $this->PrestudentstatusModel->getStudienordnungFromPrestudent($prestudent_id);
if ($studienordnung->error)
return error($studienordnung->retval);
return $studienordnung;
if (count($studienordnung->retval) > 0)
{
@@ -238,7 +239,7 @@ class Prestudent_model extends DB_Model
$language = $this->SpracheModel->load($lastStatus->retval[0]->sprache);
if ($language->error)
return error($language->retval);
return $language;
if (count($language->retval) > 0)
$lastStatus->retval[0]->sprachedetails = $language->retval[0];
@@ -256,7 +257,7 @@ class Prestudent_model extends DB_Model
)
);
if ($bewerbungstermin->error)
return error($bewerbungstermin->retval);
return $bewerbungstermin;
if (count($bewerbungstermin->retval) > 0)
{
@@ -310,8 +311,6 @@ class Prestudent_model extends DB_Model
if (!hasData($prestudents))
return $bewerbungen;
$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
foreach ($prestudents->retval as $prestudent)
{
$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent->prestudent_id, $studiensemester_kurzbz);
@@ -424,7 +423,6 @@ class Prestudent_model extends DB_Model
if (!hasData($prestudent))
return false;
$this->load->model('prestudentstatus_model', 'PrestudentstatusModel');
$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent_id, null, 'Interessent');
if (!hasData($lastStatus))