diff --git a/application/controllers/api/v1/education/Abgabe.php b/application/controllers/api/v1/education/Abgabe.php index bdcd1b634..6215b43ed 100644 --- a/application/controllers/api/v1/education/Abgabe.php +++ b/application/controllers/api/v1/education/Abgabe.php @@ -23,9 +23,7 @@ class Abgabe extends APIv1_Controller { parent::__construct(); // Load model AbgabeModel - $this->load->model('education/abgabe', 'AbgabeModel'); - - + $this->load->model('education/Abgabe_model', 'AbgabeModel'); } /** diff --git a/application/controllers/api/v1/education/Abschlussbeurteilung.php b/application/controllers/api/v1/education/Abschlussbeurteilung.php index a16b48f2e..1ca830e41 100644 --- a/application/controllers/api/v1/education/Abschlussbeurteilung.php +++ b/application/controllers/api/v1/education/Abschlussbeurteilung.php @@ -23,9 +23,7 @@ class Abschlussbeurteilung extends APIv1_Controller { parent::__construct(); // Load model AbschlussbeurteilungModel - $this->load->model('education/abschlussbeurteilung', 'AbschlussbeurteilungModel'); - - + $this->load->model('education/Abschlussbeurteilung_model', 'AbschlussbeurteilungModel'); } /** diff --git a/application/controllers/api/v1/education/Abschlusspruefung.php b/application/controllers/api/v1/education/Abschlusspruefung.php index c0fbacf5a..e46ce14e7 100644 --- a/application/controllers/api/v1/education/Abschlusspruefung.php +++ b/application/controllers/api/v1/education/Abschlusspruefung.php @@ -23,9 +23,7 @@ class Abschlusspruefung extends APIv1_Controller { parent::__construct(); // Load model AbschlusspruefungModel - $this->load->model('education/abschlusspruefung', 'AbschlusspruefungModel'); - - + $this->load->model('education/Abschlusspruefung_model', 'AbschlusspruefungModel'); } /** diff --git a/application/controllers/api/v1/education/Anrechnung.php b/application/controllers/api/v1/education/Anrechnung.php index 943b97022..abf469da8 100644 --- a/application/controllers/api/v1/education/Anrechnung.php +++ b/application/controllers/api/v1/education/Anrechnung.php @@ -23,9 +23,7 @@ class Anrechnung extends APIv1_Controller { parent::__construct(); // Load model AnrechnungModel - $this->load->model('education/anrechnung', 'AnrechnungModel'); - - + $this->load->model('education/Anrechnung_model', 'AnrechnungModel'); } /** diff --git a/application/controllers/api/v1/education/Anwesenheit.php b/application/controllers/api/v1/education/Anwesenheit.php index 64bec9a78..e74101ee0 100644 --- a/application/controllers/api/v1/education/Anwesenheit.php +++ b/application/controllers/api/v1/education/Anwesenheit.php @@ -23,9 +23,7 @@ class Anwesenheit extends APIv1_Controller { parent::__construct(); // Load model AnwesenheitModel - $this->load->model('education/anwesenheit', 'AnwesenheitModel'); - - + $this->load->model('education/Anwesenheit_model', 'AnwesenheitModel'); } /** diff --git a/application/controllers/api/v1/education/Beispiel.php b/application/controllers/api/v1/education/Beispiel.php index 62a9d0ca9..b0fecfea6 100644 --- a/application/controllers/api/v1/education/Beispiel.php +++ b/application/controllers/api/v1/education/Beispiel.php @@ -23,9 +23,7 @@ class Beispiel extends APIv1_Controller { parent::__construct(); // Load model BeispielModel - $this->load->model('education/beispiel', 'BeispielModel'); - - + $this->load->model('education/Beispiel_model', 'BeispielModel'); } /** diff --git a/application/controllers/api/v1/education/Betreuerart.php b/application/controllers/api/v1/education/Betreuerart.php index 21206695a..a076bf5fd 100644 --- a/application/controllers/api/v1/education/Betreuerart.php +++ b/application/controllers/api/v1/education/Betreuerart.php @@ -23,9 +23,7 @@ class Betreuerart extends APIv1_Controller { parent::__construct(); // Load model BetreuerartModel - $this->load->model('education/betreuerart', 'BetreuerartModel'); - - + $this->load->model('education/Betreuerart_model', 'BetreuerartModel'); } /** diff --git a/application/controllers/api/v1/education/Feedback.php b/application/controllers/api/v1/education/Feedback.php index 553157df9..0d205d3b0 100644 --- a/application/controllers/api/v1/education/Feedback.php +++ b/application/controllers/api/v1/education/Feedback.php @@ -23,9 +23,7 @@ class Feedback extends APIv1_Controller { parent::__construct(); // Load model FeedbackModel - $this->load->model('education/feedback', 'FeedbackModel'); - - + $this->load->model('education/Feedback_model', 'FeedbackModel'); } /** diff --git a/application/controllers/api/v1/education/Legesamtnote.php b/application/controllers/api/v1/education/Legesamtnote.php index 35f7f8307..adc4af365 100644 --- a/application/controllers/api/v1/education/Legesamtnote.php +++ b/application/controllers/api/v1/education/Legesamtnote.php @@ -23,9 +23,7 @@ class Legesamtnote extends APIv1_Controller { parent::__construct(); // Load model LegesamtnoteModel - $this->load->model('education/legesamtnote', 'LegesamtnoteModel'); - - + $this->load->model('education/Legesamtnote_model', 'LegesamtnoteModel'); } /** diff --git a/application/controllers/api/v1/education/Lehreinheit.php b/application/controllers/api/v1/education/Lehreinheit.php index b558294df..7fe1a8e44 100644 --- a/application/controllers/api/v1/education/Lehreinheit.php +++ b/application/controllers/api/v1/education/Lehreinheit.php @@ -23,9 +23,7 @@ class Lehreinheit extends APIv1_Controller { parent::__construct(); // Load model LehreinheitModel - $this->load->model('education/lehreinheit', 'LehreinheitModel'); - - + $this->load->model('education/Lehreinheit_model', 'LehreinheitModel'); } /** diff --git a/application/controllers/api/v1/education/Lehreinheitgruppe.php b/application/controllers/api/v1/education/Lehreinheitgruppe.php index 650ccfdeb..cc2a41242 100644 --- a/application/controllers/api/v1/education/Lehreinheitgruppe.php +++ b/application/controllers/api/v1/education/Lehreinheitgruppe.php @@ -23,9 +23,7 @@ class Lehreinheitgruppe extends APIv1_Controller { parent::__construct(); // Load model LehreinheitgruppeModel - $this->load->model('education/lehreinheitgruppe', 'LehreinheitgruppeModel'); - - + $this->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel'); } /** diff --git a/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php b/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php index 29788b2e8..e3cd51018 100644 --- a/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php +++ b/application/controllers/api/v1/education/Lehreinheitmitarbeiter.php @@ -23,9 +23,7 @@ class Lehreinheitmitarbeiter extends APIv1_Controller { parent::__construct(); // Load model LehreinheitmitarbeiterModel - $this->load->model('education/lehreinheitmitarbeiter', 'LehreinheitmitarbeiterModel'); - - + $this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel'); } /** diff --git a/application/controllers/api/v1/education/Lehrfach.php b/application/controllers/api/v1/education/Lehrfach.php index cf3398e81..8fca6fc61 100644 --- a/application/controllers/api/v1/education/Lehrfach.php +++ b/application/controllers/api/v1/education/Lehrfach.php @@ -23,9 +23,7 @@ class Lehrfach extends APIv1_Controller { parent::__construct(); // Load model LehrfachModel - $this->load->model('education/lehrfach', 'LehrfachModel'); - - + $this->load->model('education/Lehrfach_model', 'LehrfachModel'); } /** diff --git a/application/controllers/api/v1/education/Lehrfunktion.php b/application/controllers/api/v1/education/Lehrfunktion.php index 9a2995220..227526d8a 100644 --- a/application/controllers/api/v1/education/Lehrfunktion.php +++ b/application/controllers/api/v1/education/Lehrfunktion.php @@ -23,9 +23,7 @@ class Lehrfunktion extends APIv1_Controller { parent::__construct(); // Load model LehrfunktionModel - $this->load->model('education/lehrfunktion', 'LehrfunktionModel'); - - + $this->load->model('education/Lehrfunktion_model', 'LehrfunktionModel'); } /** diff --git a/application/controllers/api/v1/education/Lehrtyp.php b/application/controllers/api/v1/education/Lehrtyp.php index 741ec0e48..210f9ffc6 100644 --- a/application/controllers/api/v1/education/Lehrtyp.php +++ b/application/controllers/api/v1/education/Lehrtyp.php @@ -23,9 +23,7 @@ class Lehrtyp extends APIv1_Controller { parent::__construct(); // Load model LehrtypModel - $this->load->model('education/lehrtyp', 'LehrtypModel'); - - + $this->load->model('education/Lehrtyp_model', 'LehrtypModel'); } /** diff --git a/application/controllers/api/v1/education/Lehrveranstaltung.php b/application/controllers/api/v1/education/Lehrveranstaltung.php index ef564c81d..6604600df 100644 --- a/application/controllers/api/v1/education/Lehrveranstaltung.php +++ b/application/controllers/api/v1/education/Lehrveranstaltung.php @@ -23,9 +23,7 @@ class Lehrveranstaltung extends APIv1_Controller { parent::__construct(); // Load model LehrveranstaltungModel - $this->load->model('education/lehrveranstaltung', 'LehrveranstaltungModel'); - - + $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel'); } /** diff --git a/application/controllers/api/v1/education/LeNotenschluessel.php b/application/controllers/api/v1/education/Lenotenschluessel.php similarity index 91% rename from application/controllers/api/v1/education/LeNotenschluessel.php rename to application/controllers/api/v1/education/Lenotenschluessel.php index d2af36602..235328ed7 100644 --- a/application/controllers/api/v1/education/LeNotenschluessel.php +++ b/application/controllers/api/v1/education/Lenotenschluessel.php @@ -14,7 +14,7 @@ if (!defined('BASEPATH')) exit('No direct script access allowed'); -class LeNotenschluessel extends APIv1_Controller +class Lenotenschluessel extends APIv1_Controller { /** * LeNotenschluessel API constructor. @@ -23,7 +23,7 @@ class LeNotenschluessel extends APIv1_Controller { parent::__construct(); // Load model LeNotenschluesselModel - $this->load->model('education/lenotenschluessel', 'LeNotenschluesselModel'); + $this->load->model('education/LeNotenschluessel_model', 'LeNotenschluesselModel'); } diff --git a/application/controllers/api/v1/education/LePruefung.php b/application/controllers/api/v1/education/Lepruefung.php similarity index 92% rename from application/controllers/api/v1/education/LePruefung.php rename to application/controllers/api/v1/education/Lepruefung.php index 52f8f4428..283987d49 100644 --- a/application/controllers/api/v1/education/LePruefung.php +++ b/application/controllers/api/v1/education/Lepruefung.php @@ -14,7 +14,7 @@ if (!defined('BASEPATH')) exit('No direct script access allowed'); -class LePruefung extends APIv1_Controller +class Lepruefung extends APIv1_Controller { /** * LePruefung API constructor. @@ -23,9 +23,7 @@ class LePruefung extends APIv1_Controller { parent::__construct(); // Load model LePruefungModel - $this->load->model('education/lepruefung', 'LePruefungModel'); - - + $this->load->model('education/LePruefung_model', 'LePruefungModel'); } /** diff --git a/application/controllers/api/v1/education/Lvangebot.php b/application/controllers/api/v1/education/Lvangebot.php index a4faaf06f..ec464abf3 100644 --- a/application/controllers/api/v1/education/Lvangebot.php +++ b/application/controllers/api/v1/education/Lvangebot.php @@ -23,9 +23,7 @@ class Lvangebot extends APIv1_Controller { parent::__construct(); // Load model LvangebotModel - $this->load->model('education/lvangebot', 'LvangebotModel'); - - + $this->load->model('education/Lvangebot_model', 'LvangebotModel'); } /** diff --git a/application/controllers/api/v1/education/Lvgesamtnote.php b/application/controllers/api/v1/education/Lvgesamtnote.php index 866e23ddb..a0813add8 100644 --- a/application/controllers/api/v1/education/Lvgesamtnote.php +++ b/application/controllers/api/v1/education/Lvgesamtnote.php @@ -23,9 +23,7 @@ class Lvgesamtnote extends APIv1_Controller { parent::__construct(); // Load model LvgesamtnoteModel - $this->load->model('education/lvgesamtnote', 'LvgesamtnoteModel'); - - + $this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel'); } /** diff --git a/application/controllers/api/v1/education/Lvinfo.php b/application/controllers/api/v1/education/Lvinfo.php index a3a61d848..0b7a3c827 100644 --- a/application/controllers/api/v1/education/Lvinfo.php +++ b/application/controllers/api/v1/education/Lvinfo.php @@ -23,9 +23,7 @@ class Lvinfo extends APIv1_Controller { parent::__construct(); // Load model LvinfoModel - $this->load->model('education/lvinfo', 'LvinfoModel'); - - + $this->load->model('education/Lvinfo_model', 'LvinfoModel'); } /** diff --git a/application/controllers/api/v1/education/Lvregel.php b/application/controllers/api/v1/education/Lvregel.php index 278e17b77..8766add07 100644 --- a/application/controllers/api/v1/education/Lvregel.php +++ b/application/controllers/api/v1/education/Lvregel.php @@ -23,9 +23,7 @@ class Lvregel extends APIv1_Controller { parent::__construct(); // Load model LvregelModel - $this->load->model('education/lvregel', 'LvregelModel'); - - + $this->load->model('education/Lvregel_model', 'LvregelModel'); } /** diff --git a/application/controllers/api/v1/education/Lvregeltyp.php b/application/controllers/api/v1/education/Lvregeltyp.php index ffcead2d7..912cb3e11 100644 --- a/application/controllers/api/v1/education/Lvregeltyp.php +++ b/application/controllers/api/v1/education/Lvregeltyp.php @@ -23,9 +23,7 @@ class Lvregeltyp extends APIv1_Controller { parent::__construct(); // Load model LvregeltypModel - $this->load->model('education/lvregeltyp', 'LvregeltypModel'); - - + $this->load->model('education/Lvregeltyp_model', 'LvregeltypModel'); } /** diff --git a/application/controllers/api/v1/education/Moodle.php b/application/controllers/api/v1/education/Moodle.php index 4a26a0db2..c76706534 100644 --- a/application/controllers/api/v1/education/Moodle.php +++ b/application/controllers/api/v1/education/Moodle.php @@ -23,9 +23,7 @@ class Moodle extends APIv1_Controller { parent::__construct(); // Load model MoodleModel - $this->load->model('education/moodle', 'MoodleModel'); - - + $this->load->model('education/Moodle_model', 'MoodleModel'); } /** diff --git a/application/controllers/api/v1/education/Notenschluessel.php b/application/controllers/api/v1/education/Notenschluessel.php index 051cbbd7d..62ac99afb 100644 --- a/application/controllers/api/v1/education/Notenschluessel.php +++ b/application/controllers/api/v1/education/Notenschluessel.php @@ -23,9 +23,7 @@ class Notenschluessel extends APIv1_Controller { parent::__construct(); // Load model NotenschluesselModel - $this->load->model('education/notenschluessel', 'NotenschluesselModel'); - - + $this->load->model('education/Notenschluessel_model', 'NotenschluesselModel'); } /** diff --git a/application/controllers/api/v1/education/Notenschluesselaufteilung.php b/application/controllers/api/v1/education/Notenschluesselaufteilung.php index f51f819a3..eb9e1c848 100644 --- a/application/controllers/api/v1/education/Notenschluesselaufteilung.php +++ b/application/controllers/api/v1/education/Notenschluesselaufteilung.php @@ -23,9 +23,7 @@ class Notenschluesselaufteilung extends APIv1_Controller { parent::__construct(); // Load model NotenschluesselaufteilungModel - $this->load->model('education/notenschluesselaufteilung', 'NotenschluesselaufteilungModel'); - - + $this->load->model('education/Notenschluesselaufteilung_model', 'NotenschluesselaufteilungModel'); } /** diff --git a/application/controllers/api/v1/education/Notenschluesseluebung.php b/application/controllers/api/v1/education/Notenschluesseluebung.php index 1bcd2ca37..e50319c2b 100644 --- a/application/controllers/api/v1/education/Notenschluesseluebung.php +++ b/application/controllers/api/v1/education/Notenschluesseluebung.php @@ -23,9 +23,7 @@ class Notenschluesseluebung extends APIv1_Controller { parent::__construct(); // Load model NotenschluesseluebungModel - $this->load->model('education/notenschluesseluebung', 'NotenschluesseluebungModel'); - - + $this->load->model('education/Notenschluesseluebung_model', 'NotenschluesseluebungModel'); } /** diff --git a/application/controllers/api/v1/education/Notenschluesselzuordnung.php b/application/controllers/api/v1/education/Notenschluesselzuordnung.php index a62497106..18efc95d7 100644 --- a/application/controllers/api/v1/education/Notenschluesselzuordnung.php +++ b/application/controllers/api/v1/education/Notenschluesselzuordnung.php @@ -23,9 +23,7 @@ class Notenschluesselzuordnung extends APIv1_Controller { parent::__construct(); // Load model NotenschluesselzuordnungModel - $this->load->model('education/notenschluesselzuordnung', 'NotenschluesselzuordnungModel'); - - + $this->load->model('education/Notenschluesselzuordnung_model', 'NotenschluesselzuordnungModel'); } /** diff --git a/application/controllers/api/v1/education/Paabgabe.php b/application/controllers/api/v1/education/Paabgabe.php index 542bbce10..4f81ca9d1 100644 --- a/application/controllers/api/v1/education/Paabgabe.php +++ b/application/controllers/api/v1/education/Paabgabe.php @@ -23,9 +23,7 @@ class Paabgabe extends APIv1_Controller { parent::__construct(); // Load model PaabgabeModel - $this->load->model('education/paabgabe', 'PaabgabeModel'); - - + $this->load->model('education/Paabgabe_model', 'PaabgabeModel'); } /** diff --git a/application/controllers/api/v1/education/Paabgabetyp.php b/application/controllers/api/v1/education/Paabgabetyp.php index 7e17dd0c8..248c609d9 100644 --- a/application/controllers/api/v1/education/Paabgabetyp.php +++ b/application/controllers/api/v1/education/Paabgabetyp.php @@ -23,9 +23,7 @@ class Paabgabetyp extends APIv1_Controller { parent::__construct(); // Load model PaabgabetypModel - $this->load->model('education/paabgabetyp', 'PaabgabetypModel'); - - + $this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel'); } /** diff --git a/application/controllers/api/v1/education/Projektarbeit.php b/application/controllers/api/v1/education/Projektarbeit.php index 6e3aa2bb1..7a6b32123 100644 --- a/application/controllers/api/v1/education/Projektarbeit.php +++ b/application/controllers/api/v1/education/Projektarbeit.php @@ -23,9 +23,7 @@ class Projektarbeit extends APIv1_Controller { parent::__construct(); // Load model ProjektarbeitModel - $this->load->model('education/projektarbeit', 'ProjektarbeitModel'); - - + $this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel'); } /** diff --git a/application/controllers/api/v1/education/Projektbetreuer.php b/application/controllers/api/v1/education/Projektbetreuer.php index b60921cd8..d4d211137 100644 --- a/application/controllers/api/v1/education/Projektbetreuer.php +++ b/application/controllers/api/v1/education/Projektbetreuer.php @@ -23,9 +23,7 @@ class Projektbetreuer extends APIv1_Controller { parent::__construct(); // Load model ProjektbetreuerModel - $this->load->model('education/projektbetreuer', 'ProjektbetreuerModel'); - - + $this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel'); } /** diff --git a/application/controllers/api/v1/education/Projekttyp.php b/application/controllers/api/v1/education/Projekttyp.php index 88de98157..a0d70fec1 100644 --- a/application/controllers/api/v1/education/Projekttyp.php +++ b/application/controllers/api/v1/education/Projekttyp.php @@ -23,9 +23,7 @@ class Projekttyp extends APIv1_Controller { parent::__construct(); // Load model ProjekttypModel - $this->load->model('education/projekttyp', 'ProjekttypModel'); - - + $this->load->model('education/Projekttyp_model', 'ProjekttypModel'); } /** diff --git a/application/controllers/api/v1/education/Pruefung.php b/application/controllers/api/v1/education/Pruefung.php index 00b76d118..f402f035e 100644 --- a/application/controllers/api/v1/education/Pruefung.php +++ b/application/controllers/api/v1/education/Pruefung.php @@ -23,9 +23,7 @@ class Pruefung extends APIv1_Controller { parent::__construct(); // Load model PruefungModel - $this->load->model('education/pruefung', 'PruefungModel'); - - + $this->load->model('education/Pruefung_model', 'PruefungModel'); } /** diff --git a/application/controllers/api/v1/education/Pruefungsanmeldung.php b/application/controllers/api/v1/education/Pruefungsanmeldung.php index e2c999068..286a77c1e 100644 --- a/application/controllers/api/v1/education/Pruefungsanmeldung.php +++ b/application/controllers/api/v1/education/Pruefungsanmeldung.php @@ -23,9 +23,7 @@ class Pruefungsanmeldung extends APIv1_Controller { parent::__construct(); // Load model PruefungsanmeldungModel - $this->load->model('education/pruefungsanmeldung', 'PruefungsanmeldungModel'); - - + $this->load->model('education/Pruefungsanmeldung_model', 'PruefungsanmeldungModel'); } /** diff --git a/application/controllers/api/v1/education/Pruefungsfenster.php b/application/controllers/api/v1/education/Pruefungsfenster.php index 818a74f7b..ddaa03aa1 100644 --- a/application/controllers/api/v1/education/Pruefungsfenster.php +++ b/application/controllers/api/v1/education/Pruefungsfenster.php @@ -23,9 +23,7 @@ class Pruefungsfenster extends APIv1_Controller { parent::__construct(); // Load model PruefungsfensterModel - $this->load->model('education/pruefungsfenster', 'PruefungsfensterModel'); - - + $this->load->model('education/Pruefungsfenster_model', 'PruefungsfensterModel'); } /** diff --git a/application/controllers/api/v1/education/Pruefungsstatus.php b/application/controllers/api/v1/education/Pruefungsstatus.php index 026543dac..da2c5adee 100644 --- a/application/controllers/api/v1/education/Pruefungsstatus.php +++ b/application/controllers/api/v1/education/Pruefungsstatus.php @@ -23,9 +23,7 @@ class Pruefungsstatus extends APIv1_Controller { parent::__construct(); // Load model PruefungsstatusModel - $this->load->model('education/pruefungsstatus', 'PruefungsstatusModel'); - - + $this->load->model('education/Pruefungsstatus_model', 'PruefungsstatusModel'); } /** diff --git a/application/controllers/api/v1/education/Pruefungstermin.php b/application/controllers/api/v1/education/Pruefungstermin.php index 735f2748b..59effc99e 100644 --- a/application/controllers/api/v1/education/Pruefungstermin.php +++ b/application/controllers/api/v1/education/Pruefungstermin.php @@ -23,9 +23,7 @@ class Pruefungstermin extends APIv1_Controller { parent::__construct(); // Load model PruefungsterminModel - $this->load->model('education/pruefungstermin', 'PruefungsterminModel'); - - + $this->load->model('education/Pruefungstermin_model', 'PruefungsterminModel'); } /** diff --git a/application/controllers/api/v1/education/Pruefungstyp.php b/application/controllers/api/v1/education/Pruefungstyp.php index ac053ff20..91820a853 100644 --- a/application/controllers/api/v1/education/Pruefungstyp.php +++ b/application/controllers/api/v1/education/Pruefungstyp.php @@ -23,9 +23,7 @@ class Pruefungstyp extends APIv1_Controller { parent::__construct(); // Load model PruefungstypModel - $this->load->model('education/pruefungstyp', 'PruefungstypModel'); - - + $this->load->model('education/Pruefungstyp_model', 'PruefungstypModel'); } /** diff --git a/application/controllers/api/v1/education/Studentbeispiel.php b/application/controllers/api/v1/education/Studentbeispiel.php index 63d6f85e6..a1dfa9fa9 100644 --- a/application/controllers/api/v1/education/Studentbeispiel.php +++ b/application/controllers/api/v1/education/Studentbeispiel.php @@ -23,9 +23,7 @@ class Studentbeispiel extends APIv1_Controller { parent::__construct(); // Load model StudentbeispielModel - $this->load->model('education/studentbeispiel', 'StudentbeispielModel'); - - + $this->load->model('education/Studentbeispiel_model', 'StudentbeispielModel'); } /** diff --git a/application/controllers/api/v1/education/Studentlehrverband.php b/application/controllers/api/v1/education/Studentlehrverband.php index 98cb8b8e0..3dccddae6 100644 --- a/application/controllers/api/v1/education/Studentlehrverband.php +++ b/application/controllers/api/v1/education/Studentlehrverband.php @@ -23,9 +23,7 @@ class Studentlehrverband extends APIv1_Controller { parent::__construct(); // Load model StudentlehrverbandModel - $this->load->model('education/studentlehrverband', 'StudentlehrverbandModel'); - - + $this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel'); } /** diff --git a/application/controllers/api/v1/education/Studentuebung.php b/application/controllers/api/v1/education/Studentuebung.php index 3d16ec9b4..e069661ec 100644 --- a/application/controllers/api/v1/education/Studentuebung.php +++ b/application/controllers/api/v1/education/Studentuebung.php @@ -23,9 +23,7 @@ class Studentuebung extends APIv1_Controller { parent::__construct(); // Load model StudentuebungModel - $this->load->model('education/studentuebung', 'StudentuebungModel'); - - + $this->load->model('education/Studentuebung_model', 'StudentuebungModel'); } /** diff --git a/application/controllers/api/v1/education/Uebung.php b/application/controllers/api/v1/education/Uebung.php index 0a089798c..9c1b901c2 100644 --- a/application/controllers/api/v1/education/Uebung.php +++ b/application/controllers/api/v1/education/Uebung.php @@ -23,9 +23,7 @@ class Uebung extends APIv1_Controller { parent::__construct(); // Load model UebungModel - $this->load->model('education/uebung', 'UebungModel'); - - + $this->load->model('Education/uebung_model', 'UebungModel'); } /** diff --git a/application/controllers/api/v1/education/Zeugnis.php b/application/controllers/api/v1/education/Zeugnis.php index 76db88263..f94d56768 100644 --- a/application/controllers/api/v1/education/Zeugnis.php +++ b/application/controllers/api/v1/education/Zeugnis.php @@ -23,9 +23,7 @@ class Zeugnis extends APIv1_Controller { parent::__construct(); // Load model ZeugnisModel - $this->load->model('education/zeugnis', 'ZeugnisModel'); - - + $this->load->model('education/Zeugnis_model', 'ZeugnisModel'); } /** diff --git a/application/controllers/api/v1/education/Zeugnisnote.php b/application/controllers/api/v1/education/Zeugnisnote.php index a12d32625..ffeb56486 100644 --- a/application/controllers/api/v1/education/Zeugnisnote.php +++ b/application/controllers/api/v1/education/Zeugnisnote.php @@ -23,9 +23,7 @@ class Zeugnisnote extends APIv1_Controller { parent::__construct(); // Load model ZeugnisnoteModel - $this->load->model('education/zeugnisnote', 'ZeugnisnoteModel'); - - + $this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel'); } /** diff --git a/application/controllers/api/v1/system/Appdaten.php b/application/controllers/api/v1/system/Appdaten.php index c0790a7d7..6c71a8825 100644 --- a/application/controllers/api/v1/system/Appdaten.php +++ b/application/controllers/api/v1/system/Appdaten.php @@ -23,9 +23,7 @@ class Appdaten extends APIv1_Controller { parent::__construct(); // Load model AppdatenModel - $this->load->model('system/appdaten_model', 'AppdatenModel'); - - + $this->load->model('system/Appdaten_model', 'AppdatenModel'); } /** diff --git a/application/controllers/api/v1/system/Thread.php b/application/controllers/api/v1/system/Thread.php index 26fd0deb8..ab885dcd7 100644 --- a/application/controllers/api/v1/system/Thread.php +++ b/application/controllers/api/v1/system/Thread.php @@ -23,9 +23,7 @@ class Thread extends APIv1_Controller { parent::__construct(); // Load model ThreadModel - $this->load->model('system/thread_model', 'ThreadModel'); - - + $this->load->model('system/Thread_model', 'ThreadModel'); } /** diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index 0fa924eb8..5a1ca48f8 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -17,8 +17,11 @@ class PhrasesLib $this->ci =& get_instance(); + // Loads message configuration + $this->ci->config->load('message'); + $this->ci->load->library('parser'); - + $this->ci->load->model('system/Phrase_model', 'PhraseModel'); $this->ci->load->model('system/Phrasentext_model', 'PhrasentextModel'); diff --git a/tests/codeception/_data/dump.sql b/tests/codeception/_data/dump.sql index 112d8dc0e..3b43f6170 100644 --- a/tests/codeception/_data/dump.sql +++ b/tests/codeception/_data/dump.sql @@ -423,7 +423,9 @@ DELETE FROM system.tbl_rolleberechtigung WHERE berechtigung_kurzbz IN ( 'wawi/inventar:begrenzt', 'fs/dms', 'system/phrase', - 'system/vorlagestudiengang' + 'system/vorlagestudiengang', + 'system/vorlage', + 'system/appdaten' ); -- DELETE FROM system.tbl_berechtigung @@ -652,7 +654,9 @@ DELETE FROM system.tbl_berechtigung WHERE berechtigung_kurzbz IN ( 'wawi/inventar:begrenzt', 'fs/dms', 'system/phrase', - 'system/vorlagestudiengang' + 'system/vorlagestudiengang', + 'system/vorlage', + 'system/appdaten' ); -- INSERT Permissions @@ -881,6 +885,8 @@ INSERT INTO system.tbl_berechtigung (berechtigung_kurzbz, beschreibung) VALUES(' INSERT INTO system.tbl_berechtigung (berechtigung_kurzbz, beschreibung) VALUES('basis/message', ''); INSERT INTO system.tbl_berechtigung (berechtigung_kurzbz, beschreibung) VALUES('system/phrase', ''); INSERT INTO system.tbl_berechtigung (berechtigung_kurzbz, beschreibung) VALUES('system/vorlagestudiengang', ''); +INSERT INTO system.tbl_berechtigung (berechtigung_kurzbz, beschreibung) VALUES('system/vorlage', ''); +INSERT INTO system.tbl_berechtigung (berechtigung_kurzbz, beschreibung) VALUES('system/appdaten', ''); -- INSERT link between user admin and permissions INSERT INTO system.tbl_rolleberechtigung (berechtigung_kurzbz, rolle_kurzbz, art) VALUES('basis/archiv', 'admin', 'suid'); @@ -1108,6 +1114,8 @@ INSERT INTO system.tbl_rolleberechtigung (berechtigung_kurzbz, rolle_kurzbz, art INSERT INTO system.tbl_rolleberechtigung (berechtigung_kurzbz, rolle_kurzbz, art) VALUES('basis/message', 'admin', 'suid'); INSERT INTO system.tbl_rolleberechtigung (berechtigung_kurzbz, rolle_kurzbz, art) VALUES('system/phrase', 'admin', 'suid'); INSERT INTO system.tbl_rolleberechtigung (berechtigung_kurzbz, rolle_kurzbz, art) VALUES('system/vorlagestudiengang', 'admin', 'suid'); +INSERT INTO system.tbl_rolleberechtigung (berechtigung_kurzbz, rolle_kurzbz, art) VALUES('system/vorlage', 'admin', 'suid'); +INSERT INTO system.tbl_rolleberechtigung (berechtigung_kurzbz, rolle_kurzbz, art) VALUES('system/appdaten', 'admin', 'suid'); -- EMPTY public.tbl_statistik DELETE FROM public.tbl_statistik; diff --git a/tests/codeception/tests/api/v1/AbgabeCept.php b/tests/codeception/tests/api/v1/AbgabeCept.php index c6c2c0539..afe794d47 100644 --- a/tests/codeception/tests/api/v1/AbgabeCept.php +++ b/tests/codeception/tests/api/v1/AbgabeCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Abgabe/Abgabe"); +$I->wantTo("Test API call v1/education/abgabe/Abgabe"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Abgabe/Abgabe", array("abgabe_id" => "0")); +$I->sendGET("v1/education/abgabe/Abgabe", array("abgabe_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php b/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php index 2465edd2a..8296e4ef5 100644 --- a/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php +++ b/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Abschlussbeurteilung/Abschlussbeurteilung"); +$I->wantTo("Test API call v1/education/abschlussbeurteilung/Abschlussbeurteilung"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Abschlussbeurteilung/Abschlussbeurteilung", array("abschlussbeurteilung_kurzbz" => "0")); +$I->sendGET("v1/education/abschlussbeurteilung/Abschlussbeurteilung", array("abschlussbeurteilung_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AbschlusspruefungCept.php b/tests/codeception/tests/api/v1/AbschlusspruefungCept.php index 5d736fe97..9d0dcd6a4 100644 --- a/tests/codeception/tests/api/v1/AbschlusspruefungCept.php +++ b/tests/codeception/tests/api/v1/AbschlusspruefungCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Abschlusspruefung/Abschlusspruefung"); +$I->wantTo("Test API call v1/education/abschlusspruefung/Abschlusspruefung"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Abschlusspruefung/Abschlusspruefung", array("abschlusspruefung_id" => "0")); +$I->sendGET("v1/education/abschlusspruefung/Abschlusspruefung", array("abschlusspruefung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AdresseCept.php b/tests/codeception/tests/api/v1/AdresseCept.php index 9a25f5364..b36be6d89 100644 --- a/tests/codeception/tests/api/v1/AdresseCept.php +++ b/tests/codeception/tests/api/v1/AdresseCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/person/Adresse/Adresse"); +$I->wantTo("Test API call v1/person/adresse/Adresse"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/person/Adresse/Adresse", array()); +$I->sendGET("v1/person/adresse/Adresse", array("person_id" => 0)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AnrechnungCept.php b/tests/codeception/tests/api/v1/AnrechnungCept.php index 8c2acbf52..8f9a7f7f8 100644 --- a/tests/codeception/tests/api/v1/AnrechnungCept.php +++ b/tests/codeception/tests/api/v1/AnrechnungCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Anrechnung/Anrechnung"); +$I->wantTo("Test API call v1/education/anrechnung/Anrechnung"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Anrechnung/Anrechnung", array("anrechnung_id" => "0")); +$I->sendGET("v1/education/anrechnung/Anrechnung", array("anrechnung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AnwesenheitCept.php b/tests/codeception/tests/api/v1/AnwesenheitCept.php index b67ec4341..bb6856edd 100644 --- a/tests/codeception/tests/api/v1/AnwesenheitCept.php +++ b/tests/codeception/tests/api/v1/AnwesenheitCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Anwesenheit/Anwesenheit"); +$I->wantTo("Test API call v1/education/anwesenheit/Anwesenheit"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Anwesenheit/Anwesenheit", array("anwesenheit_id" => "0")); +$I->sendGET("v1/education/anwesenheit/Anwesenheit", array("anwesenheit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AppdatenCept.php b/tests/codeception/tests/api/v1/AppdatenCept.php index a1e7ef47a..91a5421e9 100644 --- a/tests/codeception/tests/api/v1/AppdatenCept.php +++ b/tests/codeception/tests/api/v1/AppdatenCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/system/Appdaten/Appdaten"); +$I->wantTo("Test API call v1/system/appdaten/Appdaten"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/system/Appdaten/Appdaten", array("appdaten_id" => "0")); +$I->sendGET("v1/system/appdaten/Appdaten", array("appdaten_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BeispielCept.php b/tests/codeception/tests/api/v1/BeispielCept.php index 257831403..29a4f5aa2 100644 --- a/tests/codeception/tests/api/v1/BeispielCept.php +++ b/tests/codeception/tests/api/v1/BeispielCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Beispiel/Beispiel"); +$I->wantTo("Test API call v1/education/beispiel/Beispiel"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Beispiel/Beispiel", array("beispiel_id" => "0")); +$I->sendGET("v1/education/beispiel/Beispiel", array("beispiel_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BetreuerartCept.php b/tests/codeception/tests/api/v1/BetreuerartCept.php index 1dd76737d..2cab1a9a6 100644 --- a/tests/codeception/tests/api/v1/BetreuerartCept.php +++ b/tests/codeception/tests/api/v1/BetreuerartCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Betreuerart/Betreuerart"); +$I->wantTo("Test API call v1/education/betreuerart/Betreuerart"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Betreuerart/Betreuerart", array("betreuerart_kurzbz" => "0")); +$I->sendGET("v1/education/betreuerart/Betreuerart", array("betreuerart_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Betriebsmittelperson2Cept.php b/tests/codeception/tests/api/v1/Betriebsmittelperson2Cept.php deleted file mode 100644 index a1b907dbb..000000000 --- a/tests/codeception/tests/api/v1/Betriebsmittelperson2Cept.php +++ /dev/null @@ -1,11 +0,0 @@ -wantTo("Test API call v1/ressource/Betriebsmittelperson2/Betriebsmittelperson2"); -$I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); - -$I->sendGET("v1/ressource/Betriebsmittelperson2/Betriebsmittelperson2", array("betriebsmittelperson_id" => "0")); -$I->seeResponseCodeIs(200); -$I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Organisationseinheit2Cept.php b/tests/codeception/tests/api/v1/BetriebsmittelpersonCept.php similarity index 55% rename from tests/codeception/tests/api/v1/Organisationseinheit2Cept.php rename to tests/codeception/tests/api/v1/BetriebsmittelpersonCept.php index dbe5323f4..c4493cf3d 100644 --- a/tests/codeception/tests/api/v1/Organisationseinheit2Cept.php +++ b/tests/codeception/tests/api/v1/BetriebsmittelpersonCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/organisation/Organisationseinheit2/Organisationseinheit2"); +$I->wantTo("Test API call v1/ressource/betriebsmittelperson/Betriebsmittelperson"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/organisation/Organisationseinheit2/Organisationseinheit2", array("oe_kurzbz" => "0")); +$I->sendGET("v1/ressource/betriebsmittelperson/Betriebsmittelperson", array("betriebsmittelperson_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/message_oldCept.php b/tests/codeception/tests/api/v1/FachbereichCept.php similarity index 60% rename from tests/codeception/tests/api/v1/message_oldCept.php rename to tests/codeception/tests/api/v1/FachbereichCept.php index 8c1f9453d..48aa32f73 100644 --- a/tests/codeception/tests/api/v1/message_oldCept.php +++ b/tests/codeception/tests/api/v1/FachbereichCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/system/message_old/message_old"); +$I->wantTo("Test API call v1/organisation/fachbereich/Fachbereich"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/system/message_old/message_old", array("message_old_id" => "0")); +$I->sendGET("v1/organisation/fachbereich/Fachbereich", array("fachbereich_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FeedbackCept.php b/tests/codeception/tests/api/v1/FeedbackCept.php index 000c54e25..a2e735daa 100644 --- a/tests/codeception/tests/api/v1/FeedbackCept.php +++ b/tests/codeception/tests/api/v1/FeedbackCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Feedback/Feedback"); +$I->wantTo("Test API call v1/education/feedback/Feedback"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Feedback/Feedback", array("feedback_id" => "0")); +$I->sendGET("v1/education/feedback/Feedback", array("feedback_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php b/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php index a443e6f6c..003dfaa4e 100644 --- a/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php +++ b/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/organisation/Geschaeftsjahr2/Geschaeftsjahr2"); +$I->wantTo("Test API call v1/organisation/geschaeftsjahr/Geschaeftsjahr"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/organisation/Geschaeftsjahr2/Geschaeftsjahr2", array("geschaeftsjahr_kurzbz" => "0")); +$I->sendGET("v1/organisation/geschaeftsjahr/Geschaeftsjahr", array("geschaeftsjahr_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KontaktCept.php b/tests/codeception/tests/api/v1/KontaktCept.php index c27c54062..736d9aad0 100644 --- a/tests/codeception/tests/api/v1/KontaktCept.php +++ b/tests/codeception/tests/api/v1/KontaktCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/person/Kontakt/Kontakt"); +$I->wantTo("Test API call v1/person/kontakt/Kontakt"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/person/Kontakt/Kontakt", array()); +$I->sendGET("v1/person/kontakt/Kontakt", array("kontakt_id" => 0)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Konto2Cept.php b/tests/codeception/tests/api/v1/Konto2Cept.php index d104bb996..870899d56 100644 --- a/tests/codeception/tests/api/v1/Konto2Cept.php +++ b/tests/codeception/tests/api/v1/Konto2Cept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/accounting/Konto/Konto"); +$I->wantTo("Test API call v1/accounting/konto/Konto"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/accounting/Konto/Konto", array("konto_id" => "0")); +$I->sendGET("v1/accounting/konto/Konto", array("konto_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LeNotenschluesselCept.php b/tests/codeception/tests/api/v1/LeNotenschluesselCept.php index 26efd07ac..11d1654c2 100644 --- a/tests/codeception/tests/api/v1/LeNotenschluesselCept.php +++ b/tests/codeception/tests/api/v1/LeNotenschluesselCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/LeNotenschluessel/LeNotenschluessel"); +$I->wantTo("Test API call v1/education/lenotenschluessel/LeNotenschluessel"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/LeNotenschluessel/LeNotenschluessel", array("note" => "0", "lehreinheit_id" => "0")); +$I->sendGET("v1/education/lenotenschluessel/LeNotenschluessel", array("note" => "0", "lehreinheit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LePruefungCept.php b/tests/codeception/tests/api/v1/LePruefungCept.php index ce2611eff..6755266cd 100644 --- a/tests/codeception/tests/api/v1/LePruefungCept.php +++ b/tests/codeception/tests/api/v1/LePruefungCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/LePruefung/LePruefung"); +$I->wantTo("Test API call v1/education/lepruefung/LePruefung"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/LePruefung/LePruefung", array("lepruefung_id" => "0")); +$I->sendGET("v1/education/lepruefung/LePruefung", array("lepruefung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LegesamtnoteCept.php b/tests/codeception/tests/api/v1/LegesamtnoteCept.php index 7d5a0a2a3..088aab190 100644 --- a/tests/codeception/tests/api/v1/LegesamtnoteCept.php +++ b/tests/codeception/tests/api/v1/LegesamtnoteCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Legesamtnote/Legesamtnote"); +$I->wantTo("Test API call v1/education/legesamtnote/Legesamtnote"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Legesamtnote/Legesamtnote", array("lehreinheit_id" => "0", "student_uid" => "0")); +$I->sendGET("v1/education/legesamtnote/Legesamtnote", array("lehreinheit_id" => "0", "student_uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehreinheitCept.php b/tests/codeception/tests/api/v1/LehreinheitCept.php index 849e4dab5..71cfe7588 100644 --- a/tests/codeception/tests/api/v1/LehreinheitCept.php +++ b/tests/codeception/tests/api/v1/LehreinheitCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Lehreinheit/Lehreinheit"); +$I->wantTo("Test API call v1/education/lehreinheit/Lehreinheit"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Lehreinheit/Lehreinheit", array("lehreinheit_id" => "0")); +$I->sendGET("v1/education/lehreinheit/Lehreinheit", array("lehreinheit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php b/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php index 795040d78..27bf6d422 100644 --- a/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php +++ b/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Lehreinheitgruppe/Lehreinheitgruppe"); +$I->wantTo("Test API call v1/education/lehreinheitgruppe/Lehreinheitgruppe"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Lehreinheitgruppe/Lehreinheitgruppe", array("lehreinheitgruppe_id" => "0")); +$I->sendGET("v1/education/lehreinheitgruppe/Lehreinheitgruppe", array("lehreinheitgruppe_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php b/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php index a5ff35244..6f1999388 100644 --- a/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php +++ b/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php @@ -1,7 +1,7 @@ wantTo("Test API call v1/education/Lehreinheitmitarbeiter/Lehreinheitmitarbeiter"); +$I->wantTo("Test API call v1/education/lehreinheitmitarbeiter/Lehreinheitmitarbeiter"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); diff --git a/tests/codeception/tests/api/v1/LehrfachCept.php b/tests/codeception/tests/api/v1/LehrfachCept.php index 08611e0f6..447f66a98 100644 --- a/tests/codeception/tests/api/v1/LehrfachCept.php +++ b/tests/codeception/tests/api/v1/LehrfachCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Lehrfach/Lehrfach"); +$I->wantTo("Test API call v1/education/lehrfach/Lehrfach"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Lehrfach/Lehrfach", array("lehrfach_id" => "0")); +$I->sendGET("v1/education/lehrfach/Lehrfach", array("lehrfach_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrfunktionCept.php b/tests/codeception/tests/api/v1/LehrfunktionCept.php index 0d4395e13..48ca2ae41 100644 --- a/tests/codeception/tests/api/v1/LehrfunktionCept.php +++ b/tests/codeception/tests/api/v1/LehrfunktionCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Lehrfunktion/Lehrfunktion"); +$I->wantTo("Test API call v1/education/lehrfunktion/Lehrfunktion"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Lehrfunktion/Lehrfunktion", array("lehrfunktion_kurzbz" => "0")); +$I->sendGET("v1/education/lehrfunktion/Lehrfunktion", array("lehrfunktion_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrtypCept.php b/tests/codeception/tests/api/v1/LehrtypCept.php index 136fe0150..4ac3355ad 100644 --- a/tests/codeception/tests/api/v1/LehrtypCept.php +++ b/tests/codeception/tests/api/v1/LehrtypCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Lehrtyp/Lehrtyp"); +$I->wantTo("Test API call v1/education/lehrtyp/Lehrtyp"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Lehrtyp/Lehrtyp", array("lehrtyp_kurzbz" => "0")); +$I->sendGET("v1/education/lehrtyp/Lehrtyp", array("lehrtyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrveranstaltungCept.php b/tests/codeception/tests/api/v1/LehrveranstaltungCept.php index 12e79f74a..c3cefe22a 100644 --- a/tests/codeception/tests/api/v1/LehrveranstaltungCept.php +++ b/tests/codeception/tests/api/v1/LehrveranstaltungCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Lehrveranstaltung/Lehrveranstaltung"); +$I->wantTo("Test API call v1/education/lehrveranstaltung/Lehrveranstaltung"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Lehrveranstaltung/Lehrveranstaltung", array("lehrveranstaltung_id" => "0")); +$I->sendGET("v1/education/lehrveranstaltung/Lehrveranstaltung", array("lehrveranstaltung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LvangebotCept.php b/tests/codeception/tests/api/v1/LvangebotCept.php index 80c44e09d..38351b0bb 100644 --- a/tests/codeception/tests/api/v1/LvangebotCept.php +++ b/tests/codeception/tests/api/v1/LvangebotCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Lvangebot/Lvangebot"); +$I->wantTo("Test API call v1/education/lvangebot/Lvangebot"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Lvangebot/Lvangebot", array("lvangebot_id" => "0")); +$I->sendGET("v1/education/lvangebot/Lvangebot", array("lvangebot_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/MessageCept.php b/tests/codeception/tests/api/v1/MessageCept.php index 96208c003..6a4146a29 100644 --- a/tests/codeception/tests/api/v1/MessageCept.php +++ b/tests/codeception/tests/api/v1/MessageCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/system/Message/Message"); +$I->wantTo("Test API call v1/system/message/MessagesByPersonID"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/system/Message/Message", array("person_id" => "0", "all" => "0", "uid" => "0", "all" => "0", "token" => "0")); +$I->sendGET("v1/system/message/MessagesByPersonID", array("person_id" => "1")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Fachbereich2Cept.php b/tests/codeception/tests/api/v1/OrganisationseinheitCept.php similarity index 56% rename from tests/codeception/tests/api/v1/Fachbereich2Cept.php rename to tests/codeception/tests/api/v1/OrganisationseinheitCept.php index adaa01ad8..2fa1736e8 100644 --- a/tests/codeception/tests/api/v1/Fachbereich2Cept.php +++ b/tests/codeception/tests/api/v1/OrganisationseinheitCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/organisation/Fachbereich2/Fachbereich2"); +$I->wantTo("Test API call v1/organisation/organisationseinheit/Organisationseinheit"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/organisation/Fachbereich2/Fachbereich2", array("fachbereich_kurzbz" => "0")); +$I->sendGET("v1/organisation/organisationseinheit/Organisationseinheit", array("oe_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PhraseCept.php b/tests/codeception/tests/api/v1/PhraseCept.php index ad887988d..4bf6908b5 100644 --- a/tests/codeception/tests/api/v1/PhraseCept.php +++ b/tests/codeception/tests/api/v1/PhraseCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/system/Phrase/Phrase"); +$I->wantTo("Test API call v1/system/phrase/Phrase"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/system/Phrase/Phrase", array("phrase_id" => "0", "app" => "0", "sprache" => "0", "phrase" => "0", "orgeinheit_kurzbz" => "0", "orgform_kurzbz" => "0")); +$I->sendGET("v1/system/phrase/Phrase", array("phrase_id" => "1")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PruefungsstatusCept.php b/tests/codeception/tests/api/v1/PruefungsstatusCept.php index db35ac23a..a90637753 100644 --- a/tests/codeception/tests/api/v1/PruefungsstatusCept.php +++ b/tests/codeception/tests/api/v1/PruefungsstatusCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/education/Pruefungsstatus/Pruefungsstatus"); +$I->wantTo("Test API call v1/education/pruefungsstatus/Pruefungsstatus"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/education/Pruefungsstatus/Pruefungsstatus", array("status_kurzbz" => "0")); +$I->sendGET("v1/education/pruefungsstatus/Pruefungsstatus", array("status_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ScrumsprintCept.php b/tests/codeception/tests/api/v1/ScrumsprintCept.php index 07012e095..42b3f4b9c 100644 --- a/tests/codeception/tests/api/v1/ScrumsprintCept.php +++ b/tests/codeception/tests/api/v1/ScrumsprintCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/project/Scrumsprint/Scrumsprint"); +$I->wantTo("Test API call v1/project/scrumsprint/Scrumsprint"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/project/Scrumsprint/Scrumsprint", array("scrumsprint_id" => "0")); +$I->sendGET("v1/project/scrumsprint/Scrumsprint", array("scrumsprint_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ScrumteamCept.php b/tests/codeception/tests/api/v1/ScrumteamCept.php index 583519757..4fb373724 100644 --- a/tests/codeception/tests/api/v1/ScrumteamCept.php +++ b/tests/codeception/tests/api/v1/ScrumteamCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/project/Scrumteam/Scrumteam"); +$I->wantTo("Test API call v1/project/scrumteam/Scrumteam"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/project/Scrumteam/Scrumteam", array("scrumteam_kurzbz" => "0")); +$I->sendGET("v1/project/scrumteam/Scrumteam", array("scrumteam_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Sprache2Cept.php b/tests/codeception/tests/api/v1/SpracheCept.php similarity index 65% rename from tests/codeception/tests/api/v1/Sprache2Cept.php rename to tests/codeception/tests/api/v1/SpracheCept.php index 59baaaac1..a29bb56ba 100644 --- a/tests/codeception/tests/api/v1/Sprache2Cept.php +++ b/tests/codeception/tests/api/v1/SpracheCept.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/system/Sprache2/Sprache2"); +$I->wantTo("Test API call v1/system/sprache/Sprache"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/system/Sprache2/Sprache2", array("sprache" => "0")); +$I->sendGET("v1/system/sprache/Sprache", array("sprache" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Studiengang2Cept.php b/tests/codeception/tests/api/v1/Studiengang2Cept.php deleted file mode 100644 index 8b6a0033e..000000000 --- a/tests/codeception/tests/api/v1/Studiengang2Cept.php +++ /dev/null @@ -1,11 +0,0 @@ -wantTo("Test API call v1/organisation/Studiengang2/Studiengang2"); -$I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); - -$I->sendGET("v1/organisation/Studiengang2/Studiengang2", array("studiengang_kz" => "0", "studiensemester_kurzbz" => "0", "ausbildungssemester" => "0", "aktiv" => "0", "onlinebewerbung" => "0")); -$I->seeResponseCodeIs(200); -$I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ThreadCept.php b/tests/codeception/tests/api/v1/Thread.php similarity index 67% rename from tests/codeception/tests/api/v1/ThreadCept.php rename to tests/codeception/tests/api/v1/Thread.php index 86d7e06ec..faa49d7c2 100644 --- a/tests/codeception/tests/api/v1/ThreadCept.php +++ b/tests/codeception/tests/api/v1/Thread.php @@ -1,11 +1,11 @@ wantTo("Test API call v1/system/Thread/Thread"); +$I->wantTo("Test API call v1/system/thread/Thread"); $I->amHttpAuthenticated("admin", "1q2w3"); $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET("v1/system/Thread/Thread", array("thread_id" => "0")); +$I->sendGET("v1/system/thread/Thread", array("thread_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/UebungCept.php b/tests/codeception/tests/api/v1/Uebung.php similarity index 100% rename from tests/codeception/tests/api/v1/UebungCept.php rename to tests/codeception/tests/api/v1/Uebung.php