From acffebf5157a30804da9ca7a999d9aec12298868 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 6 Jul 2022 10:56:24 +0200
Subject: [PATCH 1/2] =?UTF-8?q?check=20doppelte=20benutzer=20auch=20mit=20?=
 =?UTF-8?q?unterschiedlicher=20gro=C3=9F=20und=20kleinschreibung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/person/Person_model.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 94ffb78a3..8875fd4c5 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -283,8 +283,8 @@ class Person_model extends DB_Model
 								SELECT p2.person_id
 								FROM public.tbl_person p
 								JOIN public.tbl_person p2
-								ON p.vorname = p2.vorname
-								AND p.nachname = p2.nachname
+								ON lower(p.vorname) = lower(p2.vorname)
+								AND lower(p.nachname) = lower(p2.nachname)
 								AND p.gebdatum = p2.gebdatum
 								AND p.person_id = ?
 							)
@@ -310,8 +310,8 @@ class Person_model extends DB_Model
 								SELECT p2.person_id
 								FROM public.tbl_person p
 								JOIN public.tbl_person p2
-								ON p.vorname = p2.vorname
-								AND p.nachname = p2.nachname
+								ON lower(p.vorname) = lower(p2.vorname)
+								AND lower(p.nachname) = lower(p2.nachname)
 								AND p.gebdatum = p2.gebdatum
 								AND p.person_id = ?
 							)
@@ -330,7 +330,7 @@ class Person_model extends DB_Model
 					SELECT vorname, nachname, gebdatum, person_id
 					FROM tbl_person
 					) p2
-					ON (p1.vorname = p2.vorname AND p1.nachname = p2.nachname AND p1.gebdatum = p2.gebdatum)
+					ON (lower(p1.vorname) = lower(p2.vorname) AND lower(p1.nachname) = lower(p2.nachname) AND p1.gebdatum = p2.gebdatum)
 				WHERE p1.person_id != p2.person_id AND (p1.person_id = ?)";
 
 		return $this->execQuery($qry, array($person_id, $person_id, $person_id));

From 1434deeca16db1aeccef2f550a748b61c97957fa Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 7 Jul 2022 11:29:38 +0200
Subject: [PATCH 2/2] zeigt die nation gruppe an

---
 .../system/infocenter/infocenterData.php      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 9748a6b30..acf8944d6 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -254,6 +254,22 @@
 			  ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
 				 LIMIT 1
 			) AS "ZGVMNation",
+			(
+				SELECT upper(tbl_nation.nationengruppe_kurzbz)
+				FROM public.tbl_prestudent ps
+				JOIN bis.tbl_nation ON ps.zgvnation = tbl_nation.nation_code
+				WHERE ps.person_id = p.person_id
+				ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
+				LIMIT 1
+			) AS "ZGVNationGruppe",
+			(
+				SELECT upper(tbl_nation.nationengruppe_kurzbz)
+				FROM public.tbl_prestudent ps
+				JOIN bis.tbl_nation ON ps.zgvmanation = tbl_nation.nation_code
+				WHERE ps.person_id = p.person_id
+				ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
+				LIMIT 1
+			) AS "ZGVMNationGruppe",
 			(
 				SELECT tbl_organisationseinheit.bezeichnung
 				FROM public.tbl_benutzerfunktion 
@@ -361,6 +377,8 @@
 			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')',
 			'ZGV Nation BA',
 			'ZGV Nation MA',
+			'ZGV Gruppe BA',
+			'ZGV Gruppe MA',
 			'InfoCenter Mitarbeiter'
 		),
 		'formatRow' => function($datasetRaw) {
@@ -452,6 +470,16 @@
 				$datasetRaw->{'ZGVMNation'} = '-';
 			}
 
+			if ($datasetRaw->{'ZGVNationGruppe'} == null)
+			{
+				$datasetRaw->{'ZGVNationGruppe'} = '-';
+			}
+
+			if ($datasetRaw->{'ZGVMNationGruppe'} == null)
+			{
+				$datasetRaw->{'ZGVMNationGruppe'} = '-';
+			}
+
 			if ($datasetRaw->{'InfoCenterMitarbeiter'} === null)
 			{
 				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';