blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-16 11:39:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source
This commit is contained in:
Gerald Raab
2016-11-17 15:09:14 +01:00
parent a48ee2676e 66afe6d8f9
commit 07556cc78d
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/crm/Dokumentstudiengang.php
+20 -10
View File
@@ -12,7 +12,7 @@
*/
// ------------------------------------------------------------------------
if (!defined("BASEPATH")) exit("No direct script access allowed");
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Dokumentstudiengang extends APIv1_Controller
{
@@ -23,7 +23,7 @@ class Dokumentstudiengang extends APIv1_Controller
{
parent::__construct();
// Load model DokumentstudiengangModel
$this->load->model("crm/Dokumentstudiengang_model", "DokumentstudiengangModel");
$this->load->model('crm/Dokumentstudiengang_model', 'DokumentstudiengangModel');
}
/**
@@ -31,8 +31,8 @@ class Dokumentstudiengang extends APIv1_Controller
*/
public function getDokumentstudiengang()
{
$studiengang_kz = $this->get("studiengang_kz");
$dokument_kurzbz = $this->get("dokument_kurzbz");
$studiengang_kz = $this->get('studiengang_kz');
$dokument_kurzbz = $this->get('dokument_kurzbz');
if (isset($studiengang_kz) && isset($dokument_kurzbz))
{
@@ -51,13 +51,19 @@ class Dokumentstudiengang extends APIv1_Controller
*/
public function getDokumentstudiengangByStudiengang_kz()
{
$studiengang_kz = $this->get("studiengang_kz");
$onlinebewerbung = $this->get("onlinebewerbung");
$pflicht = $this->get("pflicht");
$studiengang_kz = $this->get('studiengang_kz');
$onlinebewerbung = $this->get('onlinebewerbung');
$pflicht = $this->get('pflicht');
$nachreichbar = $this->get('nachreichbar');
if (isset($studiengang_kz))
{
$result = $this->DokumentstudiengangModel->getDokumentstudiengangByStudiengang_kz($studiengang_kz, $onlinebewerbung, $pflicht);
$result = $this->DokumentstudiengangModel->getDokumentstudiengangByStudiengang_kz(
$studiengang_kz,
$onlinebewerbung,
$pflicht,
$nachreichbar
);
$this->response($result, REST_Controller::HTTP_OK);
}
@@ -74,9 +80,13 @@ class Dokumentstudiengang extends APIv1_Controller
{
if ($this->_validate($this->post()))
{
if (isset($this->post()["studiengang_kz"]) && isset($this->post()["dokument_kurzbz"]))
if (isset($this->post()['studiengang_kz']) && isset($this->post()['dokument_kurzbz']))
{
$result = $this->DokumentstudiengangModel->update(array($this->post()["studiengang_kz"], $this->post()["dokument_kurzbz"]), $this->post());
$result = $this->DokumentstudiengangModel->update(
array($this->post()['studiengang_kz'],
$this->post()['dokument_kurzbz']),
$this->post()
);
}
else
{
application/models/crm/Dokumentstudiengang_model.php
+13 -8
View File
@@ -8,28 +8,33 @@ class Dokumentstudiengang_model extends DB_Model
public function __construct()
{
parent::__construct();
$this->dbTable = "public.tbl_dokumentstudiengang";
$this->pk = array("studiengang_kz", "dokument_kurzbz");
$this->dbTable = 'public.tbl_dokumentstudiengang';
$this->pk = array('studiengang_kz', 'dokument_kurzbz');
}
public function getDokumentstudiengangByStudiengang_kz($studiengang_kz, $onlinebewerbung, $pflicht)
public function getDokumentstudiengangByStudiengang_kz($studiengang_kz, $onlinebewerbung = null, $pflicht = null, $nachreichbar = null)
{
// Checks if the operation is permitted by the API caller
if (($isEntitled = $this->isEntitled("public.tbl_dokument", "s", FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
if (($isEntitled = $this->isEntitled('public.tbl_dokument', 's', FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
return $isEntitled;
$this->addJoin("public.tbl_dokument", "dokument_kurzbz");
$this->addJoin('public.tbl_dokument', 'dokument_kurzbz');
$parameterArray = array("studiengang_kz" => $studiengang_kz);
$parameterArray = array('studiengang_kz' => $studiengang_kz);
if( isset($onlinebewerbung))
{
$parameterArray["onlinebewerbung"] = $onlinebewerbung;
$parameterArray['onlinebewerbung'] = $onlinebewerbung;
}
if( isset($pflicht))
{
$parameterArray["pflicht"] = $pflicht;
$parameterArray['pflicht'] = $pflicht;
}
if( isset($nachreichbar))
{
$parameterArray['nachreichbar'] = $nachreichbar;
}
return $this->loadWhere($parameterArray);