1
0

2 Коммиты c68839d2b8 ... a1caa0bea5

Автор SHA1 Сообщение Дата
  Luca Parisio a1caa0bea5 Fix menù 1 месяц назад
  Luca Parisio bf0ee8f983 Fix menù 1 месяц назад

+ 6 - 0
app/Http/Livewire/Calendar.php

@@ -3,6 +3,7 @@
 namespace App\Http\Livewire;
 
 use Livewire\Component;
+use App\Http\Middleware\TenantMiddleware;
 
 class Calendar extends Component
 {
@@ -40,6 +41,11 @@ class Calendar extends Component
 
     public $lastDate = null;
 
+    public function boot()
+    {
+        app(TenantMiddleware::class)->setupTenantConnection();
+    }
+
     public function mount()
     {
         $this->names = \App\Models\Calendar::orderBy('name')->groupBy('name')->pluck('name')->toArray();

+ 6 - 0
app/Http/Livewire/PresenceReport.php

@@ -3,6 +3,7 @@
 namespace App\Http\Livewire;
 
 use Livewire\Component;
+use App\Http\Middleware\TenantMiddleware;
 
 class PresenceReport extends Component
 {
@@ -42,6 +43,11 @@ class PresenceReport extends Component
     public $court_name = '';
     public $instructor_name = '';
 
+    public function boot()
+    {
+        app(TenantMiddleware::class)->setupTenantConnection();
+    }
+
     public function mount()
     {
         $this->courts = \App\Models\Court::select('*')->where('enabled', true)->get();

+ 16 - 2
resources/views/layouts/app.blade.php

@@ -186,6 +186,10 @@
                 print "Iscritti corsi";
             if (Request::is('course_list'))
                 print "Pagamento corsi";
+            if (Request::is('presence_reports'))
+                print "Report presenze";                
+            if (Request::is('calendar'))
+                print "Calendario";                
             if (Request::is('reminders'))
                 print "Scadenze";
             if (Request::is('settings'))
@@ -352,7 +356,7 @@
                     </div>
                     <div class="accordion-item">
                         <h2 class="accordion-header linkMenu" id="headingThree">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="{{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') ? 'true' : 'false'}}" aria-controls="collapseThree">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="{{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') || Request::is('presence_reports') || Request::is('calendar') ? 'true' : 'false'}}" aria-controls="collapseThree">
                                 <i class="fas fa-calendar"></i>
                                 <span>Corsi</span>
                             </button>
@@ -362,7 +366,7 @@
                         $iscritti_types[] = array('name' => 'Singoli', 'type' => 'standard');
                         $iscritti_types[] = array('name' => 'Personalizzati', 'type' => 'custom');   
                         @endphp
-                        <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') || Request::is('rates') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
+                        <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') || Request::is('rates') || Request::is('presence_reports') || Request::is('calendar') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
                             <div class="accordion-body">
                                 <ul class="nav nav-pills flex-column align-items-center align-items-sm-start w-100" id="menu-contabilita" style="margin-top:0px;">
                                     {{-- <li class="nav-item {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('course_member') ? "nav-item-active" : ""}}">
@@ -401,6 +405,16 @@
                                             </a>
                                         </li>
                                     @endif
+                                    <li class="nav-item {{Request::is('calendar') ? "nav-item-active" : ""}}">
+                                        <a href="/calendar" class="nav-link d-flex align-items-center linkMenu">
+                                            <span class="ms-3 d-md-inline">Calendario</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item {{Request::is('presence_reports') ? "nav-item-active" : ""}}">
+                                        <a href="/presence_reports" class="nav-link d-flex align-items-center linkMenu">
+                                            <span class="ms-3 d-md-inline">Presenze</span>
+                                        </a>
+                                    </li>
                                 </ul>
                             </div>
                         </div>