From 5255e6166df3c040c538397ca8a6095c281660fd Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Fri, 6 Sep 2019 15:49:47 +0200
Subject: [PATCH] crm/Prestudent_model, education/Lehrveransaltung_mode,
 person/Person_model: models are loaded in constructor to avoid multiple load

---
 application/models/crm/Prestudent_model.php              | 6 ++----
 application/models/education/Lehrveranstaltung_model.php | 8 +++-----
 application/models/person/Person_model.php               | 6 +++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index ffc6afb0e..32673d10d 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -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,7 +210,6 @@ 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)
@@ -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))
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 1685ddf81..1235769ac 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -10,6 +10,9 @@ class Lehrveranstaltung_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_lehrveranstaltung';
 		$this->pk = 'lehrveranstaltung_id';
+
+		$this->load->model('organisation/studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 	}
 
 	/**
@@ -22,8 +25,6 @@ class Lehrveranstaltung_model extends DB_Model
 	 */
 	public function getLehrveranstaltungGroupNames($studiensemester_kurzbz, $ausbildungssemester = null, $studiengang_kz = null, $lehrveranstaltung_ids = null)
 	{
-		$this->load->model('organisation/studiengang_model', 'StudiengangModel');
-
 		$studiengang_kz_arr = array();
 		$ausbildungssemester_arr = array();
 		$lehrveranstaltung_id_arr = array();
@@ -59,7 +60,6 @@ class Lehrveranstaltung_model extends DB_Model
 		}
 		else
 		{
-			$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 			foreach ($studiengang_kz_arr as $studiengang_kz_item)
 			{
 				$result = $this->StudiensemesterModel->getAusbildungssemesterByStudiensemesterAndStudiengang($studiensemester_kurzbz, $studiengang_kz_item);
@@ -214,8 +214,6 @@ class Lehrveranstaltung_model extends DB_Model
 	 */
 	public function getLvsWithIncomingPlaces($studiensemester_kurzbz)
 	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
 		$studsemres = $this->StudiensemesterModel->load($studiensemester_kurzbz);
 
 		if (!hasData($studsemres))
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index b689f4fcb..1291427b6 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -10,6 +10,9 @@ class Person_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_person';
 		$this->pk = 'person_id';
+
+		$this->load->model('person/kontakt_model', 'KontaktModel');
+		$this->load->model('person/adresse_model', 'AdresseModel');
 	}
 
 	/**
@@ -162,9 +165,6 @@ class Person_model extends DB_Model
 		if(count($person->retval) < 1)
 			return success(null);
 
-		$this->load->model('person/kontakt_model', 'KontaktModel');
-		$this->load->model('person/adresse_model', 'AdresseModel');
-
 		$this->KontaktModel->addDistinct();
 		$this->KontaktModel->addSelect('kontakttyp, anmerkung, kontakt, zustellung');
 		$this->KontaktModel->addOrder('kontakttyp');