Merge branch 'master' into feature-13011/installation_on_multiple_servers

application/models/CL/Messages_model.php

@@ -612,9 +612,9 @@ class Messages_model extends CI_Model
 		if (!isEmptyString($vorlage_kurzbz))
 		{
 			$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
-			$this->VorlagestudiengangModel->addOrder('version','DESC');
+			$this->VorlagestudiengangModel->addOrder('version', 'DESC');
 
-			$getVorlage = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
+			$getVorlage = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz, 'aktiv' => true));
 		}
 
 		return $getVorlage;

application/models/codex/Bisioaufenthaltfoerderung_model.php

@@ -0,0 +1,15 @@
+<?php
+class Bisioaufenthaltfoerderung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisio_aufenthaltfoerderung';
+		$this->pk = array('bisio_id', 'aufenthaltfoerderung_code');
+		$this->hasSequence = false;
+	}
+}

application/models/crm/Prestudent_model.php

@@ -581,4 +581,19 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
+
+	public function getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester)
+	{
+		$query = "SELECT ps.prestudent_id
+					FROM public.tbl_prestudentstatus pss
+					JOIN public.tbl_prestudent ps USING(prestudent_id)
+					JOIN public.tbl_studiengang sg USING(studiengang_kz)
+					JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+					WHERE ps.person_id = ?
+					AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?
+					AND pss.studiensemester_kurzbz = ?
+					";
+
+		return $this->execQuery($query, array($person, $studiengang, $studienSemester));
+	}
 }

application/models/crm/Statusgrund_model.php

@@ -11,4 +11,18 @@ class Statusgrund_model extends DB_Model
 		$this->dbTable = "public.tbl_status_grund";
 		$this->pk = "statusgrund_id";
 	}
+
+	public function getStatus($status_kurzbz = null, $aktiv = null)
+	{
+		$this->addOrder('bezeichnung_mehrsprachig');
+		$where = array();
+		if (!is_null($status_kurzbz))
+			$where['status_kurzbz'] = $status_kurzbz;
+		if (!is_null($aktiv))
+			$where['aktiv'] = $aktiv;
+
+		$status = $this->loadWhere($where);
+
+		return success($status->retval);
+	}
 }

application/models/crm/ZGVPruefungStatus_model.php

@@ -0,0 +1,50 @@
+<?php
+
+
+class ZGVPruefungStatus_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_zgvpruefungstatus_status';
+		$this->pk = 'zgv_pruefung_status_id';
+		$this->hasSequence = true;
+	}
+
+	public function getZgvStatus($zgvpruefung_id)
+	{
+		$this->addOrder('datum', 'DESC');
+		$this->addLimit(1);
+
+		return $this->loadWhere(array('zgvpruefung_id' => $zgvpruefung_id));
+	}
+
+	public function getZgvStatusByPrestudent($prestudent_id)
+	{
+		$this->addJoin('public.tbl_zgvpruefung', 'zgvpruefung_id');
+		$this->addOrder($this->dbTable . '.datum', 'DESC');
+		$this->addLimit(1);
+		return $this->loadWhere(array('prestudent_id' => $prestudent_id));
+	}
+
+	public function getOpenZgvByPerson($person_id, $status)
+	{
+		$query = 'SELECT status.zgvpruefung_id, status.datum, status.status
+					FROM public.tbl_zgvpruefungstatus_status status
+					INNER JOIN
+					(
+						SELECT zgvpruefung_id, max(datum) as MaxDate
+						FROM public.tbl_zgvpruefungstatus_status
+						GROUP BY zgvpruefung_id
+					) sub ON status.zgvpruefung_id = sub.zgvpruefung_id AND status.datum = sub.MaxDate
+				JOIN public.tbl_zgvpruefung ON status.zgvpruefung_id = public.tbl_zgvpruefung.zgvpruefung_id
+				JOIN public.tbl_prestudent USING (prestudent_id) 
+				WHERE person_id = ?
+				AND status.status IN ?';
+
+		return $this->execQuery($query, array($person_id, $status));
+	}
+}

application/models/crm/ZGVPruefung_model.php

@@ -0,0 +1,17 @@
+<?php
+
+
+class ZGVPruefung_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_zgvpruefung';
+		$this->pk = 'zgvpruefung_id';
+		$this->hasSequence = true;
+	}
+
+}

application/models/organisation/Studiengang_model.php

@@ -481,4 +481,18 @@ class Studiengang_model extends DB_Model
 		
 		return $this->loadWhere($condition);
 	}
+
+	public function getStudiengaengeWithOrgForm($typ, $semester)
+	{
+		$query = "SELECT DISTINCT (UPPER(sg.typ || sg.kurzbz || ':' || sp.orgform_kurzbz)) AS Studiengang
+					FROM public.tbl_studiengang sg
+					JOIN lehre.tbl_studienordnung USING (studiengang_kz)
+					JOIN lehre.tbl_studienplan sp USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester spsem USING (studienplan_id)
+					WHERE sp.aktiv = TRUE AND sg.aktiv = TRUE AND sg.typ IN ?
+					AND spsem.studiensemester_kurzbz = ?
+					ORDER BY Studiengang";
+
+		return $this->execQuery($query, array($typ, $semester));
+	}
 }

application/models/person/Notiz_model.php

@@ -154,9 +154,11 @@ class Notiz_model extends DB_Model
 	{
 		// Join with the table public.tbl_notizzuordnung using notiz_id
 		$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
-		$this->addOrder('insertamum', 'DESC');
+		$this->addJoin('public.tbl_prestudent', 'prestudent_id', 'LEFT');
+		$this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+		$this->addOrder('public.tbl_notiz.insertamum', 'DESC');
 
-		return $this->loadWhere(array('person_id' => $person_id, 'titel LIKE' => $titel));
+		return $this->loadWhere(array('public.tbl_notizzuordnung.person_id' => $person_id, 'titel LIKE' => $titel));
 	}
 	
 	/**

application/models/system/Variablenname_model.php

@@ -11,7 +11,8 @@ class Variablenname_model extends DB_Model
 										   ORDER BY studienjahr_kurzbz, start
                                    		) sem
 										WHERE start > now()
-										LIMIT 1;'
+										LIMIT 1;',
+        'infocenter_studiensgangtyp' => 'SELECT infocenter_studiensgangtyp FROM public.tbl_variablenname LIMIT 1'
 	);
 
 	/**