From 7ce489e8472f816f5e01e0c73ec0d0192a8b1f8f Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Wed, 10 Jun 2020 10:11:19 +0200
Subject: [PATCH] - added iso3166_1_a3 field to bis.tbl_nation -
 person/kontakt_model: renamed getFirmenTelefon to getFirmentelefon, separated
 vorwahl from telefonklappe

---
 application/models/person/Kontakt_model.php |  8 ++++----
 system/dbupdate_3.3.php                     | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/application/models/person/Kontakt_model.php b/application/models/person/Kontakt_model.php
index 36ba05be4..33dc66c86 100644
--- a/application/models/person/Kontakt_model.php
+++ b/application/models/person/Kontakt_model.php
@@ -80,10 +80,10 @@ class Kontakt_model extends DB_Model
 	}
 
 	/**
-	 * Gets Firmentelefon for a uid, can be Vorwahl with Telefonklappe or Formenhandy
+	 * Gets Firmentelefon for a uid, can be Vorwahl with Telefonklappe or Firmenhandy
 	 * @param $uid
 	 */
-	public function getFirmenTelefon($uid)
+	public function getFirmentelefon($uid)
 	{
 		$firmentelefon = success(array());
 
@@ -103,7 +103,7 @@ class Kontakt_model extends DB_Model
 				if (hasData($firmenhandy))
 				{
 					$firmenhandy = getData($firmenhandy);
-					$firmentelefon = success($firmenhandy[0]->kontakt);
+					$firmentelefon = success(array('kontakt' => $firmenhandy[0]->kontakt, 'telefonklappe' => ''));
 				}
 			}
 			else
@@ -113,7 +113,7 @@ class Kontakt_model extends DB_Model
 				{
 					$vorwahl = getData($firmaKontakttyp);
 					$vorwahl = $vorwahl[0]->kontakt;
-					$firmentelefon = success(array($vorwahl.'-'.$mitarbeiter[0]->telefonklappe));
+					$firmentelefon = success(array('kontakt' => $vorwahl, 'telefonklappe' => $mitarbeiter[0]->telefonklappe));
 				}
 			}
 		}
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index b54b28373..504a048a1 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -4019,6 +4019,18 @@ if (!$result = @$db->db_query('SELECT 1 FROM system.tbl_jobtriggers LIMIT 1'))
 		echo '<br>Granted privileges to <strong>vilesci</strong> on system.tbl_jobtriggers';
 }
 
+// Add column iso3166_1_a3 to tbl_nation
+if(!$result = @$db->db_query("SELECT iso3166_1_a3 FROM bis.tbl_nation LIMIT 1"))
+{
+	$qry = "ALTER table bis.tbl_nation ADD COLUMN iso3166_1_a3 VARCHAR(3);
+			COMMENT ON COLUMN bis.tbl_nation.iso3166_1_a3 IS 'ISO 3166-1 alpha-3 country code';";
+
+	if(!$db->db_query($qry))
+		echo '<strong>bis.tbl_nation: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>bis.tbl_nation: Spalte iso3166_1_a3 hinzugefuegt';
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 
@@ -4048,7 +4060,7 @@ $tabellen=array(
 	"bis.tbl_mobilitaet" => array("mobilitaet_id","prestudent_id","mobilitaetstyp_kurzbz","studiensemester_kurzbz","mobilitaetsprogramm_code","gsprogramm_id","firma_id","status_kurzbz","ausbildungssemester","insertvon","insertamum","updatevon","updateamum"),
 	"bis.tbl_mobilitaetstyp" => array("mobilitaetstyp_kurzbz","bezeichnung","aktiv"),
 	"bis.tbl_mobilitaetsprogramm"  => array("mobilitaetsprogramm_code","kurzbz","beschreibung","sichtbar","sichtbar_outgoing"),
-	"bis.tbl_nation"  => array("nation_code","entwicklungsstand","eu","ewr","kontinent","kurztext","langtext","engltext","sperre","nationengruppe_kurzbz"),
+	"bis.tbl_nation"  => array("nation_code","entwicklungsstand","eu","ewr","kontinent","kurztext","langtext","engltext","sperre","nationengruppe_kurzbz","iso3166_1_a3"),
 	"bis.tbl_nationengruppe"  => array("nationengruppe_kurzbz","nationengruppe_bezeichnung","aktiv"),
 	"bis.tbl_orgform"  => array("orgform_kurzbz","code","bezeichnung","rolle","bisorgform_kurzbz","bezeichnung_mehrsprachig"),
 	"bis.tbl_verwendung"  => array("verwendung_code","verwendungbez"),