blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Renamed classes, methods and properties names in german

Browse Source 
- All the controllers exends APIv1_Controller rather than REST_Controller
 - Codeceptions modified to be compliant to changes
This commit is contained in:
paolo
2016-04-25 15:57:52 +02:00
parent ecff3747d0
commit a3a9c42e99
24 changed files with 220 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/Nation.php
+4 -7
View File
@@ -14,7 +14,7 @@
if(!defined('BASEPATH')) exit('No direct script access allowed');
class Nation extends REST_Controller
class Nation extends APIv1_Controller
{
/**
* Course API constructor.
@@ -30,10 +30,7 @@ class Nation extends REST_Controller
public function getAll()
{
$notLocked = $this->get('ohnesperre');
$orderEnglish = $this->get('orderEnglish');
$result = $this->NationModel->getAll($notLocked, $orderEnglish);
$result = $this->NationModel->getAll($this->get('ohnesperre'), $this->get('orderEnglish'));
if(is_object($result))
{
@@ -56,9 +53,9 @@ class Nation extends REST_Controller
$this->response($payload, $httpstatus);
}
public function getFederalState()
public function getBundesland()
{
$result = $this->NationModel->getFederalState();
$result = $this->NationModel->getBundesland();
if(is_object($result))
{
application/controllers/api/v1/lehre/Studiengang.php
+7 -9
View File
@@ -14,7 +14,7 @@
if(!defined('BASEPATH')) exit('No direct script access allowed');
class Plan extends REST_Controller
class Studiengang extends APIv1_Controller
{
/**
* Course API constructor.
@@ -23,22 +23,20 @@ class Plan extends REST_Controller
{
parent::__construct();
// Load model PersonModel
$this->load->model('studies/plan_model', 'PlanModel');
$this->load->model('lehre/studiengang_model', 'StudiengangModel');
// Load set the addonID of the model to let to check the permissions
$this->PlanModel->setAddonID($this->_getAddonID());
$this->StudiengangModel->setAddonID($this->_getAddonID());
}
public function getPlan()
public function getAllForBewerbung()
{
$courseOfStudiesID = $this->get('studiengang_kz');
$result = $this->PlanModel->getPlan($courseOfStudiesID);
$result = $this->StudiengangModel->getAllForBewerbung();
if(is_object($result) && $result->num_rows() > 0)
{
$payload = [
'success' => TRUE,
'message' => 'Plan found',
'message' => 'Courses found',
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
@@ -47,7 +45,7 @@ class Plan extends REST_Controller
{
$payload = [
'success' => FALSE,
'message' => 'Plan not found'
'message' => 'No courses found'
];
$httpstatus = REST_Controller::HTTP_OK;
}
application/controllers/api/v1/lehre/Studienplan.php
+7 -7
View File
@@ -14,7 +14,7 @@
if(!defined('BASEPATH')) exit('No direct script access allowed');
class Course extends REST_Controller
class Studienplan extends APIv1_Controller
{
/**
* Course API constructor.
@@ -23,20 +23,20 @@ class Course extends REST_Controller
{
parent::__construct();
// Load model PersonModel
$this->load->model('studies/course_model', 'CourseModel');
$this->load->model('lehre/studienplan_model', 'StudienplanModel');
// Load set the addonID of the model to let to check the permissions
$this->CourseModel->setAddonID($this->_getAddonID());
$this->StudienplanModel->setAddonID($this->_getAddonID());
}
public function getEnabledCourses()
public function getStudienplaene()
{
$result = $this->CourseModel->getEnabledCourses();
$result = $this->StudienplanModel->getStudienplaene($this->get('studiengang_kz'));
if(is_object($result) && $result->num_rows() > 0)
{
$payload = [
'success' => TRUE,
'message' => 'Courses found',
'message' => 'Plan found',
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
@@ -45,7 +45,7 @@ class Course extends REST_Controller
{
$payload = [
'success' => FALSE,
'message' => 'No courses found'
'message' => 'Plan not found'
];
$httpstatus = REST_Controller::HTTP_OK;
}
application/controllers/api/v1/person/Person.php
+2 -2
View File
@@ -90,9 +90,9 @@ class Person extends APIv1_Controller
/**
*
*/
public function postInterestedStudent()
public function postPrestudent()
{
$result = $this->PersonModel->saveInterestedStudent($this->post());
$result = $this->PersonModel->savePrestudent($this->post());
if($result === TRUE)
{