blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-18 15:32:17 +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:
Andreas Moik
2016-11-28 09:47:06 +01:00
parent d62a0b304c 0a19cbfba4
commit 401aab6baa
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/routes.php
+6 -6
View File
@@ -54,9 +54,9 @@ $route['404_override'] = '';
$route['translate_uri_dashes'] = FALSE;
// Class name conflicts
$route['api/v1/organisation/studiengang/(:any)'] = 'api/v1/organisation/studiengang2/$1';
$route['api/v1/ressource/betriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
$route['api/v1/organisation/fachbereich/(:any)'] = 'api/v1/organisation/fachbereich2/$1';
$route['api/v1/organisation/geschaeftsjahr/(:any)'] = 'api/v1/organisation/geschaeftsjahr2/$1';
$route['api/v1/organisation/organisationseinheit/(:any)'] = 'api/v1/organisation/organisationseinheit2/$1';
$route['api/v1/system/sprache/(:any)'] = 'api/v1/system/sprache2/$1';
$route['api/v1/organisation/[S|s]tudiengang/(:any)'] = 'api/v1/organisation/studiengang2/$1';
$route['api/v1/organisation/[F|f]achbereich/(:any)'] = 'api/v1/organisation/fachbereich2/$1';
$route['api/v1/organisation/[G|g]eschaeftsjahr/(:any)'] = 'api/v1/organisation/geschaeftsjahr2/$1';
$route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisation/organisationseinheit2/$1';
$route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
$route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
application/core/DB_Model.php
+23 -14
View File
@@ -266,13 +266,12 @@ class DB_Model extends FHC_Model
// Execute the query
$resultDB = $this->db->get_where($this->dbTable, $where);
// If everything went ok...
if ($resultDB)
{
// Converts the object that contains data, from the returned CI's object to an array
// with the postgresql array and boolean types converterd
$resultArray = $this->toPhp($resultDB);
$resultArray = $this->toPhp($resultDB);//var_dump($resultArray);
// Array that will contain all the mainTable records, and to each record the linked data
// of a side table
$returnArray = array();
@@ -286,15 +285,18 @@ class DB_Model extends FHC_Model
// Temporary array that will contain a representation of every records returned from DB
// every element is an associative array that contains all the data of each table
$objTmpArray = array();
$tableColumnsCountArrayOffset = 0; // Columns offset
// Gets all the data of a single table from the returned record, and creates an object filled with these data
for ($f = 0; $f < count($tableColumnsCountArray); $f++)
{
$objTmpArray[$f] = new stdClass(); // Object that will represent a data set of a table
foreach (array_slice($objectVars, $f == 0 ? 0 : $tableColumnsCountArray[$f - 1], $tableColumnsCountArray[$f]) as $key => $value)
foreach (array_slice($objectVars, $tableColumnsCountArrayOffset, $tableColumnsCountArray[$f]) as $key => $value)
{
$objTmpArray[$f]->{str_replace($tables[$f] . '_', '', $key)} = $value;
}
$tableColumnsCountArrayOffset += $tableColumnsCountArray[$f]; // Increasing the offset
}
// Object that represents data of the main table
@@ -304,23 +306,30 @@ class DB_Model extends FHC_Model
{
// Object that represents data of the side table
$sideTableObj = $objTmpArray[$t];
$sideTableProperty = $tables[$t];
if (is_array($sideTablesAliases))
{
$sideTableProperty = $sideTablesAliases[$t -1];
$sideTableProperty = $sideTablesAliases[$t - 1];
}
if (($k = $this->findMainTable($mainTableObj, $returnArray)) === false)
// If the side table has data. If it was used a left join all the properties could be null
if (!empty(array_filter(get_object_vars($sideTableObj))))
{
$mainTableObj->{$sideTableProperty} = array($sideTableObj);
$returnArray[$returnArrayCounter++] = $mainTableObj;
}
else
{
if (array_search($sideTableObj, $returnArray[$k]->{$sideTableProperty}) === false)
if (($k = $this->findMainTable($mainTableObj, $returnArray)) === false)
{
array_push($returnArray[$k]->{$sideTableProperty}, $sideTableObj);
$mainTableObj->{$sideTableProperty} = array($sideTableObj);
$returnArray[$returnArrayCounter++] = $mainTableObj;
}
else
{
if (!isset($returnArray[$k]->{$sideTableProperty}))
{
$returnArray[$k]->{$sideTableProperty} = array($sideTableObj);
}
else if (array_search($sideTableObj, $returnArray[$k]->{$sideTableProperty}) === false)
{
array_push($returnArray[$k]->{$sideTableProperty}, $sideTableObj);
}
}
}
}
application/models/organisation/Studiengang_model.php
+6 -2
View File
@@ -141,6 +141,8 @@ class Studiengang_model extends DB_Model
{
// Join table public.tbl_studiengang with table lehre.tbl_studienordnung on column studiengang_kz
$this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz');
// Join table lehre.tbl_studienordnung with table lehre.tbl_akadgrad on column akadgrad_id
$this->addJoin('lehre.tbl_akadgrad', 'akadgrad_id', 'LEFT');
// Then join with table lehre.tbl_studienplan on column studienordnung_id
$this->addJoin('lehre.tbl_studienplan', 'studienordnung_id');
// Then join with table lehre.tbl_studienplan_semester on column studienplan_id
@@ -158,7 +160,8 @@ class Studiengang_model extends DB_Model
$result = $this->loadTree(
'tbl_studiengang',
array(
'tbl_studienplan'
'tbl_studienplan',
'tbl_akadgrad'
),
'public.tbl_studiengang.aktiv = TRUE
AND public.tbl_studiengang.onlinebewerbung = TRUE
@@ -168,7 +171,8 @@ class Studiengang_model extends DB_Model
AND lehre.tbl_studienplan.aktiv = TRUE'
,
array(
'studienplaene'
'studienplaene',
'akadgrad'
)
);