Merge origin/ci into ci

Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php

application/models/codex/Akadgrad_model.php

@@ -0,0 +1,14 @@
+<?php
+class Akadgrad_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_akadgrad';
+		$this->pk = 'akadgrad_id';
+	}
+}

application/models/codex/Archiv_model.php

@@ -0,0 +1,14 @@
+<?php
+class Archiv_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_archiv';
+		$this->pk = 'archiv_id';
+	}
+}

application/models/codex/Aufmerksamdurch_model.php

@@ -0,0 +1,14 @@
+<?php
+class Aufmerksamdurch_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_aufmerksamdurch';
+		$this->pk = 'aufmerksamdurch_kurzbz';
+	}
+}

application/models/codex/Ausbildung_model.php

@@ -0,0 +1,14 @@
+<?php
+class Ausbildung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_ausbildung';
+		$this->pk = 'ausbildungcode';
+	}
+}

application/models/codex/Berufstaetigkeit_model.php

@@ -0,0 +1,14 @@
+<?php
+class Berufstaetigkeit_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_berufstaetigkeit';
+		$this->pk = 'berufstaetigkeit_code';
+	}
+}

application/models/codex/Beschaeftigungsausmass_model.php

@@ -0,0 +1,14 @@
+<?php
+class Beschaeftigungsausmass_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_beschaeftigungsausmass';
+		$this->pk = 'beschausmasscode';
+	}
+}

application/models/codex/Besqual_model.php

@@ -0,0 +1,14 @@
+<?php
+class Besqual_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_besqual';
+		$this->pk = 'besqualcode';
+	}
+}

application/models/codex/Bisfunktion_model.php

@@ -0,0 +1,14 @@
+<?php
+class Bisfunktion_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisfunktion';
+		$this->pk = array('studiengang_kz', 'bisverwendung_id');
+	}
+}

application/models/codex/Bisio_model.php

@@ -0,0 +1,14 @@
+<?php
+class Bisio_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisio';
+		$this->pk = 'bisio_id';
+	}
+}

application/models/codex/Bisorgform_model.php

@@ -0,0 +1,14 @@
+<?php
+class Bisorgform_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisorgform';
+		$this->pk = 'bisorgform_kurzbz';
+	}
+}

application/models/codex/Bisverwendung_model.php

@@ -0,0 +1,14 @@
+<?php
+class Bisverwendung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bisverwendung';
+		$this->pk = 'bisverwendung_id';
+	}
+}

application/models/codex/Bundesland_model.php

@@ -0,0 +1,14 @@
+<?php
+class Bundesland_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bundesland';
+		$this->pk = 'bundesland_code';
+	}
+}

application/models/codex/Entwicklungsteam_model.php

@@ -0,0 +1,14 @@
+<?php
+class Entwicklungsteam_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_entwicklungsteam';
+		$this->pk = array('studiengang_kz', 'mitarbeiter_uid');
+	}
+}

application/models/codex/Gemeinde_model.php

@@ -0,0 +1,14 @@
+<?php
+class Gemeinde_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_gemeinde';
+		$this->pk = 'gemeinde_id';
+	}
+}

application/models/codex/Hauptberuf_model.php

@@ -0,0 +1,14 @@
+<?php
+class Hauptberuf_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_hauptberuf';
+		$this->pk = 'hauptberufcode';
+	}
+}

application/models/codex/Lehrform_model.php

@@ -0,0 +1,14 @@
+<?php
+class Lehrform_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_lehrform';
+		$this->pk = 'lehrform_kurzbz';
+	}
+}

application/models/codex/Lgartcode_model.php

@@ -0,0 +1,14 @@
+<?php
+class Lgartcode_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_lgartcode';
+		$this->pk = 'lgartcode';
+	}
+}

application/models/codex/Mobilitaetsprogramm_model.php

@@ -0,0 +1,14 @@
+<?php
+class Mobilitaetsprogramm_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_mobilitaetsprogramm';
+		$this->pk = 'mobilitaetsprogramm_code';
+	}
+}

application/models/codex/Nation_model.php

@@ -0,0 +1,14 @@
+<?php
+
+class Nation_model extends DB_Model
+{
+	/**
+	 * 
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_nation';
+		$this->pk = 'nation_code';
+	}
+}

application/models/codex/Note_model.php

@@ -0,0 +1,14 @@
+<?php
+class Note_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_note';
+		$this->pk = 'note';
+	}
+}

application/models/codex/Orgform_model.php

@@ -0,0 +1,14 @@
+<?php
+class Orgform_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_orgform';
+		$this->pk = 'orgform_kurzbz';
+	}
+}

application/models/codex/Verwendung_model.php

@@ -0,0 +1,14 @@
+<?php
+class Verwendung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_verwendung';
+		$this->pk = 'verwendung_code';
+	}
+}

application/models/codex/Zgv_model.php

@@ -0,0 +1,14 @@
+<?php
+class Zgv_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgv';
+		$this->pk = 'zgv_code';
+	}
+}

application/models/codex/Zgvdoktor_model.php

@@ -0,0 +1,14 @@
+<?php
+class Zgvdoktor_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgvdoktor';
+		$this->pk = 'zgvdoktor_code';
+	}
+}

application/models/codex/Zgvgruppe_model.php

@@ -0,0 +1,13 @@
+<?php
+class Zgvgruppe_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgvgruppe';
+		$this->pk = '';
+	}
+}

application/models/codex/Zgvmaster_model.php

@@ -0,0 +1,14 @@
+<?php
+class Zgvmaster_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zgvmaster';
+		$this->pk = 'zgvmas_code';
+	}
+}

application/models/codex/Zweck_model.php

@@ -0,0 +1,14 @@
+<?php
+class Zweck_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_zweck';
+		$this->pk = 'zweck_code';
+	}
+}