diff --git a/application/controllers/api/v1/accounting/Bestellstatus.php b/application/controllers/api/v1/accounting/Bestellstatus.php index b9646ed2b..e5daa2bcc 100644 --- a/application/controllers/api/v1/accounting/Bestellstatus.php +++ b/application/controllers/api/v1/accounting/Bestellstatus.php @@ -33,11 +33,11 @@ class Bestellstatus extends APIv1_Controller */ public function getBestellstatus() { - $bestellstatusID = $this->get('bestellstatus_id'); + $bestellstatus_kurzbz = $this->get('bestellstatus_kurzbz'); - if(isset($bestellstatusID)) + if(isset($bestellstatus_kurzbz)) { - $result = $this->BestellstatusModel->load($bestellstatusID); + $result = $this->BestellstatusModel->load($bestellstatus_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Bestellstatus extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['bestellstatus_id'])) + if(isset($this->post()['bestellstatus_kurzbz'])) { - $result = $this->BestellstatusModel->update($this->post()['bestellstatus_id'], $this->post()); + $result = $this->BestellstatusModel->update($this->post()['bestellstatus_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/accounting/Buchungstyp.php b/application/controllers/api/v1/accounting/Buchungstyp.php index eee0ccfa0..470e14658 100644 --- a/application/controllers/api/v1/accounting/Buchungstyp.php +++ b/application/controllers/api/v1/accounting/Buchungstyp.php @@ -33,11 +33,11 @@ class Buchungstyp extends APIv1_Controller */ public function getBuchungstyp() { - $buchungstypID = $this->get('buchungstyp_id'); + $buchungstyp_kurzbz = $this->get('buchungstyp_kurzbz'); - if(isset($buchungstypID)) + if(isset($buchungstyp_kurzbz)) { - $result = $this->BuchungstypModel->load($buchungstypID); + $result = $this->BuchungstypModel->load($buchungstyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Buchungstyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['buchungstyp_id'])) + if(isset($this->post()['buchungstyp_kurzbz'])) { - $result = $this->BuchungstypModel->update($this->post()['buchungstyp_id'], $this->post()); + $result = $this->BuchungstypModel->update($this->post()['buchungstyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/accounting/Budget.php b/application/controllers/api/v1/accounting/Budget.php index 4cbd9bf1e..23074fd6e 100644 --- a/application/controllers/api/v1/accounting/Budget.php +++ b/application/controllers/api/v1/accounting/Budget.php @@ -55,9 +55,9 @@ class Budget extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['budget_id'])) + if(isset($this->post()['budget_id']) && isset($this->post()['geschaeftsjahr_kurzbz'])) { - $result = $this->BudgetModel->update($this->post()['budget_id'], $this->post()); + $result = $this->BudgetModel->update(array($this->post()['budget_id'], $this->post()['geschaeftsjahr_kurzbz']), $this->post()); } else { diff --git a/application/controllers/api/v1/accounting/Rechnungstyp.php b/application/controllers/api/v1/accounting/Rechnungstyp.php index deefa6243..e6bd28e2c 100644 --- a/application/controllers/api/v1/accounting/Rechnungstyp.php +++ b/application/controllers/api/v1/accounting/Rechnungstyp.php @@ -33,11 +33,11 @@ class Rechnungstyp extends APIv1_Controller */ public function getRechnungstyp() { - $rechnungstypID = $this->get('rechnungstyp_id'); + $rechnungstyp_kurzbz = $this->get('rechnungstyp_kurzbz'); - if(isset($rechnungstypID)) + if(isset($rechnungstyp_kurzbz)) { - $result = $this->RechnungstypModel->load($rechnungstypID); + $result = $this->RechnungstypModel->load($rechnungstyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Rechnungstyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['rechnungstyp_id'])) + if(isset($this->post()['rechnungstyp_kurzbz'])) { - $result = $this->RechnungstypModel->update($this->post()['rechnungstyp_id'], $this->post()); + $result = $this->RechnungstypModel->update($this->post()['rechnungstyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/accounting/Vertragsstatus.php b/application/controllers/api/v1/accounting/Vertragsstatus.php index d40a26a09..e288fadbb 100644 --- a/application/controllers/api/v1/accounting/Vertragsstatus.php +++ b/application/controllers/api/v1/accounting/Vertragsstatus.php @@ -33,11 +33,11 @@ class Vertragsstatus extends APIv1_Controller */ public function getVertragsstatus() { - $vertragsstatusID = $this->get('vertragsstatus_id'); + $vertragsstatus_kurzbz = $this->get('vertragsstatus_kurzbz'); - if(isset($vertragsstatusID)) + if(isset($vertragsstatus_kurzbz)) { - $result = $this->VertragsstatusModel->load($vertragsstatusID); + $result = $this->VertragsstatusModel->load($vertragsstatus_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Vertragsstatus extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['vertragsstatus_id'])) + if(isset($this->post()['vertragsstatus_kurzbz'])) { - $result = $this->VertragsstatusModel->update($this->post()['vertragsstatus_id'], $this->post()); + $result = $this->VertragsstatusModel->update($this->post()['vertragsstatus_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/accounting/Vertragstyp.php b/application/controllers/api/v1/accounting/Vertragstyp.php index 0052292bc..dfc3366c5 100644 --- a/application/controllers/api/v1/accounting/Vertragstyp.php +++ b/application/controllers/api/v1/accounting/Vertragstyp.php @@ -33,11 +33,11 @@ class Vertragstyp extends APIv1_Controller */ public function getVertragstyp() { - $vertragstypID = $this->get('vertragstyp_id'); + $vertragstyp_kurzbz = $this->get('vertragstyp_kurzbz'); - if(isset($vertragstypID)) + if(isset($vertragstyp_kurzbz)) { - $result = $this->VertragstypModel->load($vertragstypID); + $result = $this->VertragstypModel->load($vertragstyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Vertragstyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['vertragstyp_id'])) + if(isset($this->post()['vertragstyp_kurzbz'])) { - $result = $this->VertragstypModel->update($this->post()['vertragstyp_id'], $this->post()); + $result = $this->VertragstypModel->update($this->post()['vertragstyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/accounting/Zahlungstyp.php b/application/controllers/api/v1/accounting/Zahlungstyp.php index 86aa911df..bec1f7694 100644 --- a/application/controllers/api/v1/accounting/Zahlungstyp.php +++ b/application/controllers/api/v1/accounting/Zahlungstyp.php @@ -33,11 +33,11 @@ class Zahlungstyp extends APIv1_Controller */ public function getZahlungstyp() { - $zahlungstypID = $this->get('zahlungstyp_id'); + $zahlungstyp_kurzbz = $this->get('zahlungstyp_kurzbz'); - if(isset($zahlungstypID)) + if(isset($zahlungstyp_kurzbz)) { - $result = $this->ZahlungstypModel->load($zahlungstypID); + $result = $this->ZahlungstypModel->load($zahlungstyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Zahlungstyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zahlungstyp_id'])) + if(isset($this->post()['zahlungstyp_kurzbz'])) { - $result = $this->ZahlungstypModel->update($this->post()['zahlungstyp_id'], $this->post()); + $result = $this->ZahlungstypModel->update($this->post()['zahlungstyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Aufmerksamdurch.php b/application/controllers/api/v1/codex/Aufmerksamdurch.php index 55c6b0b19..73aa1e4c3 100644 --- a/application/controllers/api/v1/codex/Aufmerksamdurch.php +++ b/application/controllers/api/v1/codex/Aufmerksamdurch.php @@ -33,11 +33,11 @@ class Aufmerksamdurch extends APIv1_Controller */ public function getAufmerksamdurch() { - $aufmerksamdurchID = $this->get('aufmerksamdurch_id'); + $aufmerksamdurch_kurzbz = $this->get('aufmerksamdurch_kurzbz'); - if(isset($aufmerksamdurchID)) + if(isset($aufmerksamdurch_kurzbz)) { - $result = $this->AufmerksamdurchModel->load($aufmerksamdurchID); + $result = $this->AufmerksamdurchModel->load($aufmerksamdurch_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Aufmerksamdurch extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['aufmerksamdurch_id'])) + if(isset($this->post()['aufmerksamdurch_kurzbz'])) { - $result = $this->AufmerksamdurchModel->update($this->post()['aufmerksamdurch_id'], $this->post()); + $result = $this->AufmerksamdurchModel->update($this->post()['aufmerksamdurch_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Ausbildung.php b/application/controllers/api/v1/codex/Ausbildung.php index a99468033..cf2387e9b 100644 --- a/application/controllers/api/v1/codex/Ausbildung.php +++ b/application/controllers/api/v1/codex/Ausbildung.php @@ -33,11 +33,11 @@ class Ausbildung extends APIv1_Controller */ public function getAusbildung() { - $ausbildungID = $this->get('ausbildung_id'); + $ausbildungcode = $this->get('ausbildungcode'); - if(isset($ausbildungID)) + if(isset($ausbildungcode)) { - $result = $this->AusbildungModel->load($ausbildungID); + $result = $this->AusbildungModel->load($ausbildungcode); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Ausbildung extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['ausbildung_id'])) + if(isset($this->post()['ausbildungcode'])) { - $result = $this->AusbildungModel->update($this->post()['ausbildung_id'], $this->post()); + $result = $this->AusbildungModel->update($this->post()['ausbildungcode'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Berufstaetigkeit.php b/application/controllers/api/v1/codex/Berufstaetigkeit.php index 82355d130..20b357eda 100644 --- a/application/controllers/api/v1/codex/Berufstaetigkeit.php +++ b/application/controllers/api/v1/codex/Berufstaetigkeit.php @@ -33,11 +33,11 @@ class Berufstaetigkeit extends APIv1_Controller */ public function getBerufstaetigkeit() { - $berufstaetigkeitID = $this->get('berufstaetigkeit_id'); + $berufstaetigkeit_code = $this->get('berufstaetigkeit_code'); - if(isset($berufstaetigkeitID)) + if(isset($berufstaetigkeit_code)) { - $result = $this->BerufstaetigkeitModel->load($berufstaetigkeitID); + $result = $this->BerufstaetigkeitModel->load($berufstaetigkeit_code); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Berufstaetigkeit extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['berufstaetigkeit_id'])) + if(isset($this->post()['berufstaetigkeit_code'])) { - $result = $this->BerufstaetigkeitModel->update($this->post()['berufstaetigkeit_id'], $this->post()); + $result = $this->BerufstaetigkeitModel->update($this->post()['berufstaetigkeit_code'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Beschaeftigungsausmass.php b/application/controllers/api/v1/codex/Beschaeftigungsausmass.php index 58c439eae..579ead6a5 100644 --- a/application/controllers/api/v1/codex/Beschaeftigungsausmass.php +++ b/application/controllers/api/v1/codex/Beschaeftigungsausmass.php @@ -33,11 +33,11 @@ class Beschaeftigungsausmass extends APIv1_Controller */ public function getBeschaeftigungsausmass() { - $beschaeftigungsausmassID = $this->get('beschaeftigungsausmass_id'); + $beschausmasscode = $this->get('beschausmasscode'); - if(isset($beschaeftigungsausmassID)) + if(isset($beschausmasscode)) { - $result = $this->BeschaeftigungsausmassModel->load($beschaeftigungsausmassID); + $result = $this->BeschaeftigungsausmassModel->load($beschausmasscode); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Beschaeftigungsausmass extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['beschaeftigungsausmass_id'])) + if(isset($this->post()['beschausmasscode'])) { - $result = $this->BeschaeftigungsausmassModel->update($this->post()['beschaeftigungsausmass_id'], $this->post()); + $result = $this->BeschaeftigungsausmassModel->update($this->post()['beschausmasscode'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Besqual.php b/application/controllers/api/v1/codex/Besqual.php index 3c304ba7e..f5d4236fb 100644 --- a/application/controllers/api/v1/codex/Besqual.php +++ b/application/controllers/api/v1/codex/Besqual.php @@ -33,11 +33,11 @@ class Besqual extends APIv1_Controller */ public function getBesqual() { - $besqualID = $this->get('besqual_id'); + $besqualcode = $this->get('besqualcode'); - if(isset($besqualID)) + if(isset($besqualcode)) { - $result = $this->BesqualModel->load($besqualID); + $result = $this->BesqualModel->load($besqualcode); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Besqual extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['besqual_id'])) + if(isset($this->post()['besqualcode'])) { - $result = $this->BesqualModel->update($this->post()['besqual_id'], $this->post()); + $result = $this->BesqualModel->update($this->post()['besqualcode'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Bisfunktion.php b/application/controllers/api/v1/codex/Bisfunktion.php index a87015063..37590547c 100644 --- a/application/controllers/api/v1/codex/Bisfunktion.php +++ b/application/controllers/api/v1/codex/Bisfunktion.php @@ -55,9 +55,9 @@ class Bisfunktion extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['bisfunktion_id'])) + if(isset($this->post()['studiengang_kz']) && isset($this->post()['bisverwendung_id'])) { - $result = $this->BisfunktionModel->update($this->post()['bisfunktion_id'], $this->post()); + $result = $this->BisfunktionModel->update(array($this->post()['studiengang_kz'], $this->post()['bisverwendung_id']), $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Bisorgform.php b/application/controllers/api/v1/codex/Bisorgform.php index 07ee00c76..2fb9bab19 100644 --- a/application/controllers/api/v1/codex/Bisorgform.php +++ b/application/controllers/api/v1/codex/Bisorgform.php @@ -33,11 +33,11 @@ class Bisorgform extends APIv1_Controller */ public function getBisorgform() { - $bisorgformID = $this->get('bisorgform_id'); + $bisorgform_kurzbz = $this->get('bisorgform_kurzbz'); - if(isset($bisorgformID)) + if(isset($bisorgform_kurzbz)) { - $result = $this->BisorgformModel->load($bisorgformID); + $result = $this->BisorgformModel->load($bisorgform_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Bisorgform extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['bisorgform_id'])) + if(isset($this->post()['bisorgform_kurzbz'])) { - $result = $this->BisorgformModel->update($this->post()['bisorgform_id'], $this->post()); + $result = $this->BisorgformModel->update($this->post()['bisorgform_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Entwicklungsteam.php b/application/controllers/api/v1/codex/Entwicklungsteam.php index 2f4f1e054..31abdf3bc 100644 --- a/application/controllers/api/v1/codex/Entwicklungsteam.php +++ b/application/controllers/api/v1/codex/Entwicklungsteam.php @@ -55,9 +55,9 @@ class Entwicklungsteam extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['entwicklungsteam_id'])) + if(isset($this->post()['studiengang_kz']) && isset($this->post()['mitarbeiter_uid'])) { - $result = $this->EntwicklungsteamModel->update($this->post()['entwicklungsteam_id'], $this->post()); + $result = $this->EntwicklungsteamModel->update(array($this->post()['entwicklungsteam_id'], $this->post()['mitarbeiter_uid']), $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Hauptberuf.php b/application/controllers/api/v1/codex/Hauptberuf.php index c7ace1644..313703604 100644 --- a/application/controllers/api/v1/codex/Hauptberuf.php +++ b/application/controllers/api/v1/codex/Hauptberuf.php @@ -33,11 +33,11 @@ class Hauptberuf extends APIv1_Controller */ public function getHauptberuf() { - $hauptberufID = $this->get('hauptberuf_id'); + $hauptberufcode = $this->get('hauptberufcode'); - if(isset($hauptberufID)) + if(isset($hauptberufcode)) { - $result = $this->HauptberufModel->load($hauptberufID); + $result = $this->HauptberufModel->load($hauptberufcode); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Hauptberuf extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['hauptberuf_id'])) + if(isset($this->post()['hauptberufcode'])) { - $result = $this->HauptberufModel->update($this->post()['hauptberuf_id'], $this->post()); + $result = $this->HauptberufModel->update($this->post()['hauptberufcode'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Lehrform.php b/application/controllers/api/v1/codex/Lehrform.php index 4ea4c1aa7..71494c661 100644 --- a/application/controllers/api/v1/codex/Lehrform.php +++ b/application/controllers/api/v1/codex/Lehrform.php @@ -33,11 +33,11 @@ class Lehrform extends APIv1_Controller */ public function getLehrform() { - $lehrformID = $this->get('lehrform_id'); + $lehrform_kurzbz = $this->get('lehrform_kurzbz'); - if(isset($lehrformID)) + if(isset($lehrform_kurzbz)) { - $result = $this->LehrformModel->load($lehrformID); + $result = $this->LehrformModel->load($lehrform_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Lehrform extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['lehrform_id'])) + if(isset($this->post()['lehrform_kurzbz'])) { - $result = $this->LehrformModel->update($this->post()['lehrform_id'], $this->post()); + $result = $this->LehrformModel->update($this->post()['lehrform_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Lgartcode.php b/application/controllers/api/v1/codex/Lgartcode.php index 73f19743f..e7789dc65 100644 --- a/application/controllers/api/v1/codex/Lgartcode.php +++ b/application/controllers/api/v1/codex/Lgartcode.php @@ -33,11 +33,11 @@ class Lgartcode extends APIv1_Controller */ public function getLgartcode() { - $lgartcodeID = $this->get('lgartcode_id'); + $lgartcode = $this->get('lgartcode'); - if(isset($lgartcodeID)) + if(isset($lgartcode)) { - $result = $this->LgartcodeModel->load($lgartcodeID); + $result = $this->LgartcodeModel->load($lgartcode); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Lgartcode extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['lgartcode_id'])) + if(isset($this->post()['lgartcode'])) { - $result = $this->LgartcodeModel->update($this->post()['lgartcode_id'], $this->post()); + $result = $this->LgartcodeModel->update($this->post()['lgartcode'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Mobilitaetsprogramm.php b/application/controllers/api/v1/codex/Mobilitaetsprogramm.php index 289f679de..a68062391 100644 --- a/application/controllers/api/v1/codex/Mobilitaetsprogramm.php +++ b/application/controllers/api/v1/codex/Mobilitaetsprogramm.php @@ -33,11 +33,11 @@ class Mobilitaetsprogramm extends APIv1_Controller */ public function getMobilitaetsprogramm() { - $mobilitaetsprogrammID = $this->get('mobilitaetsprogramm_id'); + $mobilitaetsprogramm_code = $this->get('mobilitaetsprogramm_code'); - if(isset($mobilitaetsprogrammID)) + if(isset($mobilitaetsprogramm_code)) { - $result = $this->MobilitaetsprogrammModel->load($mobilitaetsprogrammID); + $result = $this->MobilitaetsprogrammModel->load($mobilitaetsprogramm_code); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Mobilitaetsprogramm extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['mobilitaetsprogramm_id'])) + if(isset($this->post()['mobilitaetsprogramm_code'])) { - $result = $this->MobilitaetsprogrammModel->update($this->post()['mobilitaetsprogramm_id'], $this->post()); + $result = $this->MobilitaetsprogrammModel->update($this->post()['mobilitaetsprogramm_code'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Note.php b/application/controllers/api/v1/codex/Note.php index 5a4ff9540..c44d695c9 100644 --- a/application/controllers/api/v1/codex/Note.php +++ b/application/controllers/api/v1/codex/Note.php @@ -33,11 +33,11 @@ class Note extends APIv1_Controller */ public function getNote() { - $noteID = $this->get('note_id'); + $note = $this->get('note'); - if(isset($noteID)) + if(isset($note)) { - $result = $this->NoteModel->load($noteID); + $result = $this->NoteModel->load($note); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Note extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['note_id'])) + if(isset($this->post()['note'])) { - $result = $this->NoteModel->update($this->post()['note_id'], $this->post()); + $result = $this->NoteModel->update($this->post()['note'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Orgform.php b/application/controllers/api/v1/codex/Orgform.php index fc2041538..6834561c3 100644 --- a/application/controllers/api/v1/codex/Orgform.php +++ b/application/controllers/api/v1/codex/Orgform.php @@ -33,11 +33,11 @@ class Orgform extends APIv1_Controller */ public function getOrgform() { - $orgformID = $this->get('orgform_id'); + $orgform_kurzbz = $this->get('orgform_kurzbz'); - if(isset($orgformID)) + if(isset($orgform_kurzbz)) { - $result = $this->OrgformModel->load($orgformID); + $result = $this->OrgformModel->load($orgform_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Orgform extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['orgform_id'])) + if(isset($this->post()['orgform_kurzbz'])) { - $result = $this->OrgformModel->update($this->post()['orgform_id'], $this->post()); + $result = $this->OrgformModel->update($this->post()['orgform_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Verwendung.php b/application/controllers/api/v1/codex/Verwendung.php index 5f6f371b3..e697a5ecf 100644 --- a/application/controllers/api/v1/codex/Verwendung.php +++ b/application/controllers/api/v1/codex/Verwendung.php @@ -33,11 +33,11 @@ class Verwendung extends APIv1_Controller */ public function getVerwendung() { - $verwendungID = $this->get('verwendung_id'); + $verwendung_code = $this->get('verwendung_code'); - if(isset($verwendungID)) + if(isset($verwendung_code)) { - $result = $this->VerwendungModel->load($verwendungID); + $result = $this->VerwendungModel->load($verwendung_code); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Verwendung extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['verwendung_id'])) + if(isset($this->post()['verwendung_code'])) { - $result = $this->VerwendungModel->update($this->post()['verwendung_id'], $this->post()); + $result = $this->VerwendungModel->update($this->post()['verwendung_code'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Zgv.php b/application/controllers/api/v1/codex/Zgv.php index c23508b06..2013e90cb 100644 --- a/application/controllers/api/v1/codex/Zgv.php +++ b/application/controllers/api/v1/codex/Zgv.php @@ -33,11 +33,11 @@ class Zgv extends APIv1_Controller */ public function getZgv() { - $zgvID = $this->get('zgv_id'); + $zgv_code = $this->get('zgv_code'); - if(isset($zgvID)) + if(isset($zgv_code)) { - $result = $this->ZgvModel->load($zgvID); + $result = $this->ZgvModel->load($zgv_code); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Zgv extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zgv_id'])) + if(isset($this->post()['zgv_code'])) { - $result = $this->ZgvModel->update($this->post()['zgv_id'], $this->post()); + $result = $this->ZgvModel->update($this->post()['zgv_code'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Zgvdoktor.php b/application/controllers/api/v1/codex/Zgvdoktor.php index 2e51460d5..3ac5ab3e3 100644 --- a/application/controllers/api/v1/codex/Zgvdoktor.php +++ b/application/controllers/api/v1/codex/Zgvdoktor.php @@ -33,11 +33,11 @@ class Zgvdoktor extends APIv1_Controller */ public function getZgvdoktor() { - $zgvdoktorID = $this->get('zgvdoktor_id'); + $zgvdoktor_code = $this->get('zgvdoktor_code'); - if(isset($zgvdoktorID)) + if(isset($zgvdoktor_code)) { - $result = $this->ZgvdoktorModel->load($zgvdoktorID); + $result = $this->ZgvdoktorModel->load($zgvdoktor_code); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Zgvdoktor extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zgvdoktor_id'])) + if(isset($this->post()['zgvdoktor_code'])) { - $result = $this->ZgvdoktorModel->update($this->post()['zgvdoktor_id'], $this->post()); + $result = $this->ZgvdoktorModel->update($this->post()['zgvdoktor_code'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Zgvmaster.php b/application/controllers/api/v1/codex/Zgvmaster.php index 49d56396b..5e431c3a1 100644 --- a/application/controllers/api/v1/codex/Zgvmaster.php +++ b/application/controllers/api/v1/codex/Zgvmaster.php @@ -33,11 +33,11 @@ class Zgvmaster extends APIv1_Controller */ public function getZgvmaster() { - $zgvmasterID = $this->get('zgvmaster_id'); + $zgvmas_code = $this->get('zgvmas_code'); - if(isset($zgvmasterID)) + if(isset($zgvmas_code)) { - $result = $this->ZgvmasterModel->load($zgvmasterID); + $result = $this->ZgvmasterModel->load($zgvmas_code); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Zgvmaster extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zgvmaster_id'])) + if(isset($this->post()['zgvmas_code'])) { - $result = $this->ZgvmasterModel->update($this->post()['zgvmaster_id'], $this->post()); + $result = $this->ZgvmasterModel->update($this->post()['zgvmas_code'], $this->post()); } else { diff --git a/application/controllers/api/v1/codex/Zweck.php b/application/controllers/api/v1/codex/Zweck.php index d6163c400..d352540e4 100644 --- a/application/controllers/api/v1/codex/Zweck.php +++ b/application/controllers/api/v1/codex/Zweck.php @@ -33,11 +33,11 @@ class Zweck extends APIv1_Controller */ public function getZweck() { - $zweckID = $this->get('zweck_id'); + $zweck_code = $this->get('zweck_code'); - if(isset($zweckID)) + if(isset($zweck_code)) { - $result = $this->ZweckModel->load($zweckID); + $result = $this->ZweckModel->load($zweck_code); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Zweck extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zweck_id'])) + if(isset($this->post()['zweck_code'])) { - $result = $this->ZweckModel->update($this->post()['zweck_id'], $this->post()); + $result = $this->ZweckModel->update($this->post()['zweck_code'], $this->post()); } else { diff --git a/application/controllers/api/v1/content/Contentgruppe.php b/application/controllers/api/v1/content/Contentgruppe.php index a2ab09d7f..c171c5f88 100644 --- a/application/controllers/api/v1/content/Contentgruppe.php +++ b/application/controllers/api/v1/content/Contentgruppe.php @@ -55,9 +55,9 @@ class Contentgruppe extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['contentgruppe_id'])) + if(isset($this->post()['gruppe_kurzbz']) && isset($this->post()['content_id'])) { - $result = $this->ContentgruppeModel->update($this->post()['contentgruppe_id'], $this->post()); + $result = $this->ContentgruppeModel->update(array($this->post()['gruppe_kurzbz'], $this->post()['content_id']), $this->post()); } else { diff --git a/application/controllers/api/v1/content/Dms.php b/application/controllers/api/v1/content/Dms.php index 36e48f892..87858b712 100644 --- a/application/controllers/api/v1/content/Dms.php +++ b/application/controllers/api/v1/content/Dms.php @@ -66,4 +66,33 @@ class Dms extends APIv1_Controller $this->response(); } } + + /** + * + */ + public function postDms() + { + if($this->_validate($this->post())) + { + if(isset($this->post()['contentsprache_id'])) + { + $result = $this->ContentspracheModel->update($this->post()['contentsprache_id'], $this->post()); + } + else + { + $result = $this->ContentspracheModel->insert($this->post()); + } + + $this->response($result, REST_Controller::HTTP_OK); + } + else + { + $this->response(); + } + } + + private function _validate($dms = NULL) + { + return true; + } } \ No newline at end of file diff --git a/application/controllers/api/v1/content/Template.php b/application/controllers/api/v1/content/Template.php index 73a6f4173..4d635db63 100644 --- a/application/controllers/api/v1/content/Template.php +++ b/application/controllers/api/v1/content/Template.php @@ -33,11 +33,11 @@ class Template extends APIv1_Controller */ public function getTemplate() { - $templateID = $this->get('template_id'); + $template_kurzbz = $this->get('template_kurzbz'); - if(isset($templateID)) + if(isset($template_kurzbz)) { - $result = $this->TemplateModel->load($templateID); + $result = $this->TemplateModel->load($template_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Template extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['template_id'])) + if(isset($this->post()['template_kurzbz'])) { - $result = $this->TemplateModel->update($this->post()['template_id'], $this->post()); + $result = $this->TemplateModel->update($this->post()['template_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/content/Veranstaltungskategorie.php b/application/controllers/api/v1/content/Veranstaltungskategorie.php index 999c60bb8..2832c6eba 100644 --- a/application/controllers/api/v1/content/Veranstaltungskategorie.php +++ b/application/controllers/api/v1/content/Veranstaltungskategorie.php @@ -33,11 +33,11 @@ class Veranstaltungskategorie extends APIv1_Controller */ public function getVeranstaltungskategorie() { - $veranstaltungskategorieID = $this->get('veranstaltungskategorie_id'); + $veranstaltungskategorie_kurzbz = $this->get('veranstaltungskategorie_kurzbz'); - if(isset($veranstaltungskategorieID)) + if(isset($veranstaltungskategorie_kurzbz)) { - $result = $this->VeranstaltungskategorieModel->load($veranstaltungskategorieID); + $result = $this->VeranstaltungskategorieModel->load($veranstaltungskategorie_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Veranstaltungskategorie extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['veranstaltungskategorie_id'])) + if(isset($this->post()['veranstaltungskategorie_kurzbz'])) { - $result = $this->VeranstaltungskategorieModel->update($this->post()['veranstaltungskategorie_id'], $this->post()); + $result = $this->VeranstaltungskategorieModel->update($this->post()['veranstaltungskategorie_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Aufnahmeschluessel.php b/application/controllers/api/v1/crm/Aufnahmeschluessel.php index d232428f1..db84bf481 100644 --- a/application/controllers/api/v1/crm/Aufnahmeschluessel.php +++ b/application/controllers/api/v1/crm/Aufnahmeschluessel.php @@ -33,11 +33,11 @@ class Aufnahmeschluessel extends APIv1_Controller */ public function getAufnahmeschluessel() { - $aufnahmeschluesselID = $this->get('aufnahmeschluessel_id'); + $aufnahmeschluessel = $this->get('aufnahmeschluessel'); - if(isset($aufnahmeschluesselID)) + if(isset($aufnahmeschluessel)) { - $result = $this->AufnahmeschluesselModel->load($aufnahmeschluesselID); + $result = $this->AufnahmeschluesselModel->load($aufnahmeschluessel); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Aufnahmeschluessel extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['aufnahmeschluessel_id'])) + if(isset($this->post()['aufnahmeschluessel'])) { - $result = $this->AufnahmeschluesselModel->update($this->post()['aufnahmeschluessel_id'], $this->post()); + $result = $this->AufnahmeschluesselModel->update($this->post()['aufnahmeschluessel'], $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Aufnahmetermintyp.php b/application/controllers/api/v1/crm/Aufnahmetermintyp.php index d3cf29e25..1a63914cf 100644 --- a/application/controllers/api/v1/crm/Aufnahmetermintyp.php +++ b/application/controllers/api/v1/crm/Aufnahmetermintyp.php @@ -33,11 +33,11 @@ class Aufnahmetermintyp extends APIv1_Controller */ public function getAufnahmetermintyp() { - $aufnahmetermintypID = $this->get('aufnahmetermintyp_id'); + $aufnahmetermintyp_kurzbz = $this->get('aufnahmetermintyp_kurzbz'); - if(isset($aufnahmetermintypID)) + if(isset($aufnahmetermintyp_kurzbz)) { - $result = $this->AufnahmetermintypModel->load($aufnahmetermintypID); + $result = $this->AufnahmetermintypModel->load($aufnahmetermintyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Aufnahmetermintyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['aufnahmetermintyp_id'])) + if(isset($this->post()['aufnahmetermintyp_kurzbz'])) { - $result = $this->AufnahmetermintypModel->update($this->post()['aufnahmetermintyp_id'], $this->post()); + $result = $this->AufnahmetermintypModel->update($this->post()['aufnahmetermintyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Buchungstyp.php b/application/controllers/api/v1/crm/Buchungstyp.php index 280d2ab69..eff19f7ee 100644 --- a/application/controllers/api/v1/crm/Buchungstyp.php +++ b/application/controllers/api/v1/crm/Buchungstyp.php @@ -33,11 +33,11 @@ class Buchungstyp extends APIv1_Controller */ public function getBuchungstyp() { - $buchungstypID = $this->get('buchungstyp_id'); + $buchungstyp_kurzbz = $this->get('buchungstyp_kurzbz'); - if(isset($buchungstypID)) + if(isset($buchungstyp_kurzbz)) { - $result = $this->BuchungstypModel->load($buchungstypID); + $result = $this->BuchungstypModel->load($buchungstyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Buchungstyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['buchungstyp_id'])) + if(isset($this->post()['buchungstyp_kurzbz'])) { - $result = $this->BuchungstypModel->update($this->post()['buchungstyp_id'], $this->post()); + $result = $this->BuchungstypModel->update($this->post()['buchungstyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Dokument.php b/application/controllers/api/v1/crm/Dokument.php index 579b09320..49086576c 100644 --- a/application/controllers/api/v1/crm/Dokument.php +++ b/application/controllers/api/v1/crm/Dokument.php @@ -33,11 +33,11 @@ class Dokument extends APIv1_Controller */ public function getDokument() { - $dokumentID = $this->get('dokument_id'); + $dokument_kurzbz = $this->get('dokument_kurzbz'); - if(isset($dokumentID)) + if(isset($dokument_kurzbz)) { - $result = $this->DokumentModel->load($dokumentID); + $result = $this->DokumentModel->load($dokument_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Dokument extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['dokument_id'])) + if(isset($this->post()['dokument_kurzbz'])) { - $result = $this->DokumentModel->update($this->post()['dokument_id'], $this->post()); + $result = $this->DokumentModel->update($this->post()['dokument_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Dokumentprestudent.php b/application/controllers/api/v1/crm/Dokumentprestudent.php index 4335d148a..7e2631870 100644 --- a/application/controllers/api/v1/crm/Dokumentprestudent.php +++ b/application/controllers/api/v1/crm/Dokumentprestudent.php @@ -55,9 +55,9 @@ class Dokumentprestudent extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['dokumentprestudent_id'])) + if(isset($this->post()['prestudent_id']) && isset($this->post()['dokument_kurzbz'])) { - $result = $this->DokumentprestudentModel->update($this->post()['dokumentprestudent_id'], $this->post()); + $result = $this->DokumentprestudentModel->update(array($this->post()['prestudent_id'], $this->post()['dokument_kurzbz']), $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Dokumentstudiengang.php b/application/controllers/api/v1/crm/Dokumentstudiengang.php index 1b79793a9..ce85c0ef4 100644 --- a/application/controllers/api/v1/crm/Dokumentstudiengang.php +++ b/application/controllers/api/v1/crm/Dokumentstudiengang.php @@ -55,9 +55,9 @@ class Dokumentstudiengang extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['dokumentstudiengang_id'])) + if(isset($this->post()['studiengang_kz']) && isset($this->post()['dokument_kurzbz'])) { - $result = $this->DokumentstudiengangModel->update($this->post()['dokumentstudiengang_id'], $this->post()); + $result = $this->DokumentstudiengangModel->update(array($this->post()['studiengang_kz'], $this->post()['dokument_kurzbz']), $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Konto.php b/application/controllers/api/v1/crm/Konto.php index 30035e871..adb161e1e 100644 --- a/application/controllers/api/v1/crm/Konto.php +++ b/application/controllers/api/v1/crm/Konto.php @@ -33,11 +33,11 @@ class Konto extends APIv1_Controller */ public function getKonto() { - $kontoID = $this->get('konto_id'); + $buchungsnr = $this->get('buchungsnr'); - if(isset($kontoID)) + if(isset($buchungsnr)) { - $result = $this->KontoModel->load($kontoID); + $result = $this->KontoModel->load($buchungsnr); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Konto extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['konto_id'])) + if(isset($this->post()['buchungsnr'])) { - $result = $this->KontoModel->update($this->post()['konto_id'], $this->post()); + $result = $this->KontoModel->update($this->post()['buchungsnr'], $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Preinteressentstudiengang.php b/application/controllers/api/v1/crm/Preinteressentstudiengang.php index 851d9fc24..fa68a2a87 100644 --- a/application/controllers/api/v1/crm/Preinteressentstudiengang.php +++ b/application/controllers/api/v1/crm/Preinteressentstudiengang.php @@ -55,9 +55,9 @@ class Preinteressentstudiengang extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['preinteressentstudiengang_id'])) + if(isset($this->post()['preinteressent_id']) && isset($this->post()['studiengang_kz'])) { - $result = $this->PreinteressentstudiengangModel->update($this->post()['preinteressentstudiengang_id'], $this->post()); + $result = $this->PreinteressentstudiengangModel->update(array($this->post()['preinteressent_id'], $this->post()['studiengang_kz']), $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Prestudentstatus.php b/application/controllers/api/v1/crm/Prestudentstatus.php index e4e0930c3..4da61e8f4 100644 --- a/application/controllers/api/v1/crm/Prestudentstatus.php +++ b/application/controllers/api/v1/crm/Prestudentstatus.php @@ -57,9 +57,16 @@ class Prestudentstatus extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['prestudentstatus_id'])) + if(isset($this->post()['ausbildungssemester']) && isset($this->post()['studiensemester_kurzbz']) && + isset($this->post()['status_kurzbz']) && isset($this->post()['prestudent_id'])) { - $result = $this->PrestudentstatusModel->update($this->post()['prestudentstatus_id'], $this->post()); + $pksArray = array($this->post()['ausbildungssemester'], + $this->post()['studiensemester_kurzbz'], + $this->post()['status_kurzbz'], + $this->post()['prestudent_id'] + ); + + $result = $this->PrestudentstatusModel->update($pksArray, $this->post()); } else { diff --git a/application/controllers/api/v1/crm/Status.php b/application/controllers/api/v1/crm/Status.php index 2973b602b..2c94d5153 100644 --- a/application/controllers/api/v1/crm/Status.php +++ b/application/controllers/api/v1/crm/Status.php @@ -33,11 +33,11 @@ class Status extends APIv1_Controller */ public function getStatus() { - $statusID = $this->get('status_id'); + $status_kurzbz = $this->get('status_kurzbz'); - if(isset($statusID)) + if(isset($status_kurzbz)) { - $result = $this->StatusModel->load($statusID); + $result = $this->StatusModel->load($status_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Status extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['status_id'])) + if(isset($this->post()['status_kurzbz'])) { - $result = $this->StatusModel->update($this->post()['status_id'], $this->post()); + $result = $this->StatusModel->update($this->post()['status_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Erhalter.php b/application/controllers/api/v1/organisation/Erhalter.php index c52b953ed..a67e00cd7 100644 --- a/application/controllers/api/v1/organisation/Erhalter.php +++ b/application/controllers/api/v1/organisation/Erhalter.php @@ -33,11 +33,11 @@ class Erhalter extends APIv1_Controller */ public function getErhalter() { - $erhalterID = $this->get('erhalter_id'); + $erhalter_kz = $this->get('erhalter_kz'); - if(isset($erhalterID)) + if(isset($erhalter_kz)) { - $result = $this->ErhalterModel->load($erhalterID); + $result = $this->ErhalterModel->load($erhalter_kz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Erhalter extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['erhalter_id'])) + if(isset($this->post()['erhalter_kz'])) { - $result = $this->ErhalterModel->update($this->post()['erhalter_id'], $this->post()); + $result = $this->ErhalterModel->update($this->post()['erhalter_kz'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Ferien.php b/application/controllers/api/v1/organisation/Ferien.php index a5e02a4ee..5e4b15d6e 100644 --- a/application/controllers/api/v1/organisation/Ferien.php +++ b/application/controllers/api/v1/organisation/Ferien.php @@ -55,9 +55,9 @@ class Ferien extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['ferien_id'])) + if(isset($this->post()['studiengang_kz']) && isset($this->post()['bezeichnung'])) { - $result = $this->FerienModel->update($this->post()['ferien_id'], $this->post()); + $result = $this->FerienModel->update(array($this->post()['ferien_id'], $this->post()['bezeichnung']), $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Gruppe.php b/application/controllers/api/v1/organisation/Gruppe.php index 3e6d70f92..1a290740f 100644 --- a/application/controllers/api/v1/organisation/Gruppe.php +++ b/application/controllers/api/v1/organisation/Gruppe.php @@ -33,11 +33,11 @@ class Gruppe extends APIv1_Controller */ public function getGruppe() { - $gruppeID = $this->get('gruppe_id'); + $gruppe_kurzbz = $this->get('gruppe_kurzbz'); - if(isset($gruppeID)) + if(isset($gruppe_kurzbz)) { - $result = $this->GruppeModel->load($gruppeID); + $result = $this->GruppeModel->load($gruppe_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Gruppe extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['gruppe_id'])) + if(isset($this->post()['gruppe_kurzbz'])) { - $result = $this->GruppeModel->update($this->post()['gruppe_id'], $this->post()); + $result = $this->GruppeModel->update($this->post()['gruppe_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Lehrverband.php b/application/controllers/api/v1/organisation/Lehrverband.php index 8e2143934..74089fc2d 100644 --- a/application/controllers/api/v1/organisation/Lehrverband.php +++ b/application/controllers/api/v1/organisation/Lehrverband.php @@ -57,9 +57,16 @@ class Lehrverband extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['lehrverband_id'])) + if(isset($this->post()['gruppe']) && isset($this->post()['verband']) && + isset($this->post()['semester']) && isset($this->post()['studiengang_kz'])) { - $result = $this->LehrverbandModel->update($this->post()['lehrverband_id'], $this->post()); + $pksArray = array($this->post()['gruppe'], + $this->post()['verband'], + $this->post()['semester'], + $this->post()['studiengang_kz'] + ); + + $result = $this->LehrverbandModel->update($pksArray, $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Organisationseinheittyp.php b/application/controllers/api/v1/organisation/Organisationseinheittyp.php index 56bd1ac23..4064f5849 100644 --- a/application/controllers/api/v1/organisation/Organisationseinheittyp.php +++ b/application/controllers/api/v1/organisation/Organisationseinheittyp.php @@ -33,11 +33,11 @@ class Organisationseinheittyp extends APIv1_Controller */ public function getOrganisationseinheittyp() { - $organisationseinheittypID = $this->get('organisationseinheittyp_id'); + $organisationseinheittyp_kurzbz = $this->get('organisationseinheittyp_kurzbz'); - if(isset($organisationseinheittypID)) + if(isset($organisationseinheittyp_kurzbz)) { - $result = $this->OrganisationseinheittypModel->load($organisationseinheittypID); + $result = $this->OrganisationseinheittypModel->load($organisationseinheittyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Organisationseinheittyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['organisationseinheittyp_id'])) + if(isset($this->post()['organisationseinheittyp_kurzbz'])) { - $result = $this->OrganisationseinheittypModel->update($this->post()['organisationseinheittyp_id'], $this->post()); + $result = $this->OrganisationseinheittypModel->update($this->post()['organisationseinheittyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Semesterwochen.php b/application/controllers/api/v1/organisation/Semesterwochen.php index 6980510bd..38c2a4438 100644 --- a/application/controllers/api/v1/organisation/Semesterwochen.php +++ b/application/controllers/api/v1/organisation/Semesterwochen.php @@ -55,9 +55,9 @@ class Semesterwochen extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['semesterwochen_id'])) + if(isset($this->post()['studiengang_kz']) && isset($this->post()['semester'])) { - $result = $this->SemesterwochenModel->update($this->post()['semesterwochen_id'], $this->post()); + $result = $this->SemesterwochenModel->update(array($this->post()['studiengang_kz'], $this->post()['semester']), $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Statistik.php b/application/controllers/api/v1/organisation/Statistik.php index 8d372a1ac..1af29ddad 100644 --- a/application/controllers/api/v1/organisation/Statistik.php +++ b/application/controllers/api/v1/organisation/Statistik.php @@ -33,11 +33,11 @@ class Statistik extends APIv1_Controller */ public function getStatistik() { - $statistikID = $this->get('statistik_id'); + $statistik_kurzbz = $this->get('statistik_kurzbz'); - if(isset($statistikID)) + if(isset($statistik_kurzbz)) { - $result = $this->StatistikModel->load($statistikID); + $result = $this->StatistikModel->load($statistik_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Statistik extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['statistik_id'])) + if(isset($this->post()['statistik_kurzbz'])) { - $result = $this->StatistikModel->update($this->post()['statistik_id'], $this->post()); + $result = $this->StatistikModel->update($this->post()['statistik_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Studiengangstyp.php b/application/controllers/api/v1/organisation/Studiengangstyp.php index 94e6072f8..af9bb5762 100644 --- a/application/controllers/api/v1/organisation/Studiengangstyp.php +++ b/application/controllers/api/v1/organisation/Studiengangstyp.php @@ -33,11 +33,11 @@ class Studiengangstyp extends APIv1_Controller */ public function getStudiengangstyp() { - $studiengangstypID = $this->get('studiengangstyp_id'); + $typ = $this->get('typ'); - if(isset($studiengangstypID)) + if(isset($typ)) { - $result = $this->StudiengangstypModel->load($studiengangstypID); + $result = $this->StudiengangstypModel->load($typ); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Studiengangstyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['studiengangstyp_id'])) + if(isset($this->post()['typ'])) { - $result = $this->StudiengangstypModel->update($this->post()['studiengangstyp_id'], $this->post()); + $result = $this->StudiengangstypModel->update($this->post()['typ'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Studienjahr.php b/application/controllers/api/v1/organisation/Studienjahr.php index 1c90497e2..719dc8579 100644 --- a/application/controllers/api/v1/organisation/Studienjahr.php +++ b/application/controllers/api/v1/organisation/Studienjahr.php @@ -33,11 +33,11 @@ class Studienjahr extends APIv1_Controller */ public function getStudienjahr() { - $studienjahrID = $this->get('studienjahr_id'); + $studienjahr_kurzbz = $this->get('studienjahr_kurzbz'); - if(isset($studienjahrID)) + if(isset($studienjahr_kurzbz)) { - $result = $this->StudienjahrModel->load($studienjahrID); + $result = $this->StudienjahrModel->load($studienjahr_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Studienjahr extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['studienjahr_id'])) + if(isset($this->post()['studienjahr_kurzbz'])) { - $result = $this->StudienjahrModel->update($this->post()['studienjahr_id'], $this->post()); + $result = $this->StudienjahrModel->update($this->post()['studienjahr_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Studienordnungstatus.php b/application/controllers/api/v1/organisation/Studienordnungstatus.php index af6f4bf73..293abbd12 100644 --- a/application/controllers/api/v1/organisation/Studienordnungstatus.php +++ b/application/controllers/api/v1/organisation/Studienordnungstatus.php @@ -33,11 +33,11 @@ class Studienordnungstatus extends APIv1_Controller */ public function getStudienordnungstatus() { - $studienordnungstatusID = $this->get('studienordnungstatus_id'); + $status_kurzbz = $this->get('status_kurzbz'); - if(isset($studienordnungstatusID)) + if(isset($status_kurzbz)) { - $result = $this->StudienordnungstatusModel->load($studienordnungstatusID); + $result = $this->StudienordnungstatusModel->load($status_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Studienordnungstatus extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['studienordnungstatus_id'])) + if(isset($this->post()['status_kurzbz'])) { - $result = $this->StudienordnungstatusModel->update($this->post()['studienordnungstatus_id'], $this->post()); + $result = $this->StudienordnungstatusModel->update($this->post()['status_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/organisation/Studiensemester.php b/application/controllers/api/v1/organisation/Studiensemester.php index aad98aa5d..e61512825 100644 --- a/application/controllers/api/v1/organisation/Studiensemester.php +++ b/application/controllers/api/v1/organisation/Studiensemester.php @@ -33,11 +33,11 @@ class Studiensemester extends APIv1_Controller */ public function getStudiensemester() { - $studiensemesterID = $this->get('studiensemester_id'); + $studiensemester_kurzbz = $this->get('studiensemester_kurzbz'); - if(isset($studiensemesterID)) + if(isset($studiensemester_kurzbz)) { - $result = $this->StudiensemesterModel->load($studiensemesterID); + $result = $this->StudiensemesterModel->load($studiensemester_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Studiensemester extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['studiensemester_id'])) + if(isset($this->post()['studiensemester_kurzbz'])) { - $result = $this->StudiensemesterModel->update($this->post()['studiensemester_id'], $this->post()); + $result = $this->StudiensemesterModel->update($this->post()['studiensemester_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/person/Benutzer.php b/application/controllers/api/v1/person/Benutzer.php index 84cd8f0ac..f79c65708 100644 --- a/application/controllers/api/v1/person/Benutzer.php +++ b/application/controllers/api/v1/person/Benutzer.php @@ -33,11 +33,11 @@ class Benutzer extends APIv1_Controller */ public function getBenutzer() { - $benutzerID = $this->get('benutzer_id'); + $uid = $this->get('uid'); - if(isset($benutzerID)) + if(isset($uid)) { - $result = $this->BenutzerModel->load($benutzerID); + $result = $this->BenutzerModel->load($uid); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Benutzer extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['benutzer_id'])) + if(isset($this->post()['uid'])) { - $result = $this->BenutzerModel->update($this->post()['benutzer_id'], $this->post()); + $result = $this->BenutzerModel->update($this->post()['uid'], $this->post()); } else { diff --git a/application/controllers/api/v1/person/Fotostatus.php b/application/controllers/api/v1/person/Fotostatus.php index f72aca84a..3564d188a 100644 --- a/application/controllers/api/v1/person/Fotostatus.php +++ b/application/controllers/api/v1/person/Fotostatus.php @@ -33,11 +33,11 @@ class Fotostatus extends APIv1_Controller */ public function getFotostatus() { - $fotostatusID = $this->get('fotostatus_id'); + $fotostatus_kurzbz = $this->get('fotostatus_kurzbz'); - if(isset($fotostatusID)) + if(isset($fotostatus_kurzbz)) { - $result = $this->FotostatusModel->load($fotostatusID); + $result = $this->FotostatusModel->load($fotostatus_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Fotostatus extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['fotostatus_id'])) + if(isset($this->post()['fotostatus_kurzbz'])) { - $result = $this->FotostatusModel->update($this->post()['fotostatus_id'], $this->post()); + $result = $this->FotostatusModel->update($this->post()['fotostatus_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/person/Freebusytyp.php b/application/controllers/api/v1/person/Freebusytyp.php index 400c82477..891422d0c 100644 --- a/application/controllers/api/v1/person/Freebusytyp.php +++ b/application/controllers/api/v1/person/Freebusytyp.php @@ -33,11 +33,11 @@ class Freebusytyp extends APIv1_Controller */ public function getFreebusytyp() { - $freebusytypID = $this->get('freebusytyp_id'); + $freebusytyp_kurzbz = $this->get('freebusytyp_kurzbz'); - if(isset($freebusytypID)) + if(isset($freebusytyp_kurzbz)) { - $result = $this->FreebusytypModel->load($freebusytypID); + $result = $this->FreebusytypModel->load($freebusytyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Freebusytyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['freebusytyp_id'])) + if(isset($this->post()['freebusytyp_kurzbz'])) { - $result = $this->FreebusytypModel->update($this->post()['freebusytyp_id'], $this->post()); + $result = $this->FreebusytypModel->update($this->post()['freebusytyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/person/Kontaktmedium.php b/application/controllers/api/v1/person/Kontaktmedium.php index 898988278..f12db34c5 100644 --- a/application/controllers/api/v1/person/Kontaktmedium.php +++ b/application/controllers/api/v1/person/Kontaktmedium.php @@ -33,11 +33,11 @@ class Kontaktmedium extends APIv1_Controller */ public function getKontaktmedium() { - $kontaktmediumID = $this->get('kontaktmedium_id'); + $kontaktmedium_kurzbz = $this->get('kontaktmedium_kurzbz'); - if(isset($kontaktmediumID)) + if(isset($kontaktmedium_kurzbz)) { - $result = $this->KontaktmediumModel->load($kontaktmediumID); + $result = $this->KontaktmediumModel->load($kontaktmedium_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Kontaktmedium extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['kontaktmedium_id'])) + if(isset($this->post()['kontaktmedium_kurzbz'])) { - $result = $this->KontaktmediumModel->update($this->post()['kontaktmedium_id'], $this->post()); + $result = $this->KontaktmediumModel->update($this->post()['kontaktmedium_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/person/Kontakttyp.php b/application/controllers/api/v1/person/Kontakttyp.php index ea179dd2a..a663d03cc 100644 --- a/application/controllers/api/v1/person/Kontakttyp.php +++ b/application/controllers/api/v1/person/Kontakttyp.php @@ -33,11 +33,11 @@ class Kontakttyp extends APIv1_Controller */ public function getKontakttyp() { - $kontakttypID = $this->get('kontakttyp_id'); + $kontakttyp = $this->get('kontakttyp'); - if(isset($kontakttypID)) + if(isset($kontakttyp)) { - $result = $this->KontakttypModel->load($kontakttypID); + $result = $this->KontakttypModel->load($kontakttyp); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Kontakttyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['kontakttyp_id'])) + if(isset($this->post()['kontakttyp'])) { - $result = $this->KontakttypModel->update($this->post()['kontakttyp_id'], $this->post()); + $result = $this->KontakttypModel->update($this->post()['kontakttyp'], $this->post()); } else { diff --git a/application/controllers/api/v1/project/Aktivitaet.php b/application/controllers/api/v1/project/Aktivitaet.php index 434a6a458..42b979927 100644 --- a/application/controllers/api/v1/project/Aktivitaet.php +++ b/application/controllers/api/v1/project/Aktivitaet.php @@ -33,11 +33,11 @@ class Aktivitaet extends APIv1_Controller */ public function getAktivitaet() { - $aktivitaetID = $this->get('aktivitaet_id'); + $aktivitaet_kurzbz = $this->get('aktivitaet_kurzbz'); - if(isset($aktivitaetID)) + if(isset($aktivitaet_kurzbz)) { - $result = $this->AktivitaetModel->load($aktivitaetID); + $result = $this->AktivitaetModel->load($aktivitaet_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Aktivitaet extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['aktivitaet_id'])) + if(isset($this->post()['aktivitaet_kurzbz'])) { - $result = $this->AktivitaetModel->update($this->post()['aktivitaet_id'], $this->post()); + $result = $this->AktivitaetModel->update($this->post()['aktivitaet_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/project/Aufwandstyp.php b/application/controllers/api/v1/project/Aufwandstyp.php index 754cbcf1c..45d69d022 100644 --- a/application/controllers/api/v1/project/Aufwandstyp.php +++ b/application/controllers/api/v1/project/Aufwandstyp.php @@ -33,11 +33,11 @@ class Aufwandstyp extends APIv1_Controller */ public function getAufwandstyp() { - $aufwandstypID = $this->get('aufwandstyp_id'); + $aufwandstyp_kurzbz = $this->get('aufwandstyp_kurzbz'); - if(isset($aufwandstypID)) + if(isset($aufwandstyp_kurzbz)) { - $result = $this->AufwandstypModel->load($aufwandstypID); + $result = $this->AufwandstypModel->load($aufwandstyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Aufwandstyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['aufwandstyp_id'])) + if(isset($this->post()['aufwandstyp_kurzbz'])) { - $result = $this->AufwandstypModel->update($this->post()['aufwandstyp_id'], $this->post()); + $result = $this->AufwandstypModel->update($this->post()['aufwandstyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/project/Projekt.php b/application/controllers/api/v1/project/Projekt.php index eab850c88..c37456b3e 100644 --- a/application/controllers/api/v1/project/Projekt.php +++ b/application/controllers/api/v1/project/Projekt.php @@ -33,11 +33,11 @@ class Projekt extends APIv1_Controller */ public function getProjekt() { - $projektID = $this->get('projekt_id'); + $projekt_kurzbz = $this->get('projekt_kurzbz'); - if(isset($projektID)) + if(isset($projekt_kurzbz)) { - $result = $this->ProjektModel->load($projektID); + $result = $this->ProjektModel->load($projekt_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Projekt extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['projekt_id'])) + if(isset($this->post()['projekt_kurzbz'])) { - $result = $this->ProjektModel->update($this->post()['projekt_id'], $this->post()); + $result = $this->ProjektModel->update($this->post()['projekt_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/project/Scrumteam.php b/application/controllers/api/v1/project/Scrumteam.php index dd5f3e29a..aab41842b 100644 --- a/application/controllers/api/v1/project/Scrumteam.php +++ b/application/controllers/api/v1/project/Scrumteam.php @@ -33,11 +33,11 @@ class Scrumteam extends APIv1_Controller */ public function getScrumteam() { - $scrumteamID = $this->get('scrumteam_id'); + $scrumteam_kurzbz = $this->get('scrumteam_kurzbz'); - if(isset($scrumteamID)) + if(isset($scrumteam_kurzbz)) { - $result = $this->ScrumteamModel->load($scrumteamID); + $result = $this->ScrumteamModel->load($scrumteam_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Scrumteam extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['scrumteam_id'])) + if(isset($this->post()['scrumteam_kurzbz'])) { - $result = $this->ScrumteamModel->update($this->post()['scrumteam_id'], $this->post()); + $result = $this->ScrumteamModel->update($this->post()['scrumteam_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Betriebsmittelstatus.php b/application/controllers/api/v1/ressource/Betriebsmittelstatus.php index 9f9b126c1..37dcb5abe 100644 --- a/application/controllers/api/v1/ressource/Betriebsmittelstatus.php +++ b/application/controllers/api/v1/ressource/Betriebsmittelstatus.php @@ -33,11 +33,11 @@ class Betriebsmittelstatus extends APIv1_Controller */ public function getBetriebsmittelstatus() { - $betriebsmittelstatusID = $this->get('betriebsmittelstatus_id'); + $betriebsmittelstatus_kurzbz = $this->get('betriebsmittelstatus_kurzbz'); - if(isset($betriebsmittelstatusID)) + if(isset($betriebsmittelstatus_kurzbz)) { - $result = $this->BetriebsmittelstatusModel->load($betriebsmittelstatusID); + $result = $this->BetriebsmittelstatusModel->load($betriebsmittelstatus_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Betriebsmittelstatus extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['betriebsmittelstatus_id'])) + if(isset($this->post()['betriebsmittelstatus_kurzbz'])) { - $result = $this->BetriebsmittelstatusModel->update($this->post()['betriebsmittelstatus_id'], $this->post()); + $result = $this->BetriebsmittelstatusModel->update($this->post()['betriebsmittelstatus_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Betriebsmitteltyp.php b/application/controllers/api/v1/ressource/Betriebsmitteltyp.php index 10c966ead..298fe41e4 100644 --- a/application/controllers/api/v1/ressource/Betriebsmitteltyp.php +++ b/application/controllers/api/v1/ressource/Betriebsmitteltyp.php @@ -33,11 +33,11 @@ class Betriebsmitteltyp extends APIv1_Controller */ public function getBetriebsmitteltyp() { - $betriebsmitteltypID = $this->get('betriebsmitteltyp_id'); + $betriebsmitteltyp = $this->get('betriebsmitteltyp'); - if(isset($betriebsmitteltypID)) + if(isset($betriebsmitteltyp)) { - $result = $this->BetriebsmitteltypModel->load($betriebsmitteltypID); + $result = $this->BetriebsmitteltypModel->load($betriebsmitteltyp); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Betriebsmitteltyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['betriebsmitteltyp_id'])) + if(isset($this->post()['betriebsmitteltyp'])) { - $result = $this->BetriebsmitteltypModel->update($this->post()['betriebsmitteltyp_id'], $this->post()); + $result = $this->BetriebsmitteltypModel->update($this->post()['betriebsmitteltyp'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Erreichbarkeit.php b/application/controllers/api/v1/ressource/Erreichbarkeit.php index 68719e459..418151974 100644 --- a/application/controllers/api/v1/ressource/Erreichbarkeit.php +++ b/application/controllers/api/v1/ressource/Erreichbarkeit.php @@ -33,11 +33,11 @@ class Erreichbarkeit extends APIv1_Controller */ public function getErreichbarkeit() { - $erreichbarkeitID = $this->get('erreichbarkeit_id'); + $erreichbarkeit_kurzbz = $this->get('erreichbarkeit_kurzbz'); - if(isset($erreichbarkeitID)) + if(isset($erreichbarkeit_kurzbz)) { - $result = $this->ErreichbarkeitModel->load($erreichbarkeitID); + $result = $this->ErreichbarkeitModel->load($erreichbarkeit_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Erreichbarkeit extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['erreichbarkeit_id'])) + if(isset($this->post()['erreichbarkeit_kurzbz'])) { - $result = $this->ErreichbarkeitModel->update($this->post()['erreichbarkeit_id'], $this->post()); + $result = $this->ErreichbarkeitModel->update($this->post()['erreichbarkeit_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Firmatag.php b/application/controllers/api/v1/ressource/Firmatag.php index 01bf864b9..27758fd16 100644 --- a/application/controllers/api/v1/ressource/Firmatag.php +++ b/application/controllers/api/v1/ressource/Firmatag.php @@ -55,9 +55,9 @@ class Firmatag extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['firmatag_id'])) + if(isset($this->post()['tag']) && isset($this->post()['firma_id'])) { - $result = $this->FirmatagModel->update($this->post()['firmatag_id'], $this->post()); + $result = $this->FirmatagModel->update(array($this->post()['tag'], $this->post()['firma_id']), $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Firmentyp.php b/application/controllers/api/v1/ressource/Firmentyp.php index ba58242ba..abd58e704 100644 --- a/application/controllers/api/v1/ressource/Firmentyp.php +++ b/application/controllers/api/v1/ressource/Firmentyp.php @@ -33,11 +33,11 @@ class Firmentyp extends APIv1_Controller */ public function getFirmentyp() { - $firmentypID = $this->get('firmentyp_id'); + $firmentyp_kurzbz = $this->get('firmentyp_kurzbz'); - if(isset($firmentypID)) + if(isset($firmentyp_kurzbz)) { - $result = $this->FirmentypModel->load($firmentypID); + $result = $this->FirmentypModel->load($firmentyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Firmentyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['firmentyp_id'])) + if(isset($this->post()['firmentyp_kurzbz'])) { - $result = $this->FirmentypModel->update($this->post()['firmentyp_id'], $this->post()); + $result = $this->FirmentypModel->update($this->post()['firmentyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Funktion.php b/application/controllers/api/v1/ressource/Funktion.php index 1894983a7..57caf10bd 100644 --- a/application/controllers/api/v1/ressource/Funktion.php +++ b/application/controllers/api/v1/ressource/Funktion.php @@ -33,11 +33,11 @@ class Funktion extends APIv1_Controller */ public function getFunktion() { - $funktionID = $this->get('funktion_id'); + $funktion_kurzbz = $this->get('funktion_kurzbz'); - if(isset($funktionID)) + if(isset($funktion_kurzbz)) { - $result = $this->FunktionModel->load($funktionID); + $result = $this->FunktionModel->load($funktion_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Funktion extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['funktion_id'])) + if(isset($this->post()['funktion_kurzbz'])) { - $result = $this->FunktionModel->update($this->post()['funktion_id'], $this->post()); + $result = $this->FunktionModel->update($this->post()['funktion_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Lehrmittel.php b/application/controllers/api/v1/ressource/Lehrmittel.php index c1b1a0b9d..faa92346a 100644 --- a/application/controllers/api/v1/ressource/Lehrmittel.php +++ b/application/controllers/api/v1/ressource/Lehrmittel.php @@ -33,11 +33,11 @@ class Lehrmittel extends APIv1_Controller */ public function getLehrmittel() { - $lehrmittelID = $this->get('lehrmittel_id'); + $lehrmittel_kurzbz = $this->get('lehrmittel_kurzbz'); - if(isset($lehrmittelID)) + if(isset($lehrmittel_kurzbz)) { - $result = $this->LehrmittelModel->load($lehrmittelID); + $result = $this->LehrmittelModel->load($lehrmittel_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Lehrmittel extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['lehrmittel_id'])) + if(isset($this->post()['lehrmittel_kurzbz'])) { - $result = $this->LehrmittelModel->update($this->post()['lehrmittel_id'], $this->post()); + $result = $this->LehrmittelModel->update($this->post()['lehrmittel_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Mitarbeiter.php b/application/controllers/api/v1/ressource/Mitarbeiter.php index 17ad4e8ef..afce5fe00 100644 --- a/application/controllers/api/v1/ressource/Mitarbeiter.php +++ b/application/controllers/api/v1/ressource/Mitarbeiter.php @@ -33,11 +33,11 @@ class Mitarbeiter extends APIv1_Controller */ public function getMitarbeiter() { - $mitarbeiterID = $this->get('mitarbeiter_id'); + $mitarbeiter_uid = $this->get('mitarbeiter_uid'); - if(isset($mitarbeiterID)) + if(isset($mitarbeiter_uid)) { - $result = $this->MitarbeiterModel->load($mitarbeiterID); + $result = $this->MitarbeiterModel->load($mitarbeiter_uid); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Mitarbeiter extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['mitarbeiter_id'])) + if(isset($this->post()['mitarbeiter_uid'])) { - $result = $this->MitarbeiterModel->update($this->post()['mitarbeiter_id'], $this->post()); + $result = $this->MitarbeiterModel->update($this->post()['mitarbeiter_uid'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Ort.php b/application/controllers/api/v1/ressource/Ort.php index e49d7fea7..d52191721 100644 --- a/application/controllers/api/v1/ressource/Ort.php +++ b/application/controllers/api/v1/ressource/Ort.php @@ -33,11 +33,11 @@ class Ort extends APIv1_Controller */ public function getOrt() { - $ortID = $this->get('ort_id'); + $ort_kurzbz = $this->get('ort_kurzbz'); - if(isset($ortID)) + if(isset($ort_kurzbz)) { - $result = $this->OrtModel->load($ortID); + $result = $this->OrtModel->load($ort_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Ort extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['ort_id'])) + if(isset($this->post()['ort_kurzbz'])) { - $result = $this->OrtModel->update($this->post()['ort_id'], $this->post()); + $result = $this->OrtModel->update($this->post()['ort_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Ortraumtyp.php b/application/controllers/api/v1/ressource/Ortraumtyp.php index 20f4ccc93..460841e1d 100644 --- a/application/controllers/api/v1/ressource/Ortraumtyp.php +++ b/application/controllers/api/v1/ressource/Ortraumtyp.php @@ -55,9 +55,9 @@ class Ortraumtyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['ortraumtyp_id'])) + if(isset($this->post()['hierarchie']) && isset($this->post()['ort_kurzbz'])) { - $result = $this->OrtraumtypModel->update($this->post()['ortraumtyp_id'], $this->post()); + $result = $this->OrtraumtypModel->update(array($this->post()['hierarchie'], $this->post()['ort_kurzbz']), $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Raumtyp.php b/application/controllers/api/v1/ressource/Raumtyp.php index dd242d74c..5aa506797 100644 --- a/application/controllers/api/v1/ressource/Raumtyp.php +++ b/application/controllers/api/v1/ressource/Raumtyp.php @@ -33,11 +33,11 @@ class Raumtyp extends APIv1_Controller */ public function getRaumtyp() { - $raumtypID = $this->get('raumtyp_id'); + $raumtyp_kurzbz = $this->get('raumtyp_kurzbz'); - if(isset($raumtypID)) + if(isset($raumtyp_kurzbz)) { - $result = $this->RaumtypModel->load($raumtypID); + $result = $this->RaumtypModel->load($raumtyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Raumtyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['raumtyp_id'])) + if(isset($this->post()['raumtyp_kurzbz'])) { - $result = $this->RaumtypModel->update($this->post()['raumtyp_id'], $this->post()); + $result = $this->RaumtypModel->update($this->post()['raumtyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Stunde.php b/application/controllers/api/v1/ressource/Stunde.php index 18b503fe9..f7437efc4 100644 --- a/application/controllers/api/v1/ressource/Stunde.php +++ b/application/controllers/api/v1/ressource/Stunde.php @@ -33,11 +33,11 @@ class Stunde extends APIv1_Controller */ public function getStunde() { - $stundeID = $this->get('stunde_id'); + $stunde = $this->get('stunde'); - if(isset($stundeID)) + if(isset($stunde)) { - $result = $this->StundeModel->load($stundeID); + $result = $this->StundeModel->load($stunde); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Stunde extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['stunde_id'])) + if(isset($this->post()['stunde'])) { - $result = $this->StundeModel->update($this->post()['stunde_id'], $this->post()); + $result = $this->StundeModel->update($this->post()['stunde'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Zeitfenster.php b/application/controllers/api/v1/ressource/Zeitfenster.php index d57ba5083..1ffc5f2f1 100644 --- a/application/controllers/api/v1/ressource/Zeitfenster.php +++ b/application/controllers/api/v1/ressource/Zeitfenster.php @@ -57,9 +57,16 @@ class Zeitfenster extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zeitfenster_id'])) + if(isset($this->post()['wochentag']) && isset($this->post()['studiengang_kz']) && + isset($this->post()['ort_kurzbz']) && isset($this->post()['stunde'])) { - $result = $this->ZeitfensterModel->update($this->post()['zeitfenster_id'], $this->post()); + $pksArray = array($this->post()['wochentag'], + $this->post()['studiengang_kz'], + $this->post()['ort_kurzbz'], + $this->post()['stunde'] + ); + + $result = $this->ZeitfensterModel->update($pksArray, $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Zeitsperretyp.php b/application/controllers/api/v1/ressource/Zeitsperretyp.php index 1476c6286..8fca4cd09 100644 --- a/application/controllers/api/v1/ressource/Zeitsperretyp.php +++ b/application/controllers/api/v1/ressource/Zeitsperretyp.php @@ -33,11 +33,11 @@ class Zeitsperretyp extends APIv1_Controller */ public function getZeitsperretyp() { - $zeitsperretypID = $this->get('zeitsperretyp_id'); + $zeitsperretyp_kurzbz = $this->get('zeitsperretyp_kurzbz'); - if(isset($zeitsperretypID)) + if(isset($zeitsperretyp_kurzbz)) { - $result = $this->ZeitsperretypModel->load($zeitsperretypID); + $result = $this->ZeitsperretypModel->load($zeitsperretyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Zeitsperretyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zeitsperretyp_id'])) + if(isset($this->post()['zeitsperretyp_kurzbz'])) { - $result = $this->ZeitsperretypModel->update($this->post()['zeitsperretyp_id'], $this->post()); + $result = $this->ZeitsperretypModel->update($this->post()['zeitsperretyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/ressource/Zeitwunsch.php b/application/controllers/api/v1/ressource/Zeitwunsch.php index 71aa1f95d..79ce86925 100644 --- a/application/controllers/api/v1/ressource/Zeitwunsch.php +++ b/application/controllers/api/v1/ressource/Zeitwunsch.php @@ -56,9 +56,14 @@ class Zeitwunsch extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['zeitwunsch_id'])) + if(isset($this->post()['tag']) && isset($this->post()['mitarbeiter_uid']) && isset($this->post()['stunde'])) { - $result = $this->ZeitwunschModel->update($this->post()['zeitwunsch_id'], $this->post()); + $pksArray = array($this->post()['tag'], + $this->post()['mitarbeiter_uid'], + $this->post()['stunde'] + ); + + $result = $this->ZeitwunschModel->update($pksArray, $this->post()); } else { diff --git a/application/controllers/api/v1/system/Berechtigung.php b/application/controllers/api/v1/system/Berechtigung.php index 00839ba76..af6aa8fb9 100644 --- a/application/controllers/api/v1/system/Berechtigung.php +++ b/application/controllers/api/v1/system/Berechtigung.php @@ -33,11 +33,11 @@ class Berechtigung extends APIv1_Controller */ public function getBerechtigung() { - $berechtigungID = $this->get('berechtigung_id'); + $berechtigung_kurzbz = $this->get('berechtigung_kurzbz'); - if(isset($berechtigungID)) + if(isset($berechtigung_kurzbz)) { - $result = $this->BerechtigungModel->load($berechtigungID); + $result = $this->BerechtigungModel->load($berechtigung_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Berechtigung extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['berechtigung_id'])) + if(isset($this->post()['berechtigung_kurzbz'])) { - $result = $this->BerechtigungModel->update($this->post()['berechtigung_id'], $this->post()); + $result = $this->BerechtigungModel->update($this->post()['berechtigung_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/system/Rolle.php b/application/controllers/api/v1/system/Rolle.php index 6bc0f8214..099e99006 100644 --- a/application/controllers/api/v1/system/Rolle.php +++ b/application/controllers/api/v1/system/Rolle.php @@ -33,11 +33,11 @@ class Rolle extends APIv1_Controller */ public function getRolle() { - $rolleID = $this->get('rolle_id'); + $rolle_kurzbz = $this->get('rolle_kurzbz'); - if(isset($rolleID)) + if(isset($rolle_kurzbz)) { - $result = $this->RolleModel->load($rolleID); + $result = $this->RolleModel->load($rolle_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Rolle extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['rolle_id'])) + if(isset($this->post()['rolle_kurzbz'])) { - $result = $this->RolleModel->update($this->post()['rolle_id'], $this->post()); + $result = $this->RolleModel->update($this->post()['rolle_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/system/Rolleberechtigung.php b/application/controllers/api/v1/system/Rolleberechtigung.php index 6148ce460..a314190dd 100644 --- a/application/controllers/api/v1/system/Rolleberechtigung.php +++ b/application/controllers/api/v1/system/Rolleberechtigung.php @@ -55,9 +55,9 @@ class Rolleberechtigung extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['rolleberechtigung_id'])) + if(isset($this->post()['rolle_kurzbz']) && isset($this->post()['berechtigung_kurzbz'])) { - $result = $this->RolleberechtigungModel->update($this->post()['rolleberechtigung_id'], $this->post()); + $result = $this->RolleberechtigungModel->update(array($this->post()['rolle_kurzbz'], $this->post()['berechtigung_kurzbz']), $this->post()); } else { diff --git a/application/controllers/api/v1/system/Tag.php b/application/controllers/api/v1/system/Tag.php index c82e35bc7..f320cedd6 100644 --- a/application/controllers/api/v1/system/Tag.php +++ b/application/controllers/api/v1/system/Tag.php @@ -33,11 +33,11 @@ class Tag extends APIv1_Controller */ public function getTag() { - $tagID = $this->get('tag_id'); + $tag = $this->get('tag'); - if(isset($tagID)) + if(isset($tag)) { - $result = $this->TagModel->load($tagID); + $result = $this->TagModel->load($tag); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Tag extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['tag_id'])) + if(isset($this->post()['tag'])) { - $result = $this->TagModel->update($this->post()['tag_id'], $this->post()); + $result = $this->TagModel->update($this->post()['tag'], $this->post()); } else { diff --git a/application/controllers/api/v1/system/Variable.php b/application/controllers/api/v1/system/Variable.php index 58d74488d..0eea84bc7 100644 --- a/application/controllers/api/v1/system/Variable.php +++ b/application/controllers/api/v1/system/Variable.php @@ -55,9 +55,9 @@ class Variable extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['variable_id'])) + if(isset($this->post()['uid']) && isset($this->post()['name'])) { - $result = $this->VariableModel->update($this->post()['variable_id'], $this->post()); + $result = $this->VariableModel->update(array($this->post()['uid'], $this->post()['name']), $this->post()); } else { diff --git a/application/controllers/api/v1/system/Vorlage.php b/application/controllers/api/v1/system/Vorlage.php index 016d112b0..58fc36cf1 100644 --- a/application/controllers/api/v1/system/Vorlage.php +++ b/application/controllers/api/v1/system/Vorlage.php @@ -33,11 +33,11 @@ class Vorlage extends APIv1_Controller */ public function getVorlage() { - $vorlageID = $this->get('vorlage_id'); + $vorlage_kurzbz = $this->get('vorlage_kurzbz'); - if(isset($vorlageID)) + if(isset($vorlage_kurzbz)) { - $result = $this->VorlageModel->load($vorlageID); + $result = $this->VorlageModel->load($vorlage_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Vorlage extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['vorlage_id'])) + if(isset($this->post()['vorlage_kurzbz'])) { - $result = $this->VorlageModel->update($this->post()['vorlage_id'], $this->post()); + $result = $this->VorlageModel->update($this->post()['vorlage_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/system/Webservicetyp.php b/application/controllers/api/v1/system/Webservicetyp.php index 05e169504..03fe42340 100644 --- a/application/controllers/api/v1/system/Webservicetyp.php +++ b/application/controllers/api/v1/system/Webservicetyp.php @@ -33,11 +33,11 @@ class Webservicetyp extends APIv1_Controller */ public function getWebservicetyp() { - $webservicetypID = $this->get('webservicetyp_id'); + $webservicetyp_kurzbz = $this->get('webservicetyp_kurzbz'); - if(isset($webservicetypID)) + if(isset($webservicetyp_kurzbz)) { - $result = $this->WebservicetypModel->load($webservicetypID); + $result = $this->WebservicetypModel->load($webservicetyp_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Webservicetyp extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['webservicetyp_id'])) + if(isset($this->post()['webservicetyp_kurzbz'])) { - $result = $this->WebservicetypModel->update($this->post()['webservicetyp_id'], $this->post()); + $result = $this->WebservicetypModel->update($this->post()['webservicetyp_kurzbz'], $this->post()); } else { diff --git a/application/controllers/api/v1/testtool/Kategorie.php b/application/controllers/api/v1/testtool/Kategorie.php index afabe9937..e28bc7193 100644 --- a/application/controllers/api/v1/testtool/Kategorie.php +++ b/application/controllers/api/v1/testtool/Kategorie.php @@ -33,11 +33,11 @@ class Kategorie extends APIv1_Controller */ public function getKategorie() { - $kategorieID = $this->get('kategorie_id'); + $kategorie_kurzbz = $this->get('kategorie_kurzbz'); - if(isset($kategorieID)) + if(isset($kategorie_kurzbz)) { - $result = $this->KategorieModel->load($kategorieID); + $result = $this->KategorieModel->load($kategorie_kurzbz); $this->response($result, REST_Controller::HTTP_OK); } @@ -54,9 +54,9 @@ class Kategorie extends APIv1_Controller { if($this->_validate($this->post())) { - if(isset($this->post()['kategorie_id'])) + if(isset($this->post()['kategorie_kurzbz'])) { - $result = $this->KategorieModel->update($this->post()['kategorie_id'], $this->post()); + $result = $this->KategorieModel->update($this->post()['kategorie_kurzbz'], $this->post()); } else { diff --git a/tests/codeception/_data/dump.sql b/tests/codeception/_data/dump.sql index 5ce901a00..62deaa687 100644 --- a/tests/codeception/_data/dump.sql +++ b/tests/codeception/_data/dump.sql @@ -1,5 +1,5 @@ -- UPDATE tbl_studiengang -UPDATE tbl_studiengang SET onlinebewerbung = TRUE; +UPDATE public.tbl_studiengang SET onlinebewerbung = TRUE; -- EMPTY lehre.tbl_studienplan DELETE FROM lehre.tbl_studienplan;