Redesign + Fixes
This commit is contained in:
parent
7718ed6c32
commit
7fe8056e35
67 changed files with 1898 additions and 2799 deletions
|
@ -10,9 +10,9 @@ class Status {
|
|||
if(self::$data !== null)
|
||||
return self::$data;
|
||||
|
||||
$regions = DB::table('region')->get()->all();
|
||||
$attractions = DB::table('attraction')->select(['id', 'name', 'status', 'region_id'])->where('status', '!=', 'GLOBAL')->get()->all();
|
||||
$statuses = DB::table('status')->get()->all(); //TODO
|
||||
$regions = DB::table('regions')->get()->all();
|
||||
$attractions = DB::table('attractions')->get()->all();
|
||||
$statuses = DB::table('states')->get()->all();
|
||||
|
||||
$data = [];
|
||||
foreach($regions as $region) {
|
||||
|
@ -22,11 +22,14 @@ class Status {
|
|||
|
||||
$status = [];
|
||||
foreach ($statuses as $stat)
|
||||
$status[$stat->statusId] = $stat->statusName;
|
||||
$status[$stat->id] = (object) [
|
||||
"name" => $stat->name,
|
||||
"color" => $stat->color,
|
||||
];
|
||||
|
||||
foreach ($attractions as $attraction) {
|
||||
$region_id = $attraction->region_id;
|
||||
$attraction->status = $status[$attraction->status];
|
||||
$attraction->status = $status[$attraction->status_id];
|
||||
if(array_key_exists($region_id, $data))
|
||||
array_push($data[$region_id]->attractions, $attraction);
|
||||
}
|
||||
|
|
Reference in a new issue