- Renamed classes, methods and properties names in german

- 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
+3 -3
View File
@@ -2,7 +2,7 @@
class Nation_model extends DB_Model
{
protected $_federalStateQuery = "SELECT * FROM bis.tbl_bundesland";
protected $_bundeslandQuery = "SELECT * FROM bis.tbl_bundesland";
/**
*
@@ -55,7 +55,7 @@ class Nation_model extends DB_Model
/**
*
*/
public function getFederalState()
public function getBundesland()
{
$result = NULL;
@@ -63,7 +63,7 @@ class Nation_model extends DB_Model
// All the code should be put inside this if statement
if(isAllowed($this->getAddonID(), 'nation'))
{
$result = $this->db->query($this->_federalStateQuery);
$result = $this->db->query($this->_bundeslandQuery);
}
return $result;
@@ -1,9 +1,9 @@
<?php
class Course_model extends DB_Model
class Studiengang_model extends DB_Model
{
//
protected $_enabledCoursesQuery = "SELECT DISTINCT studiengang_kz,
protected $_allForBewerbungQuery = "SELECT DISTINCT studiengang_kz,
typ,
organisationseinheittyp_kurzbz,
studiengangbezeichnung,
@@ -27,7 +27,7 @@ class Course_model extends DB_Model
/**
*
*/
public function getEnabledCourses()
public function getAllForBewerbung()
{
$result = NULL;
@@ -35,7 +35,7 @@ class Course_model extends DB_Model
// All the code should be put inside this if statement
if(isAllowed($this->getAddonID(), 'course'))
{
$result = $this->db->query($this->_enabledCoursesQuery);
$result = $this->db->query($this->_allForBewerbungQuery);
}
return $result;
@@ -0,0 +1,34 @@
<?php
class Studienplan_model extends DB_Model
{
//
protected $_studienplaeneQuery = "SELECT DISTINCT tbl_studienplan.*
FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung USING(studienordnung_id)
WHERE tbl_studienordnung.studiengang_kz = ?";
/**
*
*/
public function __construct()
{
parent::__construct();
}
/**
*
*/
public function getStudienplaene($studiengang_kz)
{
$result = NULL;
// Checks if the operation is permitted by the API caller
// All the code should be put inside this if statement
if(isAllowed($this->getAddonID(), 'plan'))
{
$result = $this->db->query($this->_studienplaeneQuery, array($studiengang_kz));
}
return $result;
}
}
+3 -3
View File
@@ -327,13 +327,13 @@ class Person_model extends DB_Model
/**
*
*/
public function saveInterestedStudent($interestedStudent = NULL)
public function savePrestudent($interestedStudent = NULL)
{
// Checks if the operation is permitted by the API caller
// All the code should be put inside this if statement
if(isAllowed($this->getAddonID(), 'person'))
{
return $this->_saveInterestedStudent($interestedStudent);
return $this->_savePrestudent($interestedStudent);
}
}
@@ -342,7 +342,7 @@ class Person_model extends DB_Model
*
* @return bool true when everything goes right, otherwise false
*/
private function _saveInterestedStudent($interestedStudent = NULL)
private function _savePrestudent($interestedStudent = NULL)
{
if(!isset($interestedStudent))
{
-34
View File
@@ -1,34 +0,0 @@
<?php
class Plan_model extends DB_Model
{
//
protected $_planQuery = "SELECT DISTINCT tbl_studienplan.*
FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung USING(studienordnung_id)
WHERE tbl_studienordnung.studiengang_kz = ?";
/**
*
*/
public function __construct()
{
parent::__construct();
}
/**
*
*/
public function getPlan($courseOfStudiesID)
{
$result = NULL;
// Checks if the operation is permitted by the API caller
// All the code should be put inside this if statement
if(isAllowed($this->getAddonID(), 'plan'))
{
$result = $this->db->query($this->_planQuery, array($courseOfStudiesID));
}
return $result;
}
}