From c84c484a2a7b06a17f24952292dc0d82a475190d Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 26 Apr 2019 12:43:51 +0200 Subject: [PATCH] Fixed models --- .../controllers/api/v1/codex/Nation.php | 16 ++-- application/controllers/api/v1/codex/Zgv.php | 2 +- .../api/v1/crm/Bewerbungstermine.php | 2 +- .../api/v1/crm/Dokumentprestudent.php | 2 +- .../api/v1/person/Notizzuordnung.php | 2 +- .../system/infocenter/InfoCenter.php | 20 ++--- application/models/CL/Messages_model.php | 4 +- .../models/accounting/Aufteilung_model.php | 14 +++ .../models/accounting/Bestelldetail_model.php | 14 +++ .../accounting/Bestelldetailtag_model.php | 14 +++ .../models/accounting/Bestellstatus_model.php | 14 +++ .../models/accounting/Bestellung_model.php | 14 +++ .../models/accounting/Bestellungtag_model.php | 14 +++ .../models/accounting/Buchung_model.php | 14 +++ .../models/accounting/Buchungstyp_model.php | 14 +++ .../models/accounting/Budget_model.php | 14 +++ .../models/accounting/Rechnung_model.php | 14 +++ .../accounting/Rechnungsbetrag_model.php | 14 +++ .../models/accounting/Rechnungstyp_model.php | 14 +++ .../models/accounting/Vertrag_model.php | 14 +++ .../accounting/Vertragsstatus_model.php | 14 +++ .../models/accounting/Vertragstyp_model.php | 14 +++ .../models/accounting/Zahlungstyp_model.php | 14 +++ application/models/codex/Akadgrad_model.php | 14 +++ application/models/codex/Archiv_model.php | 14 +++ .../models/codex/Aufmerksamdurch_model.php | 14 +++ application/models/codex/Ausbildung_model.php | 14 +++ .../models/codex/Berufstaetigkeit_model.php | 14 +++ .../codex/Beschaeftigungsausmass_model.php | 14 +++ application/models/codex/Besqual_model.php | 14 +++ .../models/codex/Bisfunktion_model.php | 14 +++ application/models/codex/Bisio_model.php | 14 +++ application/models/codex/Bisorgform_model.php | 14 +++ .../models/codex/Bisverwendung_model.php | 14 +++ application/models/codex/Bundesland_model.php | 14 +++ .../models/codex/Entwicklungsteam_model.php | 14 +++ application/models/codex/Gemeinde_model.php | 22 +++++ application/models/codex/Hauptberuf_model.php | 14 +++ application/models/codex/Lehrform_model.php | 14 +++ application/models/codex/Lgartcode_model.php | 14 +++ .../codex/Mobilitaetsprogramm_model.php | 14 +++ application/models/codex/Nation_model.php | 14 +++ application/models/codex/Note_model.php | 14 +++ application/models/codex/Verwendung_model.php | 14 +++ application/models/codex/Zgv_model.php | 14 +++ application/models/codex/Zgvdoktor_model.php | 14 +++ application/models/codex/Zgvgruppe_model.php | 13 +++ application/models/codex/Zgvmaster_model.php | 14 +++ application/models/codex/Zweck_model.php | 14 +++ application/models/content/Content_model.php | 14 +++ .../models/content/Contentchild_model.php | 14 +++ .../models/content/Contentgruppe_model.php | 14 +++ .../models/content/Contentlog_model.php | 14 +++ .../models/content/Contentsprache_model.php | 14 +++ .../models/content/Infoscreen_model.php | 14 +++ application/models/content/News_model.php | 14 +++ application/models/content/Template_model.php | 14 +++ .../models/content/Veranstaltung_model.php | 14 +++ .../content/Veranstaltungskategorie_model.php | 14 +++ .../models/crm/Aufnahmeschluessel_model.php | 14 +++ .../models/crm/Bewerbungstermine_model.php | 14 +++ application/models/crm/Buchungstyp_model.php | 14 +++ application/models/crm/Dokument_model.php | 14 +++ .../models/crm/Dokumentprestudent_model.php | 71 +++++++++++++++ application/models/crm/Konto_model.php | 14 +++ application/models/crm/Preincoming_model.php | 14 +++ .../models/crm/Preinteressent_model.php | 14 +++ .../crm/Preinteressentstudiengang_model.php | 14 +++ application/models/crm/Preoutgoing_model.php | 14 +++ application/models/crm/Student_model.php | 48 ++++++++++ application/models/education/Uebung_model.php | 14 +++ .../models/organisation/Erhalter_model.php | 14 +++ .../models/organisation/Fachbereich_model.php | 14 +++ .../models/organisation/Ferien_model.php | 14 +++ .../models/organisation/Lehrverband_model.php | 14 +++ .../Organisationseinheittyp_model.php | 14 +++ .../organisation/Semesterwochen_model.php | 14 +++ .../models/organisation/Service_model.php | 14 +++ .../models/organisation/Standort_model.php | 14 +++ .../models/organisation/Statistik_model.php | 14 +++ .../organisation/Studiengangstyp_model.php | 14 +++ .../organisation/Studienordnung_model.php | 14 +++ .../Studienordnungstatus_model.php | 14 +++ .../organisation/Studienplatz_model.php | 14 +++ .../models/person/Bankverbindung_model.php | 14 +++ .../models/person/Benutzergruppe_model.php | 15 ++++ .../models/person/Fotostatus_model.php | 14 +++ application/models/person/Freebusy_model.php | 14 +++ .../models/person/Freebusytyp_model.php | 14 +++ .../models/person/Kontaktmedium_model.php | 14 +++ .../models/person/Kontakttyp_model.php | 14 +++ application/models/person/Notiz_model.php | 32 +++---- .../models/person/Notizzuordnung_model.php | 14 +++ .../models/project/Aktivitaet_model.php | 14 +++ .../models/project/Aufwandstyp_model.php | 14 +++ .../project/Projekt_ressource_model.php | 14 +++ .../models/project/Projektphase_model.php | 14 +++ .../models/project/Projekttask_model.php | 14 +++ .../models/project/Ressource_model.php | 14 +++ .../models/project/Scrumsprint_model.php | 14 +++ .../models/ressource/Betriebsmittel_model.php | 14 +++ .../ressource/Betriebsmittelperson_model.php | 14 +++ .../ressource/Betriebsmittelstatus_model.php | 14 +++ .../ressource/Betriebsmitteltyp_model.php | 14 +++ application/models/ressource/Coodle_model.php | 14 +++ .../models/ressource/Erreichbarkeit_model.php | 14 +++ application/models/ressource/Firma_model.php | 14 +++ .../models/ressource/Firmatag_model.php | 14 +++ .../models/ressource/Firmentyp_model.php | 14 +++ .../models/ressource/Funktion_model.php | 14 +++ .../models/ressource/Lehrmittel_model.php | 14 +++ .../models/ressource/Mitarbeiter_model.php | 14 +++ application/models/ressource/Ort_model.php | 23 +++++ .../models/ressource/Ortraumtyp_model.php | 14 +++ .../Personfunktionstandort_model.php | 14 +++ .../models/ressource/Raumtyp_model.php | 14 +++ .../models/ressource/Reservierung_model.php | 14 +++ application/models/ressource/Stunde_model.php | 14 +++ .../models/ressource/Stundenplan_model.php | 14 +++ .../ressource/Zeitaufzeichnung_model.php | 14 +++ .../models/ressource/Zeitsperre_model.php | 14 +++ .../models/ressource/Zeitsperretyp_model.php | 14 +++ .../models/ressource/Zeitwunsch_model.php | 14 +++ .../models/system/Berechtigung_model.php | 14 +++ application/models/system/Cronjob_model.php | 14 +++ application/models/system/Filter_model.php | 14 +++ application/models/system/Log_model.php | 14 +++ application/models/system/Message_model.php | 4 +- .../models/system/PersonLock_model.php | 88 +++++++++++++++++++ application/models/system/Rolle_model.php | 14 +++ .../models/system/Rolleberechtigung_model.php | 14 +++ application/models/system/Server_model.php | 14 +++ application/models/system/Tag_model.php | 14 +++ application/models/system/Variable_model.php | 14 +++ .../models/system/Webservicelog_model.php | 14 +++ .../models/system/Webservicerecht_model.php | 14 +++ .../models/system/Webservicetyp_model.php | 14 +++ application/models/testtool/Ablauf_model.php | 14 +++ application/models/testtool/Antwort_model.php | 14 +++ application/models/testtool/Frage_model.php | 14 +++ application/models/testtool/Gebiet_model.php | 14 +++ .../models/testtool/Kategorie_model.php | 14 +++ .../models/testtool/Kriterien_model.php | 14 +++ .../models/testtool/Pruefling_model.php | 14 +++ .../models/testtool/Vorschlag_model.php | 14 +++ application/widgets/Nation_widget.php | 4 +- application/widgets/Zgv_widget.php | 4 +- 147 files changed, 2132 insertions(+), 46 deletions(-) create mode 100644 application/models/accounting/Aufteilung_model.php create mode 100644 application/models/accounting/Bestelldetail_model.php create mode 100644 application/models/accounting/Bestelldetailtag_model.php create mode 100644 application/models/accounting/Bestellstatus_model.php create mode 100644 application/models/accounting/Bestellung_model.php create mode 100644 application/models/accounting/Bestellungtag_model.php create mode 100644 application/models/accounting/Buchung_model.php create mode 100644 application/models/accounting/Buchungstyp_model.php create mode 100644 application/models/accounting/Budget_model.php create mode 100644 application/models/accounting/Rechnung_model.php create mode 100644 application/models/accounting/Rechnungsbetrag_model.php create mode 100644 application/models/accounting/Rechnungstyp_model.php create mode 100644 application/models/accounting/Vertrag_model.php create mode 100644 application/models/accounting/Vertragsstatus_model.php create mode 100644 application/models/accounting/Vertragstyp_model.php create mode 100644 application/models/accounting/Zahlungstyp_model.php create mode 100644 application/models/codex/Akadgrad_model.php create mode 100644 application/models/codex/Archiv_model.php create mode 100644 application/models/codex/Aufmerksamdurch_model.php create mode 100644 application/models/codex/Ausbildung_model.php create mode 100644 application/models/codex/Berufstaetigkeit_model.php create mode 100644 application/models/codex/Beschaeftigungsausmass_model.php create mode 100644 application/models/codex/Besqual_model.php create mode 100644 application/models/codex/Bisfunktion_model.php create mode 100644 application/models/codex/Bisio_model.php create mode 100644 application/models/codex/Bisorgform_model.php create mode 100644 application/models/codex/Bisverwendung_model.php create mode 100644 application/models/codex/Bundesland_model.php create mode 100644 application/models/codex/Entwicklungsteam_model.php create mode 100644 application/models/codex/Gemeinde_model.php create mode 100644 application/models/codex/Hauptberuf_model.php create mode 100644 application/models/codex/Lehrform_model.php create mode 100644 application/models/codex/Lgartcode_model.php create mode 100644 application/models/codex/Mobilitaetsprogramm_model.php create mode 100644 application/models/codex/Nation_model.php create mode 100644 application/models/codex/Note_model.php create mode 100644 application/models/codex/Verwendung_model.php create mode 100644 application/models/codex/Zgv_model.php create mode 100644 application/models/codex/Zgvdoktor_model.php create mode 100644 application/models/codex/Zgvgruppe_model.php create mode 100644 application/models/codex/Zgvmaster_model.php create mode 100644 application/models/codex/Zweck_model.php create mode 100644 application/models/content/Content_model.php create mode 100644 application/models/content/Contentchild_model.php create mode 100644 application/models/content/Contentgruppe_model.php create mode 100644 application/models/content/Contentlog_model.php create mode 100644 application/models/content/Contentsprache_model.php create mode 100644 application/models/content/Infoscreen_model.php create mode 100644 application/models/content/News_model.php create mode 100644 application/models/content/Template_model.php create mode 100644 application/models/content/Veranstaltung_model.php create mode 100644 application/models/content/Veranstaltungskategorie_model.php create mode 100644 application/models/crm/Aufnahmeschluessel_model.php create mode 100644 application/models/crm/Bewerbungstermine_model.php create mode 100644 application/models/crm/Buchungstyp_model.php create mode 100644 application/models/crm/Dokument_model.php create mode 100644 application/models/crm/Dokumentprestudent_model.php create mode 100644 application/models/crm/Konto_model.php create mode 100644 application/models/crm/Preincoming_model.php create mode 100644 application/models/crm/Preinteressent_model.php create mode 100644 application/models/crm/Preinteressentstudiengang_model.php create mode 100644 application/models/crm/Preoutgoing_model.php create mode 100644 application/models/crm/Student_model.php create mode 100644 application/models/education/Uebung_model.php create mode 100644 application/models/organisation/Erhalter_model.php create mode 100644 application/models/organisation/Fachbereich_model.php create mode 100644 application/models/organisation/Ferien_model.php create mode 100644 application/models/organisation/Lehrverband_model.php create mode 100644 application/models/organisation/Organisationseinheittyp_model.php create mode 100644 application/models/organisation/Semesterwochen_model.php create mode 100644 application/models/organisation/Service_model.php create mode 100644 application/models/organisation/Standort_model.php create mode 100644 application/models/organisation/Statistik_model.php create mode 100644 application/models/organisation/Studiengangstyp_model.php create mode 100644 application/models/organisation/Studienordnung_model.php create mode 100644 application/models/organisation/Studienordnungstatus_model.php create mode 100644 application/models/organisation/Studienplatz_model.php create mode 100644 application/models/person/Bankverbindung_model.php create mode 100644 application/models/person/Benutzergruppe_model.php create mode 100644 application/models/person/Fotostatus_model.php create mode 100644 application/models/person/Freebusy_model.php create mode 100644 application/models/person/Freebusytyp_model.php create mode 100644 application/models/person/Kontaktmedium_model.php create mode 100644 application/models/person/Kontakttyp_model.php create mode 100644 application/models/person/Notizzuordnung_model.php create mode 100644 application/models/project/Aktivitaet_model.php create mode 100644 application/models/project/Aufwandstyp_model.php create mode 100644 application/models/project/Projekt_ressource_model.php create mode 100644 application/models/project/Projektphase_model.php create mode 100644 application/models/project/Projekttask_model.php create mode 100644 application/models/project/Ressource_model.php create mode 100644 application/models/project/Scrumsprint_model.php create mode 100644 application/models/ressource/Betriebsmittel_model.php create mode 100644 application/models/ressource/Betriebsmittelperson_model.php create mode 100644 application/models/ressource/Betriebsmittelstatus_model.php create mode 100644 application/models/ressource/Betriebsmitteltyp_model.php create mode 100644 application/models/ressource/Coodle_model.php create mode 100644 application/models/ressource/Erreichbarkeit_model.php create mode 100644 application/models/ressource/Firma_model.php create mode 100644 application/models/ressource/Firmatag_model.php create mode 100644 application/models/ressource/Firmentyp_model.php create mode 100644 application/models/ressource/Funktion_model.php create mode 100644 application/models/ressource/Lehrmittel_model.php create mode 100644 application/models/ressource/Mitarbeiter_model.php create mode 100644 application/models/ressource/Ort_model.php create mode 100644 application/models/ressource/Ortraumtyp_model.php create mode 100644 application/models/ressource/Personfunktionstandort_model.php create mode 100644 application/models/ressource/Raumtyp_model.php create mode 100644 application/models/ressource/Reservierung_model.php create mode 100644 application/models/ressource/Stunde_model.php create mode 100644 application/models/ressource/Stundenplan_model.php create mode 100644 application/models/ressource/Zeitaufzeichnung_model.php create mode 100644 application/models/ressource/Zeitsperre_model.php create mode 100644 application/models/ressource/Zeitsperretyp_model.php create mode 100644 application/models/ressource/Zeitwunsch_model.php create mode 100644 application/models/system/Berechtigung_model.php create mode 100644 application/models/system/Cronjob_model.php create mode 100644 application/models/system/Filter_model.php create mode 100644 application/models/system/Log_model.php create mode 100644 application/models/system/PersonLock_model.php create mode 100644 application/models/system/Rolle_model.php create mode 100644 application/models/system/Rolleberechtigung_model.php create mode 100644 application/models/system/Server_model.php create mode 100644 application/models/system/Tag_model.php create mode 100644 application/models/system/Variable_model.php create mode 100644 application/models/system/Webservicelog_model.php create mode 100644 application/models/system/Webservicerecht_model.php create mode 100644 application/models/system/Webservicetyp_model.php create mode 100644 application/models/testtool/Ablauf_model.php create mode 100644 application/models/testtool/Antwort_model.php create mode 100644 application/models/testtool/Frage_model.php create mode 100644 application/models/testtool/Gebiet_model.php create mode 100644 application/models/testtool/Kategorie_model.php create mode 100644 application/models/testtool/Kriterien_model.php create mode 100644 application/models/testtool/Pruefling_model.php create mode 100644 application/models/testtool/Vorschlag_model.php diff --git a/application/controllers/api/v1/codex/Nation.php b/application/controllers/api/v1/codex/Nation.php index a8074bd82..ad6c5e10e 100644 --- a/application/controllers/api/v1/codex/Nation.php +++ b/application/controllers/api/v1/codex/Nation.php @@ -23,17 +23,17 @@ class Nation extends APIv1_Controller { parent::__construct(array('Nation' => 'basis/nation:r', 'All' => 'basis/nation:r')); // Load model NationModel - $this->load->model('codex/nation_model', 'NationModel'); + $this->load->model('codex/Nation_model', 'NationModel'); } - + public function getNation() { $nation_code = $this->get("nation_code"); - + if (isset($nation_code)) { $result = $this->NationModel->loadWhere(array('nation_code' => $nation_code)); - + $this->response($result, REST_Controller::HTTP_OK); } else @@ -41,7 +41,7 @@ class Nation extends APIv1_Controller $this->response(); } } - + public function getAll() { if (!$this->get('orderEnglish')) @@ -52,7 +52,7 @@ class Nation extends APIv1_Controller { $result = $this->NationModel->addOrder('engltext'); } - + if (isSuccess($result)) { if ($this->get('ohnesperre')) @@ -64,7 +64,7 @@ class Nation extends APIv1_Controller $result = $this->NationModel->load(); } } - + $this->response($result, REST_Controller::HTTP_OK); } -} \ No newline at end of file +} diff --git a/application/controllers/api/v1/codex/Zgv.php b/application/controllers/api/v1/codex/Zgv.php index d042b2b56..b1a0981dc 100644 --- a/application/controllers/api/v1/codex/Zgv.php +++ b/application/controllers/api/v1/codex/Zgv.php @@ -23,7 +23,7 @@ class Zgv extends APIv1_Controller { parent::__construct(array('Zgv' => 'basis/zgv:rw')); // Load model ZgvModel - $this->load->model('codex/zgv_model', 'ZgvModel'); + $this->load->model('codex/Zgv_model', 'ZgvModel'); } /** diff --git a/application/controllers/api/v1/crm/Bewerbungstermine.php b/application/controllers/api/v1/crm/Bewerbungstermine.php index 8d3c8b774..55d49ff58 100644 --- a/application/controllers/api/v1/crm/Bewerbungstermine.php +++ b/application/controllers/api/v1/crm/Bewerbungstermine.php @@ -30,7 +30,7 @@ class Bewerbungstermine extends APIv1_Controller ) ); // Load model BewerbungstermineModel - $this->load->model('crm/bewerbungstermine_model', 'BewerbungstermineModel'); + $this->load->model('crm/Bewerbungstermine_model', 'BewerbungstermineModel'); } diff --git a/application/controllers/api/v1/crm/Dokumentprestudent.php b/application/controllers/api/v1/crm/Dokumentprestudent.php index 020a876cd..e05815d33 100644 --- a/application/controllers/api/v1/crm/Dokumentprestudent.php +++ b/application/controllers/api/v1/crm/Dokumentprestudent.php @@ -29,7 +29,7 @@ class Dokumentprestudent extends APIv1_Controller ) ); // Load model DokumentprestudentModel - $this->load->model('crm/dokumentprestudent_model', 'DokumentprestudentModel'); + $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel'); } /** diff --git a/application/controllers/api/v1/person/Notizzuordnung.php b/application/controllers/api/v1/person/Notizzuordnung.php index c5dab8cbe..da185e20f 100644 --- a/application/controllers/api/v1/person/Notizzuordnung.php +++ b/application/controllers/api/v1/person/Notizzuordnung.php @@ -23,7 +23,7 @@ class Notizzuordnung extends APIv1_Controller { parent::__construct(array('Notizzuordnung' => 'basis/notizzuordnung:rw')); // Load model NotizzuordnungModel - $this->load->model('person/notizzuordnung_model', 'NotizzuordnungModel'); + $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); } diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index 3dc2919e1..575f1f23b 100644 --- a/application/controllers/system/infocenter/InfoCenter.php +++ b/application/controllers/system/infocenter/InfoCenter.php @@ -102,15 +102,15 @@ class InfoCenter extends Auth_Controller ); // Loads models - $this->load->model('crm/akte_model', 'AkteModel'); - $this->load->model('crm/prestudent_model', 'PrestudentModel'); - $this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel'); - $this->load->model('crm/statusgrund_model', 'StatusgrundModel'); - $this->load->model('person/notiz_model', 'NotizModel'); - $this->load->model('person/person_model', 'PersonModel'); - $this->load->model('system/message_model', 'MessageModel'); - $this->load->model('system/filters_model', 'FiltersModel'); - $this->load->model('system/personLock_model', 'PersonLockModel'); + $this->load->model('crm/Akte_model', 'AkteModel'); + $this->load->model('crm/Prestudent_model', 'PrestudentModel'); + $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); + $this->load->model('crm/Statusgrund_model', 'StatusgrundModel'); + $this->load->model('person/Notiz_model', 'NotizModel'); + $this->load->model('person/Person_model', 'PersonModel'); + $this->load->model('system/Message_model', 'MessageModel'); + $this->load->model('system/Filters_model', 'FiltersModel'); + $this->load->model('system/PersonLock_model', 'PersonLockModel'); // Loads libraries $this->load->library('PersonLogLib'); @@ -522,7 +522,7 @@ class InfoCenter extends Auth_Controller if (isSuccess($result)) { - $this->load->model('crm/dokumentprestudent_model', 'DokumentprestudentModel'); + $this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel'); //set documents which have been formal geprüft to accepted $dokument_kurzbzs = array(); diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php index 5f3f40e6d..5a0a77a31 100644 --- a/application/models/CL/Messages_model.php +++ b/application/models/CL/Messages_model.php @@ -1,10 +1,10 @@ dbTable = 'wawi.tbl_aufteilung'; + $this->pk = 'aufteilung_id'; + } +} diff --git a/application/models/accounting/Bestelldetail_model.php b/application/models/accounting/Bestelldetail_model.php new file mode 100644 index 000000000..dd57002d1 --- /dev/null +++ b/application/models/accounting/Bestelldetail_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_bestelldetail'; + $this->pk = 'bestelldetail_id'; + } +} diff --git a/application/models/accounting/Bestelldetailtag_model.php b/application/models/accounting/Bestelldetailtag_model.php new file mode 100644 index 000000000..a760c26a2 --- /dev/null +++ b/application/models/accounting/Bestelldetailtag_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_bestelldetailtag'; + $this->pk = array('bestelldetail_id', 'tag'); + } +} diff --git a/application/models/accounting/Bestellstatus_model.php b/application/models/accounting/Bestellstatus_model.php new file mode 100644 index 000000000..0f9810818 --- /dev/null +++ b/application/models/accounting/Bestellstatus_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_bestellstatus'; + $this->pk = 'bestellstatus_kurzbz'; + } +} diff --git a/application/models/accounting/Bestellung_model.php b/application/models/accounting/Bestellung_model.php new file mode 100644 index 000000000..0d0ea37f8 --- /dev/null +++ b/application/models/accounting/Bestellung_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_bestellung'; + $this->pk = 'bestellung_id'; + } +} diff --git a/application/models/accounting/Bestellungtag_model.php b/application/models/accounting/Bestellungtag_model.php new file mode 100644 index 000000000..77c7416f5 --- /dev/null +++ b/application/models/accounting/Bestellungtag_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_bestellungtag'; + $this->pk = array('bestellung_id', 'tag'); + } +} diff --git a/application/models/accounting/Buchung_model.php b/application/models/accounting/Buchung_model.php new file mode 100644 index 000000000..adc700dfc --- /dev/null +++ b/application/models/accounting/Buchung_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_buchung'; + $this->pk = 'buchung_id'; + } +} diff --git a/application/models/accounting/Buchungstyp_model.php b/application/models/accounting/Buchungstyp_model.php new file mode 100644 index 000000000..7ed47217d --- /dev/null +++ b/application/models/accounting/Buchungstyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_buchungstyp'; + $this->pk = 'buchungstyp_kurzbz'; + } +} diff --git a/application/models/accounting/Budget_model.php b/application/models/accounting/Budget_model.php new file mode 100644 index 000000000..f425f3479 --- /dev/null +++ b/application/models/accounting/Budget_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_budget'; + $this->pk = array('kostenstelle_id', 'geschaeftsjahr_kurzbz'); + } +} diff --git a/application/models/accounting/Rechnung_model.php b/application/models/accounting/Rechnung_model.php new file mode 100644 index 000000000..6e5ddcf83 --- /dev/null +++ b/application/models/accounting/Rechnung_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_rechnung'; + $this->pk = 'rechnung_id'; + } +} diff --git a/application/models/accounting/Rechnungsbetrag_model.php b/application/models/accounting/Rechnungsbetrag_model.php new file mode 100644 index 000000000..11617429c --- /dev/null +++ b/application/models/accounting/Rechnungsbetrag_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_rechnungsbetrag'; + $this->pk = 'rechnungsbetrag_id'; + } +} diff --git a/application/models/accounting/Rechnungstyp_model.php b/application/models/accounting/Rechnungstyp_model.php new file mode 100644 index 000000000..3f1e0633e --- /dev/null +++ b/application/models/accounting/Rechnungstyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_rechnungstyp'; + $this->pk = 'rechnungstyp_kurzbz'; + } +} diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php new file mode 100644 index 000000000..cd4b466d6 --- /dev/null +++ b/application/models/accounting/Vertrag_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_vertrag'; + $this->pk = 'vertrag_id'; + } +} diff --git a/application/models/accounting/Vertragsstatus_model.php b/application/models/accounting/Vertragsstatus_model.php new file mode 100644 index 000000000..21367b84a --- /dev/null +++ b/application/models/accounting/Vertragsstatus_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_vertragsstatus'; + $this->pk = 'vertragsstatus_kurzbz'; + } +} diff --git a/application/models/accounting/Vertragstyp_model.php b/application/models/accounting/Vertragstyp_model.php new file mode 100644 index 000000000..42d248217 --- /dev/null +++ b/application/models/accounting/Vertragstyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_vertragstyp'; + $this->pk = 'vertragstyp_kurzbz'; + } +} diff --git a/application/models/accounting/Zahlungstyp_model.php b/application/models/accounting/Zahlungstyp_model.php new file mode 100644 index 000000000..5ab7350ab --- /dev/null +++ b/application/models/accounting/Zahlungstyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_zahlungstyp'; + $this->pk = 'zahlungstyp_kurzbz'; + } +} diff --git a/application/models/codex/Akadgrad_model.php b/application/models/codex/Akadgrad_model.php new file mode 100644 index 000000000..0623ef3ab --- /dev/null +++ b/application/models/codex/Akadgrad_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_akadgrad'; + $this->pk = 'akadgrad_id'; + } +} diff --git a/application/models/codex/Archiv_model.php b/application/models/codex/Archiv_model.php new file mode 100644 index 000000000..45cde5a00 --- /dev/null +++ b/application/models/codex/Archiv_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_archiv'; + $this->pk = 'archiv_id'; + } +} diff --git a/application/models/codex/Aufmerksamdurch_model.php b/application/models/codex/Aufmerksamdurch_model.php new file mode 100644 index 000000000..2c5f5d2c6 --- /dev/null +++ b/application/models/codex/Aufmerksamdurch_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_aufmerksamdurch'; + $this->pk = 'aufmerksamdurch_kurzbz'; + } +} diff --git a/application/models/codex/Ausbildung_model.php b/application/models/codex/Ausbildung_model.php new file mode 100644 index 000000000..8cadcb92d --- /dev/null +++ b/application/models/codex/Ausbildung_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_ausbildung'; + $this->pk = 'ausbildungcode'; + } +} diff --git a/application/models/codex/Berufstaetigkeit_model.php b/application/models/codex/Berufstaetigkeit_model.php new file mode 100644 index 000000000..59b39d775 --- /dev/null +++ b/application/models/codex/Berufstaetigkeit_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_berufstaetigkeit'; + $this->pk = 'berufstaetigkeit_code'; + } +} diff --git a/application/models/codex/Beschaeftigungsausmass_model.php b/application/models/codex/Beschaeftigungsausmass_model.php new file mode 100644 index 000000000..3b54fa310 --- /dev/null +++ b/application/models/codex/Beschaeftigungsausmass_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_beschaeftigungsausmass'; + $this->pk = 'beschausmasscode'; + } +} diff --git a/application/models/codex/Besqual_model.php b/application/models/codex/Besqual_model.php new file mode 100644 index 000000000..b89cb123a --- /dev/null +++ b/application/models/codex/Besqual_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_besqual'; + $this->pk = 'besqualcode'; + } +} diff --git a/application/models/codex/Bisfunktion_model.php b/application/models/codex/Bisfunktion_model.php new file mode 100644 index 000000000..72135ecc0 --- /dev/null +++ b/application/models/codex/Bisfunktion_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_bisfunktion'; + $this->pk = array('studiengang_kz', 'bisverwendung_id'); + } +} diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php new file mode 100644 index 000000000..5f35aec9a --- /dev/null +++ b/application/models/codex/Bisio_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_bisio'; + $this->pk = 'bisio_id'; + } +} diff --git a/application/models/codex/Bisorgform_model.php b/application/models/codex/Bisorgform_model.php new file mode 100644 index 000000000..c489c849c --- /dev/null +++ b/application/models/codex/Bisorgform_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_bisorgform'; + $this->pk = 'bisorgform_kurzbz'; + } +} diff --git a/application/models/codex/Bisverwendung_model.php b/application/models/codex/Bisverwendung_model.php new file mode 100644 index 000000000..fa2cf84d0 --- /dev/null +++ b/application/models/codex/Bisverwendung_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_bisverwendung'; + $this->pk = 'bisverwendung_id'; + } +} diff --git a/application/models/codex/Bundesland_model.php b/application/models/codex/Bundesland_model.php new file mode 100644 index 000000000..03a4774ce --- /dev/null +++ b/application/models/codex/Bundesland_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_bundesland'; + $this->pk = 'bundesland_code'; + } +} diff --git a/application/models/codex/Entwicklungsteam_model.php b/application/models/codex/Entwicklungsteam_model.php new file mode 100644 index 000000000..5cf21c23b --- /dev/null +++ b/application/models/codex/Entwicklungsteam_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_entwicklungsteam'; + $this->pk = array('studiengang_kz', 'mitarbeiter_uid'); + } +} diff --git a/application/models/codex/Gemeinde_model.php b/application/models/codex/Gemeinde_model.php new file mode 100644 index 000000000..c782346a0 --- /dev/null +++ b/application/models/codex/Gemeinde_model.php @@ -0,0 +1,22 @@ +dbTable = "bis.tbl_gemeinde"; + $this->pk = "gemeinde_id"; + } + + public function getGemeindeByPlz($plz) + { + $this->addSelect("DISTINCT ON (ortschaftsname) ortschaftsname, gemeinde_id, plz, name, ortschaftskennziffer, bulacode, bulabez, kennziffer"); + $this->addOrder("ortschaftsname"); + + return $this->loadWhere(array("plz" => $plz)); + } +} \ No newline at end of file diff --git a/application/models/codex/Hauptberuf_model.php b/application/models/codex/Hauptberuf_model.php new file mode 100644 index 000000000..7ae7ee44d --- /dev/null +++ b/application/models/codex/Hauptberuf_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_hauptberuf'; + $this->pk = 'hauptberufcode'; + } +} diff --git a/application/models/codex/Lehrform_model.php b/application/models/codex/Lehrform_model.php new file mode 100644 index 000000000..dc53b3085 --- /dev/null +++ b/application/models/codex/Lehrform_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_lehrform'; + $this->pk = 'lehrform_kurzbz'; + } +} diff --git a/application/models/codex/Lgartcode_model.php b/application/models/codex/Lgartcode_model.php new file mode 100644 index 000000000..a2c09c00e --- /dev/null +++ b/application/models/codex/Lgartcode_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_lgartcode'; + $this->pk = 'lgartcode'; + } +} diff --git a/application/models/codex/Mobilitaetsprogramm_model.php b/application/models/codex/Mobilitaetsprogramm_model.php new file mode 100644 index 000000000..5fd46e725 --- /dev/null +++ b/application/models/codex/Mobilitaetsprogramm_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_mobilitaetsprogramm'; + $this->pk = 'mobilitaetsprogramm_code'; + } +} diff --git a/application/models/codex/Nation_model.php b/application/models/codex/Nation_model.php new file mode 100644 index 000000000..239639795 --- /dev/null +++ b/application/models/codex/Nation_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_nation'; + $this->pk = 'nation_code'; + } +} \ No newline at end of file diff --git a/application/models/codex/Note_model.php b/application/models/codex/Note_model.php new file mode 100644 index 000000000..e83ee2f48 --- /dev/null +++ b/application/models/codex/Note_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_note'; + $this->pk = 'note'; + } +} diff --git a/application/models/codex/Verwendung_model.php b/application/models/codex/Verwendung_model.php new file mode 100644 index 000000000..509b0388b --- /dev/null +++ b/application/models/codex/Verwendung_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_verwendung'; + $this->pk = 'verwendung_code'; + } +} diff --git a/application/models/codex/Zgv_model.php b/application/models/codex/Zgv_model.php new file mode 100644 index 000000000..1e1ba99ad --- /dev/null +++ b/application/models/codex/Zgv_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_zgv'; + $this->pk = 'zgv_code'; + } +} diff --git a/application/models/codex/Zgvdoktor_model.php b/application/models/codex/Zgvdoktor_model.php new file mode 100644 index 000000000..8caf397e0 --- /dev/null +++ b/application/models/codex/Zgvdoktor_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_zgvdoktor'; + $this->pk = 'zgvdoktor_code'; + } +} diff --git a/application/models/codex/Zgvgruppe_model.php b/application/models/codex/Zgvgruppe_model.php new file mode 100644 index 000000000..69da70271 --- /dev/null +++ b/application/models/codex/Zgvgruppe_model.php @@ -0,0 +1,13 @@ +dbTable = 'bis.tbl_zgvgruppe'; + $this->pk = 'gruppe_kurzbz'; + } +} \ No newline at end of file diff --git a/application/models/codex/Zgvmaster_model.php b/application/models/codex/Zgvmaster_model.php new file mode 100644 index 000000000..38f8a0dcb --- /dev/null +++ b/application/models/codex/Zgvmaster_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_zgvmaster'; + $this->pk = 'zgvmas_code'; + } +} diff --git a/application/models/codex/Zweck_model.php b/application/models/codex/Zweck_model.php new file mode 100644 index 000000000..600e9fb40 --- /dev/null +++ b/application/models/codex/Zweck_model.php @@ -0,0 +1,14 @@ +dbTable = 'bis.tbl_zweck'; + $this->pk = 'zweck_code'; + } +} diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php new file mode 100644 index 000000000..ee4315ebd --- /dev/null +++ b/application/models/content/Content_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_content'; + $this->pk = 'content_id'; + } +} diff --git a/application/models/content/Contentchild_model.php b/application/models/content/Contentchild_model.php new file mode 100644 index 000000000..11738d144 --- /dev/null +++ b/application/models/content/Contentchild_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_contentchild'; + $this->pk = 'contentchild_id'; + } +} diff --git a/application/models/content/Contentgruppe_model.php b/application/models/content/Contentgruppe_model.php new file mode 100644 index 000000000..03efc87b1 --- /dev/null +++ b/application/models/content/Contentgruppe_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_contentgruppe'; + $this->pk = array('gruppe_kurzbz', 'content_id'); + } +} diff --git a/application/models/content/Contentlog_model.php b/application/models/content/Contentlog_model.php new file mode 100644 index 000000000..025cb94aa --- /dev/null +++ b/application/models/content/Contentlog_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_contentlog'; + $this->pk = 'contentlog_id'; + } +} diff --git a/application/models/content/Contentsprache_model.php b/application/models/content/Contentsprache_model.php new file mode 100644 index 000000000..eb7e257b2 --- /dev/null +++ b/application/models/content/Contentsprache_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_contentsprache'; + $this->pk = 'contentsprache_id'; + } +} diff --git a/application/models/content/Infoscreen_model.php b/application/models/content/Infoscreen_model.php new file mode 100644 index 000000000..c4134ff06 --- /dev/null +++ b/application/models/content/Infoscreen_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_infoscreen'; + $this->pk = 'infoscreen_id'; + } +} diff --git a/application/models/content/News_model.php b/application/models/content/News_model.php new file mode 100644 index 000000000..8d636d808 --- /dev/null +++ b/application/models/content/News_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_news'; + $this->pk = 'news_id'; + } +} diff --git a/application/models/content/Template_model.php b/application/models/content/Template_model.php new file mode 100644 index 000000000..6f452e23c --- /dev/null +++ b/application/models/content/Template_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_template'; + $this->pk = 'template_kurzbz'; + } +} diff --git a/application/models/content/Veranstaltung_model.php b/application/models/content/Veranstaltung_model.php new file mode 100644 index 000000000..48e7bc2cc --- /dev/null +++ b/application/models/content/Veranstaltung_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_veranstaltung'; + $this->pk = 'veranstaltung_id'; + } +} diff --git a/application/models/content/Veranstaltungskategorie_model.php b/application/models/content/Veranstaltungskategorie_model.php new file mode 100644 index 000000000..85d069735 --- /dev/null +++ b/application/models/content/Veranstaltungskategorie_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_veranstaltungskategorie'; + $this->pk = 'veranstaltungskategorie_kurzbz'; + } +} diff --git a/application/models/crm/Aufnahmeschluessel_model.php b/application/models/crm/Aufnahmeschluessel_model.php new file mode 100644 index 000000000..df74791bb --- /dev/null +++ b/application/models/crm/Aufnahmeschluessel_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_aufnahmeschluessel'; + $this->pk = 'aufnahmeschluessel'; + } +} diff --git a/application/models/crm/Bewerbungstermine_model.php b/application/models/crm/Bewerbungstermine_model.php new file mode 100644 index 000000000..74326a702 --- /dev/null +++ b/application/models/crm/Bewerbungstermine_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_bewerbungstermine'; + $this->pk = 'bewerbungstermin_id'; + } +} diff --git a/application/models/crm/Buchungstyp_model.php b/application/models/crm/Buchungstyp_model.php new file mode 100644 index 000000000..f06e45eb2 --- /dev/null +++ b/application/models/crm/Buchungstyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_buchungstyp'; + $this->pk = 'buchungstyp_kurzbz'; + } +} diff --git a/application/models/crm/Dokument_model.php b/application/models/crm/Dokument_model.php new file mode 100644 index 000000000..7ef2be716 --- /dev/null +++ b/application/models/crm/Dokument_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_dokument'; + $this->pk = 'dokument_kurzbz'; + } +} diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php new file mode 100644 index 000000000..ab4764479 --- /dev/null +++ b/application/models/crm/Dokumentprestudent_model.php @@ -0,0 +1,71 @@ +dbTable = 'public.tbl_dokumentprestudent'; + $this->pk = array('prestudent_id', 'dokument_kurzbz'); + } + + /** + * setAccepted + */ + public function setAccepted($prestudent_id, $studiengang_kz) + { + $result = null; + + if (is_numeric($prestudent_id) && is_numeric($studiengang_kz)) + { + $query = 'INSERT INTO public.tbl_dokumentprestudent (dokument_kurzbz, prestudent_id, insertamum) ( + SELECT ds.dokument_kurzbz, + p.prestudent_id, + NOW() AS insertamum + FROM (SELECT DISTINCT person_id, dokument_kurzbz FROM public.tbl_akte) a + INNER JOIN public.tbl_prestudent p USING(person_id) + INNER JOIN public.tbl_dokumentstudiengang ds USING(dokument_kurzbz, studiengang_kz) + LEFT JOIN public.tbl_dokumentprestudent dp USING(dokument_kurzbz, prestudent_id) + WHERE ds.onlinebewerbung IS TRUE + AND (dp.dokument_kurzbz IS NULL AND dp.prestudent_id IS NULL) + AND p.prestudent_id = ? + AND ds.studiengang_kz = ? + )'; + + $result = $this->execQuery($query, array($prestudent_id, $studiengang_kz)); + } + + return $result; + } + + /** + * setAcceptedDocuments + */ + public function setAcceptedDocuments($prestudent_id, $dokument_kurzbz) + { + $result = null; + + if (is_numeric($prestudent_id) && is_array($dokument_kurzbz) && count($dokument_kurzbz) > 0) + { + $query = 'INSERT INTO public.tbl_dokumentprestudent (dokument_kurzbz, prestudent_id, insertamum) ( + SELECT d.dokument_kurzbz, + ? AS prestudent_id, + NOW() AS insertamum + FROM public.tbl_dokument d + WHERE d.dokument_kurzbz IN ? + AND d.dokument_kurzbz NOT IN ( + SELECT dokument_kurzbz + FROM public.tbl_dokumentprestudent + WHERE prestudent_id = ? + ) + )'; + + $result = $this->execQuery($query, array($prestudent_id, $dokument_kurzbz, $prestudent_id)); + } + + return $result; + } +} diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php new file mode 100644 index 000000000..286d3189e --- /dev/null +++ b/application/models/crm/Konto_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_konto'; + $this->pk = 'buchungsnr'; + } +} diff --git a/application/models/crm/Preincoming_model.php b/application/models/crm/Preincoming_model.php new file mode 100644 index 000000000..f9906781f --- /dev/null +++ b/application/models/crm/Preincoming_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_preincoming'; + $this->pk = 'preincoming_id'; + } +} diff --git a/application/models/crm/Preinteressent_model.php b/application/models/crm/Preinteressent_model.php new file mode 100644 index 000000000..bfc2a8afa --- /dev/null +++ b/application/models/crm/Preinteressent_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_preinteressent'; + $this->pk = 'preinteressent_id'; + } +} diff --git a/application/models/crm/Preinteressentstudiengang_model.php b/application/models/crm/Preinteressentstudiengang_model.php new file mode 100644 index 000000000..4ed665840 --- /dev/null +++ b/application/models/crm/Preinteressentstudiengang_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_preinteressentstudiengang'; + $this->pk = array('preinteressent_id', 'studiengang_kz'); + } +} diff --git a/application/models/crm/Preoutgoing_model.php b/application/models/crm/Preoutgoing_model.php new file mode 100644 index 000000000..e9e8e76fd --- /dev/null +++ b/application/models/crm/Preoutgoing_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_preoutgoing'; + $this->pk = 'preoutgoing_id'; + } +} diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php new file mode 100644 index 000000000..532658208 --- /dev/null +++ b/application/models/crm/Student_model.php @@ -0,0 +1,48 @@ +dbTable = 'public.tbl_student'; + $this->pk = array('student_uid'); + $this->hasSequence = false; + } + + // **** + // * Generiert die Matrikelnummer + // * FORMAT: 0710254001 + // * 07 = Jahr + // * 1/2/0 = WS/SS/incoming + // * 0254 = Studiengangskennzahl vierstellig + // * 001 = Laufende Nummer + // **** + public function generateMatrikelnummer($studiengang_kz, $studiensemester_kurzbz) + { + $jahr = mb_substr($studiensemester_kurzbz, 4); + $sem = mb_substr($studiensemester_kurzbz, 0, 2); + if ($sem == 'SS') + $jahr = $jahr - 1; + $art = 0; + + $matrikelnummer = sprintf("%02d", $jahr).$art.sprintf("%04d", $studiengang_kz); + + $qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE ? ORDER BY matrikelnr DESC LIMIT 1"; + + $matrikelnrres = $this->execQuery($qry, array($matrikelnummer.'%')); + + if (hasData($matrikelnrres)) + { + $max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7); + } + else + $max = 0; + + $max += 1; + return $matrikelnummer.sprintf("%03d", $max); + } +} diff --git a/application/models/education/Uebung_model.php b/application/models/education/Uebung_model.php new file mode 100644 index 000000000..199328225 --- /dev/null +++ b/application/models/education/Uebung_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_uebung'; + $this->pk = 'uebung_id'; + } +} diff --git a/application/models/organisation/Erhalter_model.php b/application/models/organisation/Erhalter_model.php new file mode 100644 index 000000000..607d9ccd9 --- /dev/null +++ b/application/models/organisation/Erhalter_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_erhalter'; + $this->pk = 'erhalter_kz'; + } +} diff --git a/application/models/organisation/Fachbereich_model.php b/application/models/organisation/Fachbereich_model.php new file mode 100644 index 000000000..e69565364 --- /dev/null +++ b/application/models/organisation/Fachbereich_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_fachbereich'; + $this->pk = 'fachbereich_kurzbz'; + } +} diff --git a/application/models/organisation/Ferien_model.php b/application/models/organisation/Ferien_model.php new file mode 100644 index 000000000..2ade75aa4 --- /dev/null +++ b/application/models/organisation/Ferien_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_ferien'; + $this->pk = array('studiengang_kz', 'bezeichnung'); + } +} diff --git a/application/models/organisation/Lehrverband_model.php b/application/models/organisation/Lehrverband_model.php new file mode 100644 index 000000000..953e4b7b2 --- /dev/null +++ b/application/models/organisation/Lehrverband_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_lehrverband'; + $this->pk = array('gruppe', 'verband', 'semester', 'studiengang_kz'); + } +} diff --git a/application/models/organisation/Organisationseinheittyp_model.php b/application/models/organisation/Organisationseinheittyp_model.php new file mode 100644 index 000000000..6355758b6 --- /dev/null +++ b/application/models/organisation/Organisationseinheittyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_organisationseinheittyp'; + $this->pk = 'organisationseinheittyp_kurzbz'; + } +} diff --git a/application/models/organisation/Semesterwochen_model.php b/application/models/organisation/Semesterwochen_model.php new file mode 100644 index 000000000..32666804d --- /dev/null +++ b/application/models/organisation/Semesterwochen_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_semesterwochen'; + $this->pk = array('studiengang_kz', 'semester'); + } +} diff --git a/application/models/organisation/Service_model.php b/application/models/organisation/Service_model.php new file mode 100644 index 000000000..5f692e707 --- /dev/null +++ b/application/models/organisation/Service_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_service'; + $this->pk = 'service_id'; + } +} diff --git a/application/models/organisation/Standort_model.php b/application/models/organisation/Standort_model.php new file mode 100644 index 000000000..382236e2f --- /dev/null +++ b/application/models/organisation/Standort_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_standort'; + $this->pk = 'standort_id'; + } +} diff --git a/application/models/organisation/Statistik_model.php b/application/models/organisation/Statistik_model.php new file mode 100644 index 000000000..b72ac0577 --- /dev/null +++ b/application/models/organisation/Statistik_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_statistik'; + $this->pk = 'statistik_kurzbz'; + } +} diff --git a/application/models/organisation/Studiengangstyp_model.php b/application/models/organisation/Studiengangstyp_model.php new file mode 100644 index 000000000..9a6b5df22 --- /dev/null +++ b/application/models/organisation/Studiengangstyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_studiengangstyp'; + $this->pk = 'typ'; + } +} diff --git a/application/models/organisation/Studienordnung_model.php b/application/models/organisation/Studienordnung_model.php new file mode 100644 index 000000000..fc2e28d4b --- /dev/null +++ b/application/models/organisation/Studienordnung_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_studienordnung'; + $this->pk = 'studienordnung_id'; + } +} diff --git a/application/models/organisation/Studienordnungstatus_model.php b/application/models/organisation/Studienordnungstatus_model.php new file mode 100644 index 000000000..8b6417ab1 --- /dev/null +++ b/application/models/organisation/Studienordnungstatus_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_studienordnungstatus'; + $this->pk = 'status_kurzbz'; + } +} diff --git a/application/models/organisation/Studienplatz_model.php b/application/models/organisation/Studienplatz_model.php new file mode 100644 index 000000000..7bfd8b13b --- /dev/null +++ b/application/models/organisation/Studienplatz_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_studienplatz'; + $this->pk = 'studienplatz_id'; + } +} diff --git a/application/models/person/Bankverbindung_model.php b/application/models/person/Bankverbindung_model.php new file mode 100644 index 000000000..193aad257 --- /dev/null +++ b/application/models/person/Bankverbindung_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_bankverbindung'; + $this->pk = 'bankverbindung_id'; + } +} diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php new file mode 100644 index 000000000..e569094c4 --- /dev/null +++ b/application/models/person/Benutzergruppe_model.php @@ -0,0 +1,15 @@ +dbTable = 'public.tbl_benutzergruppe'; + $this->pk = array('gruppe_kurzbz', 'uid'); + $this->hasSequence = false; + } +} diff --git a/application/models/person/Fotostatus_model.php b/application/models/person/Fotostatus_model.php new file mode 100644 index 000000000..eb2b43e51 --- /dev/null +++ b/application/models/person/Fotostatus_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_fotostatus'; + $this->pk = 'fotostatus_kurzbz'; + } +} diff --git a/application/models/person/Freebusy_model.php b/application/models/person/Freebusy_model.php new file mode 100644 index 000000000..01969dfc1 --- /dev/null +++ b/application/models/person/Freebusy_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_freebusy'; + $this->pk = 'freebusy_id'; + } +} diff --git a/application/models/person/Freebusytyp_model.php b/application/models/person/Freebusytyp_model.php new file mode 100644 index 000000000..d5207850c --- /dev/null +++ b/application/models/person/Freebusytyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_freebusytyp'; + $this->pk = 'freebusytyp_kurzbz'; + } +} diff --git a/application/models/person/Kontaktmedium_model.php b/application/models/person/Kontaktmedium_model.php new file mode 100644 index 000000000..cc330ddd7 --- /dev/null +++ b/application/models/person/Kontaktmedium_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_kontaktmedium'; + $this->pk = 'kontaktmedium_kurzbz'; + } +} diff --git a/application/models/person/Kontakttyp_model.php b/application/models/person/Kontakttyp_model.php new file mode 100644 index 000000000..d32cded13 --- /dev/null +++ b/application/models/person/Kontakttyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_kontakttyp'; + $this->pk = 'kontakttyp'; + } +} diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index a66a881c2..a5453aaa1 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -11,7 +11,7 @@ class Notiz_model extends DB_Model $this->dbTable = 'public.tbl_notiz'; $this->pk = 'notiz_id'; } - + // ------------------------------------------------------------------------------------------------------ /** * Get a specialization for a prestudent @@ -20,10 +20,10 @@ class Notiz_model extends DB_Model { // Join with the table public.tbl_notizzuordnung using notiz_id $this->addJoin('public.tbl_notizzuordnung', 'notiz_id'); - + return $this->NotizModel->loadWhere(array('prestudent_id' => $prestudent_id, 'titel' => $titel)); } - + /** * Remove a specialization */ @@ -31,31 +31,31 @@ class Notiz_model extends DB_Model { // Loads model Notizzuordnung_model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); - + // Start DB transaction $this->db->trans_start(false); - + $result = $this->delete(array('notiz_id' => $notiz_id)); if (isSuccess($result)) { $result = $this->NotizzuordnungModel->delete(array('notiz_id' => $notiz_id)); } - + // Transaction complete! $this->db->trans_complete(); - + // Check if everything went ok during the transaction if ($this->db->trans_status() === false || isError($result)) { $this->db->trans_rollback(); - $result = error('An error occurred while removing a specialization', EXIT_ERROR); + $result = error($result->msg, EXIT_ERROR); } else { $this->db->trans_commit(); $result = success('Specialization successfully removed'); } - + return $result; } @@ -66,32 +66,32 @@ class Notiz_model extends DB_Model { // Loads model Notizzuordnung_model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); - + // Start DB transaction $this->db->trans_start(false); - + $result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => true)); $notiz_id = $result->retval; if (isSuccess($result)) { $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'prestudent_id' => $prestudent_id)); } - + // Transaction complete! $this->db->trans_complete(); - + // Check if everything went ok during the transaction if ($this->db->trans_status() === false || isError($result)) { $this->db->trans_rollback(); - $result = error('An error occurred while adding a specialization', EXIT_ERROR); + $result = error($result->msg, EXIT_ERROR); } else { $this->db->trans_commit(); $result = success($notiz_id); } - + return $result; } @@ -122,7 +122,7 @@ class Notiz_model extends DB_Model if ($this->db->trans_status() === false || isError($result)) { $this->db->trans_rollback(); - $result = error('An error occurred while adding a note for a person', EXIT_ERROR); + $result = error($result->msg, EXIT_ERROR); } else { diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php new file mode 100644 index 000000000..187a8399b --- /dev/null +++ b/application/models/person/Notizzuordnung_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_notizzuordnung'; + $this->pk = 'notizzuordnung_id'; + } +} diff --git a/application/models/project/Aktivitaet_model.php b/application/models/project/Aktivitaet_model.php new file mode 100644 index 000000000..529040aa3 --- /dev/null +++ b/application/models/project/Aktivitaet_model.php @@ -0,0 +1,14 @@ +dbTable = 'fue.tbl_aktivitaet'; + $this->pk = 'aktivitaet_kurzbz'; + } +} diff --git a/application/models/project/Aufwandstyp_model.php b/application/models/project/Aufwandstyp_model.php new file mode 100644 index 000000000..2f20600ce --- /dev/null +++ b/application/models/project/Aufwandstyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'fue.tbl_aufwandstyp'; + $this->pk = 'aufwandstyp_kurzbz'; + } +} diff --git a/application/models/project/Projekt_ressource_model.php b/application/models/project/Projekt_ressource_model.php new file mode 100644 index 000000000..d641556fd --- /dev/null +++ b/application/models/project/Projekt_ressource_model.php @@ -0,0 +1,14 @@ +dbTable = 'fue.tbl_projekt_ressource'; + $this->pk = 'projekt_ressource_id'; + } +} diff --git a/application/models/project/Projektphase_model.php b/application/models/project/Projektphase_model.php new file mode 100644 index 000000000..4980ed64b --- /dev/null +++ b/application/models/project/Projektphase_model.php @@ -0,0 +1,14 @@ +dbTable = 'fue.tbl_projektphase'; + $this->pk = 'projektphase_id'; + } +} diff --git a/application/models/project/Projekttask_model.php b/application/models/project/Projekttask_model.php new file mode 100644 index 000000000..64ea94089 --- /dev/null +++ b/application/models/project/Projekttask_model.php @@ -0,0 +1,14 @@ +dbTable = 'fue.tbl_projekttask'; + $this->pk = 'projekttask_id'; + } +} diff --git a/application/models/project/Ressource_model.php b/application/models/project/Ressource_model.php new file mode 100644 index 000000000..35eb4eb97 --- /dev/null +++ b/application/models/project/Ressource_model.php @@ -0,0 +1,14 @@ +dbTable = 'fue.tbl_ressource'; + $this->pk = 'ressource_id'; + } +} diff --git a/application/models/project/Scrumsprint_model.php b/application/models/project/Scrumsprint_model.php new file mode 100644 index 000000000..c2c8a60a1 --- /dev/null +++ b/application/models/project/Scrumsprint_model.php @@ -0,0 +1,14 @@ +dbTable = 'fue.tbl_scrumsprint'; + $this->pk = 'scrumsprint_id'; + } +} diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php new file mode 100644 index 000000000..849a9199f --- /dev/null +++ b/application/models/ressource/Betriebsmittel_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_betriebsmittel'; + $this->pk = 'betriebsmittel_id'; + } +} diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php new file mode 100644 index 000000000..924f670e0 --- /dev/null +++ b/application/models/ressource/Betriebsmittelperson_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_betriebsmittelperson'; + $this->pk = 'betriebsmittelperson_id'; + } +} diff --git a/application/models/ressource/Betriebsmittelstatus_model.php b/application/models/ressource/Betriebsmittelstatus_model.php new file mode 100644 index 000000000..7b4f70c59 --- /dev/null +++ b/application/models/ressource/Betriebsmittelstatus_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_betriebsmittelstatus'; + $this->pk = 'betriebsmittelstatus_kurzbz'; + } +} diff --git a/application/models/ressource/Betriebsmitteltyp_model.php b/application/models/ressource/Betriebsmitteltyp_model.php new file mode 100644 index 000000000..23bec97a8 --- /dev/null +++ b/application/models/ressource/Betriebsmitteltyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'wawi.tbl_betriebsmitteltyp'; + $this->pk = 'betriebsmitteltyp'; + } +} diff --git a/application/models/ressource/Coodle_model.php b/application/models/ressource/Coodle_model.php new file mode 100644 index 000000000..1382bf7a0 --- /dev/null +++ b/application/models/ressource/Coodle_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_coodle'; + $this->pk = 'coodle_id'; + } +} diff --git a/application/models/ressource/Erreichbarkeit_model.php b/application/models/ressource/Erreichbarkeit_model.php new file mode 100644 index 000000000..b16b1614f --- /dev/null +++ b/application/models/ressource/Erreichbarkeit_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_erreichbarkeit'; + $this->pk = 'erreichbarkeit_kurzbz'; + } +} diff --git a/application/models/ressource/Firma_model.php b/application/models/ressource/Firma_model.php new file mode 100644 index 000000000..1b8dfb51d --- /dev/null +++ b/application/models/ressource/Firma_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_firma'; + $this->pk = 'firma_id'; + } +} diff --git a/application/models/ressource/Firmatag_model.php b/application/models/ressource/Firmatag_model.php new file mode 100644 index 000000000..582ea0679 --- /dev/null +++ b/application/models/ressource/Firmatag_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_firmatag'; + $this->pk = array('tag', 'firma_id'); + } +} diff --git a/application/models/ressource/Firmentyp_model.php b/application/models/ressource/Firmentyp_model.php new file mode 100644 index 000000000..a9aa93705 --- /dev/null +++ b/application/models/ressource/Firmentyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_firmentyp'; + $this->pk = 'firmentyp_kurzbz'; + } +} diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php new file mode 100644 index 000000000..43908167c --- /dev/null +++ b/application/models/ressource/Funktion_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_funktion'; + $this->pk = 'funktion_kurzbz'; + } +} diff --git a/application/models/ressource/Lehrmittel_model.php b/application/models/ressource/Lehrmittel_model.php new file mode 100644 index 000000000..b21e91764 --- /dev/null +++ b/application/models/ressource/Lehrmittel_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_lehrmittel'; + $this->pk = 'lehrmittel_kurzbz'; + } +} diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php new file mode 100644 index 000000000..1e03a0ecd --- /dev/null +++ b/application/models/ressource/Mitarbeiter_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_mitarbeiter'; + $this->pk = 'mitarbeiter_uid'; + } +} diff --git a/application/models/ressource/Ort_model.php b/application/models/ressource/Ort_model.php new file mode 100644 index 000000000..59b213a54 --- /dev/null +++ b/application/models/ressource/Ort_model.php @@ -0,0 +1,23 @@ +dbTable = "public.tbl_ort"; + $this->pk = "ort_kurzbz"; + } + + public function getAll($raumtyp_kurzbz) + { + $this->addOrder("ort_kurzbz"); + + $this->addJoin("public.tbl_ortraumtyp", "ort_kurzbz"); + + return $this->OrtModel->loadWhere(array("raumtyp_kurzbz" => $raumtyp_kurzbz)); + } +} \ No newline at end of file diff --git a/application/models/ressource/Ortraumtyp_model.php b/application/models/ressource/Ortraumtyp_model.php new file mode 100644 index 000000000..af0d3cb09 --- /dev/null +++ b/application/models/ressource/Ortraumtyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_ortraumtyp'; + $this->pk = array('hierarchie', 'ort_kurzbz'); + } +} diff --git a/application/models/ressource/Personfunktionstandort_model.php b/application/models/ressource/Personfunktionstandort_model.php new file mode 100644 index 000000000..addbb760a --- /dev/null +++ b/application/models/ressource/Personfunktionstandort_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_personfunktionstandort'; + $this->pk = 'personfunktionstandort_id'; + } +} diff --git a/application/models/ressource/Raumtyp_model.php b/application/models/ressource/Raumtyp_model.php new file mode 100644 index 000000000..afc8a7cc3 --- /dev/null +++ b/application/models/ressource/Raumtyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_raumtyp'; + $this->pk = 'raumtyp_kurzbz'; + } +} diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php new file mode 100644 index 000000000..37d0cb376 --- /dev/null +++ b/application/models/ressource/Reservierung_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_reservierung'; + $this->pk = 'reservierung_id'; + } +} diff --git a/application/models/ressource/Stunde_model.php b/application/models/ressource/Stunde_model.php new file mode 100644 index 000000000..05a9cddff --- /dev/null +++ b/application/models/ressource/Stunde_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_stunde'; + $this->pk = 'stunde'; + } +} diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php new file mode 100644 index 000000000..be3d520b5 --- /dev/null +++ b/application/models/ressource/Stundenplan_model.php @@ -0,0 +1,14 @@ +dbTable = 'lehre.tbl_stundenplan'; + $this->pk = 'stundenplan_id'; + } +} diff --git a/application/models/ressource/Zeitaufzeichnung_model.php b/application/models/ressource/Zeitaufzeichnung_model.php new file mode 100644 index 000000000..f887a20a0 --- /dev/null +++ b/application/models/ressource/Zeitaufzeichnung_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_zeitaufzeichnung'; + $this->pk = 'zeitaufzeichnung_id'; + } +} diff --git a/application/models/ressource/Zeitsperre_model.php b/application/models/ressource/Zeitsperre_model.php new file mode 100644 index 000000000..07889e349 --- /dev/null +++ b/application/models/ressource/Zeitsperre_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_zeitsperre'; + $this->pk = 'zeitsperre_id'; + } +} diff --git a/application/models/ressource/Zeitsperretyp_model.php b/application/models/ressource/Zeitsperretyp_model.php new file mode 100644 index 000000000..ef54571e8 --- /dev/null +++ b/application/models/ressource/Zeitsperretyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_zeitsperretyp'; + $this->pk = 'zeitsperretyp_kurzbz'; + } +} diff --git a/application/models/ressource/Zeitwunsch_model.php b/application/models/ressource/Zeitwunsch_model.php new file mode 100644 index 000000000..ea2ec698a --- /dev/null +++ b/application/models/ressource/Zeitwunsch_model.php @@ -0,0 +1,14 @@ +dbTable = 'campus.tbl_zeitwunsch'; + $this->pk = array('tag', 'mitarbeiter_uid', 'stunde'); + } +} diff --git a/application/models/system/Berechtigung_model.php b/application/models/system/Berechtigung_model.php new file mode 100644 index 000000000..9bd572614 --- /dev/null +++ b/application/models/system/Berechtigung_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_berechtigung'; + $this->pk = 'berechtigung_kurzbz'; + } +} diff --git a/application/models/system/Cronjob_model.php b/application/models/system/Cronjob_model.php new file mode 100644 index 000000000..e47ea5bef --- /dev/null +++ b/application/models/system/Cronjob_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_cronjob'; + $this->pk = 'cronjob_id'; + } +} diff --git a/application/models/system/Filter_model.php b/application/models/system/Filter_model.php new file mode 100644 index 000000000..5d44e0052 --- /dev/null +++ b/application/models/system/Filter_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_filter'; + $this->pk = 'filter_id'; + } +} diff --git a/application/models/system/Log_model.php b/application/models/system/Log_model.php new file mode 100644 index 000000000..8b27f6c53 --- /dev/null +++ b/application/models/system/Log_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_log'; + $this->pk = 'log_id'; + } +} diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php index 6f2ad01e2..764c3ae14 100644 --- a/application/models/system/Message_model.php +++ b/application/models/system/Message_model.php @@ -151,7 +151,7 @@ class Message_model extends DB_Model } else { - return error($this->db->error(), EXIT_DATABASE); + return error($this->db->error(), FHC_DB_ERROR); } } @@ -168,7 +168,7 @@ class Message_model extends DB_Model } else { - return error($this->db->error(), EXIT_DATABASE); + return error($this->db->error(), FHC_DB_ERROR); } } diff --git a/application/models/system/PersonLock_model.php b/application/models/system/PersonLock_model.php new file mode 100644 index 000000000..1d106b789 --- /dev/null +++ b/application/models/system/PersonLock_model.php @@ -0,0 +1,88 @@ +dbTable = 'system.tbl_person_lock'; + $this->pk = 'lock_id'; + } + + /** + * Checks if a specific person is locked. By default, looks for entries with no app in locktable for the person. + * Alternatively, looks only for locks in a certain app. + * @param $person_id + * @param null $app + * @return array all locks for a person if locked, null otherwise + */ + public function checkIfLocked($person_id, $app = null) + { + $lockdata = array('person_id' => $person_id, 'app' => $app); + + $result = $this->loadWhere($lockdata); + + if ($result->error) + return error($result->retval); + + if (count($result->retval) > 0) + return success($result->retval); + else + return success(null); + } + + /** + * Locks a person. Returns null if person was not locked (e.g. when already locked). + * @param $person_id + * @param $uid user who locks the person + * @param $app optional, application in which person is locked + * @return array inserted lock id if person was locked, null otherwise + */ + public function lockPerson($person_id, $uid, $app = null) + { + $locked = $this->checkIfLocked($person_id, $app); + + if ($locked->error) + return error($locked->retval); + + //insert only if not already locked + if ($locked->retval === null) + return $this->insert(array('person_id' => $person_id, 'uid' => $uid, 'app' => $app)); + else + return success(null); + } + + /** + * Remove a lock for a person. By default, removes any entries in locktable for the person. + * Alternatively, removes only locks in a certain app. + * @param $person_id + * @param null $app + * @return array deleted lock ids if person was locked, null otherwise + */ + public function unlockPerson($person_id, $app = null) + { + $deleted = array(); + $locks = $this->checkIfLocked($person_id, $app); + + if ($locks->retval === null) + return success(null); + + foreach ($locks->retval as $lock) + { + $result = $this->delete($lock->lock_id); + if ($result->error) + return error($result->retval); + + $deleted[] = $lock; + } + + return success($deleted); + } +} diff --git a/application/models/system/Rolle_model.php b/application/models/system/Rolle_model.php new file mode 100644 index 000000000..5ba085853 --- /dev/null +++ b/application/models/system/Rolle_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_rolle'; + $this->pk = 'rolle_kurzbz'; + } +} diff --git a/application/models/system/Rolleberechtigung_model.php b/application/models/system/Rolleberechtigung_model.php new file mode 100644 index 000000000..0b08da1ca --- /dev/null +++ b/application/models/system/Rolleberechtigung_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_rolleberechtigung'; + $this->pk = array('rolle_kurzbz', 'berechtigung_kurzbz'); + } +} diff --git a/application/models/system/Server_model.php b/application/models/system/Server_model.php new file mode 100644 index 000000000..4521e1fd4 --- /dev/null +++ b/application/models/system/Server_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_server'; + $this->pk = 'server_kurzbz'; + } +} \ No newline at end of file diff --git a/application/models/system/Tag_model.php b/application/models/system/Tag_model.php new file mode 100644 index 000000000..94434da45 --- /dev/null +++ b/application/models/system/Tag_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_tag'; + $this->pk = 'tag'; + } +} diff --git a/application/models/system/Variable_model.php b/application/models/system/Variable_model.php new file mode 100644 index 000000000..9800999fe --- /dev/null +++ b/application/models/system/Variable_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_variable'; + $this->pk = array('uid', 'name'); + } +} diff --git a/application/models/system/Webservicelog_model.php b/application/models/system/Webservicelog_model.php new file mode 100644 index 000000000..dc45b13a7 --- /dev/null +++ b/application/models/system/Webservicelog_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_webservicelog'; + $this->pk = 'webservicelog_id'; + } +} diff --git a/application/models/system/Webservicerecht_model.php b/application/models/system/Webservicerecht_model.php new file mode 100644 index 000000000..a5bd036f0 --- /dev/null +++ b/application/models/system/Webservicerecht_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_webservicerecht'; + $this->pk = 'webservicerecht_id'; + } +} diff --git a/application/models/system/Webservicetyp_model.php b/application/models/system/Webservicetyp_model.php new file mode 100644 index 000000000..5d989de2a --- /dev/null +++ b/application/models/system/Webservicetyp_model.php @@ -0,0 +1,14 @@ +dbTable = 'system.tbl_webservicetyp'; + $this->pk = 'webservicetyp_kurzbz'; + } +} diff --git a/application/models/testtool/Ablauf_model.php b/application/models/testtool/Ablauf_model.php new file mode 100644 index 000000000..748926658 --- /dev/null +++ b/application/models/testtool/Ablauf_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_ablauf'; + $this->pk = 'ablauf_id'; + } +} diff --git a/application/models/testtool/Antwort_model.php b/application/models/testtool/Antwort_model.php new file mode 100644 index 000000000..1594be6c3 --- /dev/null +++ b/application/models/testtool/Antwort_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_antwort'; + $this->pk = 'antwort_id'; + } +} diff --git a/application/models/testtool/Frage_model.php b/application/models/testtool/Frage_model.php new file mode 100644 index 000000000..de64c303b --- /dev/null +++ b/application/models/testtool/Frage_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_frage'; + $this->pk = 'frage_id'; + } +} diff --git a/application/models/testtool/Gebiet_model.php b/application/models/testtool/Gebiet_model.php new file mode 100644 index 000000000..202d6a4aa --- /dev/null +++ b/application/models/testtool/Gebiet_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_gebiet'; + $this->pk = 'gebiet_id'; + } +} diff --git a/application/models/testtool/Kategorie_model.php b/application/models/testtool/Kategorie_model.php new file mode 100644 index 000000000..10e450651 --- /dev/null +++ b/application/models/testtool/Kategorie_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_kategorie'; + $this->pk = 'kategorie_kurzbz'; + } +} diff --git a/application/models/testtool/Kriterien_model.php b/application/models/testtool/Kriterien_model.php new file mode 100644 index 000000000..83d0fb97c --- /dev/null +++ b/application/models/testtool/Kriterien_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_kriterien'; + $this->pk = 'kategorie_kurzbz'; + } +} diff --git a/application/models/testtool/Pruefling_model.php b/application/models/testtool/Pruefling_model.php new file mode 100644 index 000000000..da131ba4a --- /dev/null +++ b/application/models/testtool/Pruefling_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_pruefling'; + $this->pk = 'pruefling_id'; + } +} diff --git a/application/models/testtool/Vorschlag_model.php b/application/models/testtool/Vorschlag_model.php new file mode 100644 index 000000000..853852da2 --- /dev/null +++ b/application/models/testtool/Vorschlag_model.php @@ -0,0 +1,14 @@ +dbTable = 'testtool.tbl_vorschlag'; + $this->pk = 'vorschlag_id'; + } +} diff --git a/application/widgets/Nation_widget.php b/application/widgets/Nation_widget.php index 79059c84f..c99ac9fef 100644 --- a/application/widgets/Nation_widget.php +++ b/application/widgets/Nation_widget.php @@ -5,7 +5,7 @@ class Nation_widget extends DropdownWidget public function display($widgetData) { // Nation - $this->load->model('codex/nation_model', 'NationModel'); + $this->load->model('codex/Nation_model', 'NationModel'); $this->NationModel->addOrder('nation_code'); $this->addSelectToModel($this->NationModel, 'nation_code', 'kurztext'); @@ -18,4 +18,4 @@ class Nation_widget extends DropdownWidget $this->loadDropDownView($widgetData); } -} \ No newline at end of file +} diff --git a/application/widgets/Zgv_widget.php b/application/widgets/Zgv_widget.php index b34bb27b6..f0af7b256 100644 --- a/application/widgets/Zgv_widget.php +++ b/application/widgets/Zgv_widget.php @@ -5,7 +5,7 @@ class Zgv_widget extends DropdownWidget public function display($widgetData) { // Zgv - $this->load->model('codex/zgv_model', 'ZgvModel'); + $this->load->model('codex/Zgv_model', 'ZgvModel'); $this->ZgvModel->addOrder('zgv_bez'); $this->addSelectToModel($this->ZgvModel, 'zgv_code', 'zgv_bez'); @@ -18,4 +18,4 @@ class Zgv_widget extends DropdownWidget $this->loadDropDownView($widgetData); } -} \ No newline at end of file +}