Fix

app/Http/Livewire/Bank.php

@@ -119,7 +119,7 @@ class Bank extends Component
         try{
             \App\Models\Bank::find($id)->delete();
             session()->flash('success',"Città eliminata");
-            //$this->emit('load-data-table');
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Card.php

@@ -144,6 +144,7 @@ class Card extends Component
         try{
             \App\Models\Card::find($id)->delete();
             session()->flash('success',"Tessera eliminata");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Category.php

@@ -118,6 +118,7 @@ class Category extends Component
         try{
             \App\Models\Category::find($id)->delete();
             session()->flash('success',"Categoria eliminata");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Causal.php

@@ -155,6 +155,7 @@ class Causal extends Component
         try{
             \App\Models\Causal::find($id)->delete();
             session()->flash('success',"Tessera eliminata");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Course.php

@@ -257,6 +257,7 @@ class Course extends Component
         try{
             \App\Models\Course::find($id)->delete();
             session()->flash('success',"Corso eliminato");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/CourseDuration.php

@@ -124,6 +124,7 @@ class CourseDuration extends Component
         try{
             \App\Models\CourseDuration::find($id)->delete();
             session()->flash('success',"Dato eliminato");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/CourseFrequency.php

@@ -118,6 +118,7 @@ class CourseFrequency extends Component
         try{
             \App\Models\CourseFrequency::find($id)->delete();
             session()->flash('success',"Dato eliminato");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/CourseLevel.php

@@ -118,6 +118,8 @@ class CourseLevel extends Component
         try{
             \App\Models\CourseLevel::find($id)->delete();
             session()->flash('success',"Dato eliminato");
+            return redirect(request()->header('Referer'));
+            //return redirect()->to(\Illuminate\Http\Request::url());
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/CourseType.php

@@ -122,6 +122,7 @@ class CourseType extends Component
         try{
             \App\Models\CourseType::find($id)->delete();
             session()->flash('success',"Dato eliminato");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Discipline.php

@@ -118,6 +118,7 @@ class Discipline extends Component
         try{
             \App\Models\discipline::find($id)->delete();
             session()->flash('success',"Disciplina eliminata");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Member.php

@@ -26,6 +26,8 @@ class Member extends Component
 
     public $type = 'dati';
 
+    public $selectedCourseMember = 0;
+
     protected $messages = [
         'birth_nation_id.required' => 'birth_nation_id',
         'birth_province_id.required' => 'birth_province_id',
@@ -1823,9 +1825,13 @@ class Member extends Component
         $this->suspendedMonths = array();
     }
 
-    public function setPayMonth($m, $months)
+    public function setPayMonth($m, $months, $selectedCourseMember)
     {
 
+        if ($this->selectedCourseMember != $selectedCourseMember)
+            $this->payMonths = array();
+        $this->selectedCourseMember = $selectedCourseMember;
+
         if (in_array($m, $this->payMonths))
         {
             $i = array_search($m, $this->payMonths);
@@ -1857,8 +1863,13 @@ class Member extends Component
 
     }
 
-    public function setCreateSubscription($subscribed)
+    public function setCreateSubscription($subscribed, $selectedCourseMember)
     {
+
+        if ($this->selectedCourseMember != $selectedCourseMember)
+            $this->payMonths = array();
+        $this->selectedCourseMember = $selectedCourseMember;
+
         if (!$subscribed)
             $this->createSubscription = !$this->createSubscription;
     }
@@ -1876,7 +1887,7 @@ class Member extends Component
         }
     }
 
-    public function getMonthStatus($m, $months)
+    public function getMonthStatus($m, $months, $selectedCourseMember)
     {
 
         $class = "grey";
@@ -1887,7 +1898,7 @@ class Member extends Component
             {
                 if ($mm->status == "")
                 {
-                    if (in_array($m, $this->payMonths))
+                    if (in_array($m, $this->payMonths) && $this->selectedCourseMember == $selectedCourseMember)
                         $class = "blue";
                     else
                         $class = "orange";
@@ -1898,7 +1909,7 @@ class Member extends Component
                 }
                 if ($mm->status == "2")
                 {
-                    if (in_array($m, $this->suspendedMonths))
+                    if (in_array($m, $this->suspendedMonths) && $this->selectedCourseMember == $selectedCourseMember)
                         $class = "blue";
                     else
                         $class = "yellow";
@@ -1909,12 +1920,12 @@ class Member extends Component
         return $class;
     }
 
-    public function getSubscriptionStatus($subscribed)
+    public function getSubscriptionStatus($subscribed, $selectedCourseMember)
     {
 
         $class = "grey";
 
-        if ($this->createSubscription)
+        if ($this->createSubscription && $this->selectedCourseMember == $selectedCourseMember)
             $class = "blue";
         else
             $class = "orange";

app/Http/Livewire/PaymentMethod.php

@@ -144,6 +144,7 @@ class PaymentMethod extends Component
         try{
             \App\Models\PaymentMethod::find($id)->delete();
             session()->flash('success',"Metodo pagamento eliminato");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Supplier.php

@@ -223,6 +223,7 @@ class Supplier extends Component
         try{
             \App\Models\Supplier::find($id)->delete();
             session()->flash('success',"Fornitore eliminato");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

app/Http/Livewire/Vat.php

@@ -123,6 +123,7 @@ class Vat extends Component
         try{
             \App\Models\Vat::find($id)->delete();
             session()->flash('success',"IVA eliminata");
+            return redirect(request()->header('Referer'));
         }catch(\Exception $e){
             session()->flash('error','Errore (' . $ex->getMessage() . ')');
         }

public/css/style.css

@@ -16513,7 +16513,7 @@ a:hover, a:visited {
   background-color: #D9E0E3;
 }
 #checkall-target a.yellow {
-  border: 3px solid #FFB624;
+  border: 3px solid #0C6197;
 }
 #checkall-target a.orange {
   border: 3px solid #F28322;

resources/views/livewire/category.blade.php

@@ -1,5 +1,7 @@
 <div class="col card--ui" id="card--dashboard">
 
+    <a class="btn--ui lightGrey" href="/settings?type=anagrafica"><i class="fa-solid fa-arrow-left"></i></a><br><br>
+
     <header id="title--section"  class="d-flex align-items-center justify-content-between">
         <div class="title--section_name d-flex align-items-center justify-content-between" style="display:none !important" >
             <i class="ico--ui title_section utenti me-2"></i>
@@ -12,7 +14,7 @@
                     <a href="#" wire:click="add()" style="color:white">AGGIUNGI</a>
                 </div>
             </div>
-            <a class="btn--ui lightGrey" href="/settings?type=anagrafica"><i class="fa-solid fa-arrow-left"></i></a><br>
+            
         @endif
 
     </header>

resources/views/livewire/causal.blade.php

@@ -1,5 +1,7 @@
 <div class="col card--ui" id="card--dashboard">
 
+    <a class="btn--ui lightGrey" href="/settings?type=contabilita"><i class="fa-solid fa-arrow-left"></i></a><br><br>
+
     <header id="title--section" class="d-flex align-items-center justify-content-between">
         <div class="title--section_name d-flex align-items-center justify-content-between"  style="display:none !important" >
             <i class="ico--ui title_section utenti me-2"></i>
@@ -12,7 +14,7 @@
                     <a href="#" wire:click="add()" style="color:white">AGGIUNGI</a>
                 </div>
             </div>
-            <a class="btn--ui lightGrey" href="/settings?type=contabilita"><i class="fa-solid fa-arrow-left"></i></a><br>
+            
         @endif
 
     </header>

resources/views/livewire/course_list.blade.php

@@ -94,7 +94,7 @@
 
     <div class="row text-right">
         <div class="col-md-12" style="text-align:right">
-            <button style="display:none; width:200px;" class="btn--ui btNewPayment" onclick="newPayment()">NUOVO PAGAMENTO</button>
+            <button style="display:none; width:200px;" class="btn--ui btNewPayment" onclick="newPayment()">NUOVA ENTRATA</button>
         </div>
     </div>
 

resources/views/livewire/member.blade.php

@@ -1149,19 +1149,19 @@
                                                         @if(in_array($member_course->id, $showCourse))
                                                             <tr>
                                                                 <td colspan="5">
-                                                                    <a class="{{$this->getSubscriptionStatus($member_course->subscribed)}}" wire:click="setCreateSubscription({{$member_course->subscribed}})" style="float:none; width:150px;">Iscrizione</a><br>
-                                                                    <a class="{{$this->getMonthStatus(9, $member_course->months)}}" wire:click="setPayMonth(9, '{{ $member_course->months }}')" {{$this->getMonthStatus(9, $member_course->months) == 'blue' || $this->getMonthStatus(9, $member_course->months) == 'orange' || $this->getMonthStatus(9, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Set</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(10, $member_course->months)}}" wire:click="setPayMonth(10, '{{ $member_course->months }}')" {{$this->getMonthStatus(10, $member_course->months) == 'blue' || $this->getMonthStatus(10, $member_course->months) == 'orange' || $this->getMonthStatus(10, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Ott</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(11, $member_course->months)}}" wire:click="setPayMonth(11, '{{ $member_course->months }}')" {{$this->getMonthStatus(11, $member_course->months) == 'blue' || $this->getMonthStatus(11, $member_course->months) == 'orange' || $this->getMonthStatus(11, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Nov</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(12, $member_course->months)}}" wire:click="setPayMonth(12, '{{ $member_course->months }}')" {{$this->getMonthStatus(12, $member_course->months) == 'blue' || $this->getMonthStatus(12, $member_course->months) == 'orange' || $this->getMonthStatus(12, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Dic</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(1, $member_course->months)}}" wire:click="setPayMonth(1, '{{ $member_course->months }}')" {{$this->getMonthStatus(1, $member_course->months) == 'blue' || $this->getMonthStatus(1, $member_course->months) == 'orange' || $this->getMonthStatus(1, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Gen</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(2, $member_course->months)}}" wire:click="setPayMonth(2, '{{ $member_course->months }}')" {{$this->getMonthStatus(2, $member_course->months) == 'blue' || $this->getMonthStatus(2, $member_course->months) == 'orange' || $this->getMonthStatus(2, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Feb</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(3, $member_course->months)}}" wire:click="setPayMonth(3, '{{ $member_course->months }}')" {{$this->getMonthStatus(3, $member_course->months) == 'blue' || $this->getMonthStatus(3, $member_course->months) == 'orange' || $this->getMonthStatus(3, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Mar</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(4, $member_course->months)}}" wire:click="setPayMonth(4, '{{ $member_course->months }}')" {{$this->getMonthStatus(4, $member_course->months) == 'blue' || $this->getMonthStatus(4, $member_course->months) == 'orange' || $this->getMonthStatus(4, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Apr</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(5, $member_course->months)}}" wire:click="setPayMonth(5, '{{ $member_course->months }}')" {{$this->getMonthStatus(5, $member_course->months) == 'blue' || $this->getMonthStatus(5, $member_course->months) == 'orange' || $this->getMonthStatus(5, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Mag</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(6, $member_course->months)}}" wire:click="setPayMonth(6, '{{ $member_course->months }}')" {{$this->getMonthStatus(6, $member_course->months) == 'blue' || $this->getMonthStatus(6, $member_course->months) == 'orange' || $this->getMonthStatus(6, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Giu</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(7, $member_course->months)}}" wire:click="setPayMonth(7, '{{ $member_course->months }}')" {{$this->getMonthStatus(7, $member_course->months) == 'blue' || $this->getMonthStatus(7, $member_course->months) == 'orange' || $this->getMonthStatus(7, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Lug</a>&nbsp;
-                                                                    <a class="{{$this->getMonthStatus(8, $member_course->months)}}" wire:click="setPayMonth(8, '{{ $member_course->months }}')" {{$this->getMonthStatus(8, $member_course->months) == 'blue' || $this->getMonthStatus(8, $member_course->months) == 'orange' || $this->getMonthStatus(8, $member_course->months) == 'yellow' ? 'style=cursor:pointer' : ''}}>Ago</a>&nbsp;
+                                                                    <a class="{{$this->getSubscriptionStatus($member_course->subscribed, $member_course->id)}}" wire:click="setCreateSubscription({{$member_course->subscribed}}, {{$member_course->id}})" style="float:none; width:150px;{{$this->getSubscriptionStatus($member_course->subscribed,$member_course->id) == 'blue' || $this->getSubscriptionStatus($member_course->subscribed,$member_course->id) == 'orange' || $this->getSubscriptionStatus($member_course->subscribed,$member_course->id) == 'yellow' ? 'cursor:pointer' : ''}}">Iscrizione</a><br>
+                                                                    <a class="{{$this->getMonthStatus(9, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(9, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(9, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(9, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(9, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Set</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(10, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(10, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(10, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(10, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(10, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Ott</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(11, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(11, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(11, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(11, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(11, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Nov</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(12, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(12, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(12, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(12, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(12, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Dic</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(1, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(1, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(1, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(1, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(1, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Gen</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(2, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(2, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(2, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(2, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(2, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Feb</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(3, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(3, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(3, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(3, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(3, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Mar</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(4, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(4, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(4, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(4, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(4, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Apr</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(5, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(5, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(5, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(5, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(5, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Mag</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(6, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(6, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(6, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(6, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(6, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Giu</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(7, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(7, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(7, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(7, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(7, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Lug</a>&nbsp;
+                                                                    <a class="{{$this->getMonthStatus(8, $member_course->months, $member_course->id)}}" wire:click="setPayMonth(8, '{{ $member_course->months }}', {{$member_course->id}})" {{$this->getMonthStatus(8, $member_course->months, $member_course->id) == 'blue' || $this->getMonthStatus(8, $member_course->months, $member_course->id) == 'orange' || $this->getMonthStatus(8, $member_course->months, $member_course->id) == 'yellow' ? 'style=cursor:pointer' : ''}}>Ago</a>&nbsp;
                                                                 </td>
                                                                 <td>
                                                                     <button type="button" class="btn" wire:click="editCourse({{ $member_course->id }})" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Modifica"><i class="fa-regular fa-pen-to-square"></i></button>&nbsp;
@@ -1170,13 +1170,15 @@
                                                             </tr>
                                                             <tr>
                                                                 <td colspan="6">
-                                                                    @if(sizeof($payMonths) > 0 || $createSubscription)
-                                                                        <button class="btn--ui primary" style="color:white" wire:click="newPayment({{$member_course}})">Nuova entrata</button>&nbsp;
-                                                                        <button class="btn--ui primary" style="color:white" wire:click="block({{$member_course}})">Sospendi</button>
+                                                                    @if($selectedCourseMember == $member_course->id)
+                                                                        @if(sizeof($payMonths) > 0 || $createSubscription)
+                                                                            <button class="btn--ui primary" style="color:white" wire:click="newPayment({{$member_course}})">Nuova entrata</button>&nbsp;
+                                                                            <button class="btn--ui primary" style="color:white" wire:click="block({{$member_course}})">Sospendi</button>
+                                                                        @endif
+                                                                        @if(sizeof($suspendedMonths) > 0)
+                                                                            <button class="btn--ui primary" style="color:white" wire:click="reactivate({{$member_course}})">Riattiva</button>&nbsp;
+                                                                        @endif<br>
                                                                     @endif
-                                                                    @if(sizeof($suspendedMonths) > 0)
-                                                                        <button class="btn--ui primary" style="color:white" wire:click="reactivate({{$member_course}})">Riattiva</button>&nbsp;
-                                                                    @endif<br>
                                                                     @if($member_course->notes != '')
                                                                         <br><b>Note</b><br>
                                                                         {{$member_course->notes}}

resources/views/livewire/records_in_out.blade.php

@@ -91,19 +91,27 @@
                             </tr>
                         </thead>
                         <tbody id="checkall-target">
-
+                            @php
+                            $aScritto = array();
+                            @endphp
                             @foreach($rows_in as $in)
                                 @if($filterCausalsIn == null || (sizeof($filterCausalsIn) == 0 || in_array($in["id"], $filterCausalsIn) || in_array($in["parent_id"], $filterCausalsIn) || in_array($in["first_parent_id"], $filterCausalsIn)))
-                                    @if($filterCausalsIn != null && !in_array($in["first_parent_id"], $filterCausalsIn))
+                                    @if($filterCausalsIn != null && !in_array($in["first_parent_id"], $filterCausalsIn) && !in_array($in["first_parent_id"] . "_" . $in["parent_id"], $aScritto))
+                                        @php
+                                        $aScritto[] = $in["first_parent_id"] . "_" . $in["parent_id"];
+                                        @endphp
                                         <tr>
                                             <td colspan="20">
-                                                {{$in["first_parent_name"]}} - {{$in["parent_name"]}}
+                                                <b>{{$in["first_parent_name"]}} - {{$in["parent_name"]}}</b>
                                             </td>
                                         </tr>
                                     @endif
                                     <tr data-id="{{$in["id"]}}" data-parent="{{$filterCausalsIn == null || in_array($in["parent_id"], $filterCausalsIn) ? $in["parent_id"] : ''}}">
                                         <td>
                                             <span class="spaces">{!!str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $in["level"])!!}</span>
+                                            @if($filterCausalsIn != null && !in_array($in["first_parent_id"], $filterCausalsIn))
+                                                <span style="padding-left:20px">{!!str_repeat(" ", 5)!!}</span>
+                                            @endif
                                             {{$in["name"]}}
                                         </td>
                                         @foreach($columns as $column)
@@ -198,9 +206,21 @@
                             </tr>
                         </thead>
                         <tbody id="checkall-target">
-
+                            @php
+                            $aScrittoX = array();
+                            @endphp
                             @foreach($rows_out as $out)
                                 @if($filterCausalsOut == null || (sizeof($filterCausalsOut) == 0 || in_array($out["id"], $filterCausalsOut) || in_array($out["parent_id"], $filterCausalsOut) || in_array($out["first_parent_id"], $filterCausalsOut)))
+                                    @if($filterCausalsOut != null && !in_array($out["first_parent_id"], $filterCausalsOut) && !in_array($out["first_parent_id"] . "_" . $out["parent_id"], $aScrittoX))
+                                        @php
+                                        $aScrittoX[] = $out["first_parent_id"] . "_" . $out["parent_id"];
+                                        @endphp
+                                        <tr>
+                                            <td colspan="20">
+                                                <b>{{$out["first_parent_name"]}} - {{$out["parent_name"]}}</b>
+                                            </td>
+                                        </tr>
+                                    @endif
                                     <tr data-id="{{$out["id"] + 1000}}" data-parent="{{$out["parent_id"] != null ? ($out["parent_id"] + 1000) : 0}}">
                                         <td>{!!str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $out["level"])!!}{{$out["name"]}}</td>
                                         @foreach($columns as $column)