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

API Calls codeception

Browse Source 
Fixed translations
This commit is contained in:
paolo
2016-04-22 14:44:40 +02:00
parent 346b8c82e1
commit f6f533a23b
11 changed files with 85 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/person/Person.php
+2 -2
View File
@@ -39,11 +39,11 @@ class Person extends REST_Controller
$result = $this->PersonModel->getPerson($personID, $code, $email);
if(is_object($result))
if(is_object($result) && $result->num_rows() > 0)
{
$payload = [
'success' => TRUE,
'message' => 'People found',
'message' => 'Person found',
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
application/controllers/api/v1/studies/Course.php
+1 -1
View File
@@ -32,7 +32,7 @@ class Course extends REST_Controller
{
$result = $this->CourseModel->getEnabledCourses();
if(is_object($result))
if(is_object($result) && $result->num_rows() > 0)
{
$payload = [
'success' => TRUE,
application/controllers/api/v1/studies/Plan.php
+5 -5
View File
@@ -28,17 +28,17 @@ class Plan extends REST_Controller
$this->PlanModel->setAddonID($this->_getAddonID());
}
public function getCurricula()
public function getPlan()
{
$courseOfStudiesID = $this->get('studiengang_kz');
$result = $this->PlanModel->getCurricula($courseOfStudiesID);
$result = $this->PlanModel->getPlan($courseOfStudiesID);
if(is_object($result))
if(is_object($result) && $result->num_rows() > 0)
{
$payload = [
'success' => TRUE,
'message' => 'Curricula found',
'message' => 'Plan found',
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
@@ -47,7 +47,7 @@ class Plan extends REST_Controller
{
$payload = [
'success' => FALSE,
'message' => 'Curricula not found'
'message' => 'Plan not found'
];
$httpstatus = REST_Controller::HTTP_OK;
}
application/models/studies/Plan_model.php
+3 -3
View File
@@ -3,7 +3,7 @@
class Plan_model extends DB_Model
{
//
protected $_curriculaQuery = "SELECT DISTINCT tbl_studienplan.*
protected $_planQuery = "SELECT DISTINCT tbl_studienplan.*
FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung USING(studienordnung_id)
WHERE tbl_studienordnung.studiengang_kz = ?";
@@ -18,7 +18,7 @@ class Plan_model extends DB_Model
/**
*
*/
public function getCurricula($courseOfStudiesID)
public function getPlan($courseOfStudiesID)
{
$result = NULL;
@@ -26,7 +26,7 @@ class Plan_model extends DB_Model
// All the code should be put inside this if statement
if($this->_checkPermissions())
{
$result = $this->db->query($this->_curriculaQuery, array($courseOfStudiesID));
$result = $this->db->query($this->_planQuery, array($courseOfStudiesID));
}
return $result;