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

JSON output improved

Browse Source
This commit is contained in:
paolo
2016-04-22 11:08:38 +02:00
parent 4e02a1105b
commit 346b8c82e1
6 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/Nation.php
+4 -4
View File
@@ -35,12 +35,12 @@ class Nation extends REST_Controller
$result = $this->NationModel->getAll($notLocked, $orderEnglish);
if(!is_null($result) && $result->num_rows() > 0)
if(is_object($result))
{
$payload = [
'success' => TRUE,
'message' => 'Nation found',
'data' => $result->result()[0]
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
}
@@ -60,12 +60,12 @@ class Nation extends REST_Controller
{
$result = $this->NationModel->getFederalState();
if(!is_null($result) && $result->num_rows() > 0)
if(is_object($result))
{
$payload = [
'success' => TRUE,
'message' => 'Bundesland found',
'data' => $result->result_array()
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
}
application/controllers/api/v1/person/Person.php
+33 -45
View File
@@ -39,26 +39,14 @@ class Person extends REST_Controller
$result = $this->PersonModel->getPerson($personID, $code, $email);
if(!is_null($result) && $result->num_rows() > 0)
if(is_object($result))
{
if($result->num_rows() > 1)
{
$payload = [
'success' => TRUE,
'message' => 'People found',
'data' => $result->result()[0]
];
$httpstatus = REST_Controller::HTTP_OK;
}
else if($result->num_rows() == 1)
{
$payload = [
'success' => TRUE,
'message' => 'Person found',
'data' => $result->result()[0]
];
$httpstatus = REST_Controller::HTTP_OK;
}
$payload = [
'success' => TRUE,
'message' => 'People found',
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
}
else
{
@@ -98,6 +86,32 @@ class Person extends REST_Controller
}
$this->response($payload, $httpstatus);
}
/**
*
*/
public function postInterestedStudent()
{
$result = $this->PersonModel->saveInterestedStudent($this->post());
if($result === TRUE)
{
$httpstatus = REST_Controller::HTTP_OK;
$payload = [
'success' => true,
'message' => 'Interested student saved.'
];
}
else
{
$payload = [
'success' => false,
'message' => 'Could not save interested student.'
];
$httpstatus = REST_Controller::HTTP_OK;
}
$this->response($payload, $httpstatus);
}
/**
* @return void
@@ -140,30 +154,4 @@ class Person extends REST_Controller
$this->response($payload, $httpstatus);
}
/**
*
*/
public function postInterestedStudent()
{
$result = $this->PersonModel->saveInterestedStudent($this->post());
if($result === TRUE)
{
$httpstatus = REST_Controller::HTTP_OK;
$payload = [
'success' => true,
'message' => 'Interested student saved.'
];
}
else
{
$payload = [
'success' => false,
'message' => 'Could not save interested student.'
];
$httpstatus = REST_Controller::HTTP_OK;
}
$this->response($payload, $httpstatus);
}
}
application/controllers/api/v1/studies/Course.php
+3 -3
View File
@@ -32,12 +32,12 @@ class Course extends REST_Controller
{
$result = $this->CourseModel->getEnabledCourses();
if(!is_null($result) && $result->num_rows() > 0)
if(is_object($result))
{
$payload = [
'success' => TRUE,
'message' => 'Courses found',
'data' => $result->result()[0]
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
}
@@ -45,7 +45,7 @@ class Course extends REST_Controller
{
$payload = [
'success' => FALSE,
'message' => 'Person not found'
'message' => 'No courses found'
];
$httpstatus = REST_Controller::HTTP_OK;
}
application/controllers/api/v1/studies/Plan.php
+2 -2
View File
@@ -34,12 +34,12 @@ class Plan extends REST_Controller
$result = $this->PlanModel->getCurricula($courseOfStudiesID);
if(!is_null($result) && $result->num_rows() > 0)
if(is_object($result))
{
$payload = [
'success' => TRUE,
'message' => 'Curricula found',
'data' => $result->result()[0]
'data' => $result->result()
];
$httpstatus = REST_Controller::HTTP_OK;
}
application/models/Nation_model.php
+1 -1
View File
@@ -38,7 +38,7 @@ class Nation_model extends DB_Model
if($notLocked)
{
$qry .= " WHERE sperre is null";
$qry .= " WHERE sperre IS NULL";
}
if(!$orderEnglish)
{
application/models/person/Person_model.php
+28 -14
View File
@@ -56,11 +56,11 @@ class Person_model extends DB_Model
// All the code should be put inside this if statement
if($this->_checkPermissions())
{
if((!is_null($code)) && (!is_null($email)))
if((isset($code)) && (isset($email)))
{
$result = $this->_getPersonByCodeAndEmail($code, $email);
}
elseif(!is_null($code))
elseif(isset($code))
{
$result = $this->_getPersonByCode($code);
}
@@ -77,11 +77,11 @@ class Person_model extends DB_Model
* @param int $personID Person ID
* @return object
*/
private function _getPersonByID($personID)
private function _getPersonByID($personID = NULL)
{
$result = NULL;
if(!is_null($personID))
if(isset($personID))
{
$result = $this->db->query($this->_loadQuery, array($personID));
}
@@ -92,24 +92,38 @@ class Person_model extends DB_Model
/**
*
*/
private function _getPersonByCodeAndEmail($code, $email)
private function _getPersonByCodeAndEmail($code = NULL, $email = NULL)
{
$this->db->select("*")
->from('public.tbl_person p')
->join("public.tbl_kontakt k", "k.person_id=p.person_id")
->where("p.zugangscode", $code)
->where("k.kontakt", $email);
$result = NULL;
$query = "SELECT *
FROM public.tbl_person p JOIN public.tbl_kontakt k USING (person_id)
WHERE p.zugangscode = ?
AND k.kontakt = ?";
if((isset($code)) && (isset($email)))
{
$result = $this->db->query($query, array($code, $email));
}
return $this->db->get()->result_object();
return $result;
}
/**
*
*/
private function _getPersonByCode($code)
private function _getPersonByCode($code = NULL)
{
$query = $this->db->get_where('public.tbl_person', array('zugangscode' => $code));
return $query->result_object();
$result = NULL;
$query = "SELECT *
FROM public.tbl_person p
WHERE p.zugangscode = ?";
if(isset($code))
{
$result = $this->db->query($query, array($code));
}
return $result;
}
/**