ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

home page mobile changed

This commit is contained in:
merdan 2020-03-28 15:40:03 +05:00
parent dcb0c75d45
commit e9cbf8cd4a
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/PublicController.php
View File

@ -51,26 +51,41 @@ class PublicController extends Controller
public function showCategoryEvents($cat_id){
[$order, $data] = $this->sorts_filters();
$category = Category::select('id','title_tk','title_ru')
$category = Category::select('id','title_tk','title_ru','events_limit')
->with(['children' => function($query) use($data,$order){
$query->whereHas('cat_events',
function ($query) use($data){
$query->onLive($data['start'], $data['end']);
})
->with(['cat_events' => function($q) use($data,$order){
$q->onLive($data['start'], $data['end'],8)
->orderBy($order['field'],$order['order']);
}]);
});
// ->with(['cat_events' => function($q) use($data,$order){
// $q->onLive($data['start'], $data['end'])
// ->orderBy($order['field'],$order['order']);
// }]);
// $query->withLiveEvents($order, $data['start'], $data['end']);
}])
->findOrFail($cat_id);
dd($category);
$sub_cats = $category->children;
$sub_cats_events = $sub_cats->pop()
->cat_events()
->onLive($data['start'],$data['end'])
->orderBy($order['field'],$order['order'])
->take($category->events_limit);
foreach ($sub_cats as $sub_cat){
$events = $sub_cat->cat_events()
->onLive($data['start'],$data['end'])
->orderBy($order['field'],$order['order'])
->take($category->events_limit);
$sub_cats_events = $sub_cats_events->unionAll($events);
}
dd($sub_cats_events->get());
$data['category'] = $category;
$sub_cats = $category->children->first();
$data['sub_cats'] = $category->children()
->withLiveEvents($order, $data['start'], $data['end'], $category->events_limit)//wiered
->whereHas('cat_events',

4
app/Models/Event.php
View File

@ -490,7 +490,7 @@ ICSTemplate;
return (is_null($this->access_codes()->where('id', $accessCodeId)->first()) === false);
}
public function scopeOnLive($query, $start_date = null, $end_date = null,$limit = false){
public function scopeOnLive($query, $start_date = null, $end_date = null){
//if date is null carbon creates now date instance
//todo what if only end date is null??
if(!empty($start_date) && !empty($end_date))
@ -500,8 +500,6 @@ ICSTemplate;
}
else
$query->where('end_date','>',Carbon::now(config('app.timezone')));
if($limit)
$query->take($limit);
return $query->where('is_live',1)
->withCount(['images as image_url' => function($q){