Squadre doppie

app/Http/Controllers/TeamController.php

@@ -41,16 +41,19 @@ class TeamController extends Controller
             $aIds = array();
             foreach($teams as $t)
             {
-                $c = $t->getCalendar();
-                if (@$c->category_id == $category_id)
+                $cats = $t->getCalendar();
+                foreach($cats as $c)
                 {
-                    if ($group_id != '')
+                    if (@$c->category_id == $category_id)
                     {
-                        if (@$c->group_id == $group_id)
+                        if ($group_id != '')
+                        {
+                            if (@$c->group_id == $group_id)
+                                $aIds[] = $t->id;
+                        }
+                        else
                             $aIds[] = $t->id;
                     }
-                    else
-                        $aIds[] = $t->id;
                 }
                     
             }

app/Http/Controllers/UserController.php

@@ -27,7 +27,7 @@ class UserController extends Controller
     public function index()
     {
 
-        if (\Illuminate\Support\Facades\Auth::user()->level == 1 || \Illuminate\Support\Facades\Auth::user()->level == 2)
+        if (\Illuminate\Support\Facades\Auth::user()->level == 1)
             return redirect('/admin/dashboard');
 
         $users = User::orderBy('name', 'ASC')->get();

app/Team.php

@@ -19,9 +19,10 @@ class Team extends Model
 
     function getCalendar()
     {
-        $game = CalendarGame::where('home_team_id', '=', $this->id)->first();
-        $calendar = Calendar::where('id', '=', @$game->calendar_id)->first();
-        return $calendar;
+        $cal_ids = CalendarGame::where('home_team_id', '=', $this->id)->groupBy('calendar_id')->pluck('calendar_id');
+        $calendars = Calendar::whereIn('id', $cal_ids)->get();
+        //$calendar = Calendar::where('id', '=', @$game->calendar_id)->first();
+        return $calendars;
     }
 
     public function season()

resources/views/categories/_form.blade.php

@@ -34,6 +34,29 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-md-6">
+                <div class="form-group">
+                    <label for="url">Url sponsor:</label>
+                    <input type="url" name="url" id="url" class="form-control"
+                           value="{{ old('url', isset($category) ? $category->url : '') }}">
+                </div>
+            </div>
+            <div class="col-md-6">
+                <div class="form-group">
+                    <label for="image">Banner Pubblicitario:</label><br>
+                    <div class="custom-file-upload">
+                        <input type="file" name="image" id="image" class="form-control" accept="image/*">
+                    </div>
+                    @if (isset($category) && $category->image != '')
+                        <br>
+                        <div class="current-image">
+                            <small class="text-muted">Banner corrente: {{ $category->image }}</small>
+                        </div>
+                    @endif
+                </div>
+            </div>
+        </div>
         <input name="position" type="hidden" value="{{isset($category) ? $category->position : '0'}}">
     </div>
 

resources/views/layouts/admin.blade.php

@@ -142,7 +142,7 @@ desired effect
         <li><a href="/admin/breaking_news"><i class="fa fa-link"></i> <span>Gestione Breaking News</span></a></li>
         
         <li><a href="/admin/home"><i class="fa fa-link"></i> <span>Gestione primo piano</span></a></li>
-        @if(Auth::user()->level == 0)
+        @if(Auth::user()->level != 1)
           <li><a href="/admin/sections"><i class="fa fa-link"></i> <span>Gestione layout, news e banner</span></a></li>
         @endif
           

routes/web.php

@@ -3170,16 +3170,19 @@ Route::get('/{slug}/elenco', function ($slug) {
 
     }
 
-
     $page = Page::where('slug', '=', $slug)->first();
     if ($page != null)
     {
 
+        $advs = array();
+
+        $advs = $page->getAdvs();
+
         $section = $page;
 
         $news = News::where('page_id', '=', $page->id)->where('online', '=', true)->where('date', '<=', date("Y-m-d H:i:s"))->orderBy('date', 'DESC')->get();
 
-        return view('section', compact('home', 'news', 'sections', 'pages', 'section', 'sections_menu', 'regions', 'events', 'breaking_news', 'sections_menu', 'calendars', 'aHome'));
+        return view('section', compact('home', 'news', 'sections', 'pages', 'section', 'sections_menu', 'regions', 'events', 'breaking_news', 'sections_menu', 'calendars', 'aHome', 'advs'));
 
     }