Просмотр исходного кода

modificati tasti visualizza/nascondi causali + selezione causali nel sito filtrati per "hidden"

ferrari 3 месяцев назад
Родитель
Сommit
4a07a11779

+ 8 - 0
app/Http/Livewire/Causals.php

@@ -19,6 +19,8 @@ class Causals extends Component
     public $emit = 'setCausal';
     public $idx = -1;
     public $causal_id = null;
+    public $show_hidden = true;
+
     public function boot()
     {
         app(TenantMiddleware::class)->setupTenantConnection();
@@ -78,6 +80,12 @@ class Causals extends Component
             return $query;
         };
 
+        if ($this->show_hidden == false) {
+            $visibilityFilter = function($query) {
+                return $query->where('hidden', false);
+            };
+        }
+
         if ($this->level_1_id > 0) {
             $this->level_2 = \App\Models\Causal::where('parent_id', $this->level_1_id)
                 ->where('type', $this->type)

+ 8 - 8
resources/views/livewire/causal.blade.php

@@ -2,9 +2,9 @@
 
     @if(!$add && !$update)
 
-    <a class="btn--ui lightGrey" href="/settings?type=contabilita"><i class="fa-solid fa-arrow-left"></i></a><br><br>
+    <a class="btn--ui lightGrey" href="/settings?type=contabilita"><i class="fa-solid fa-arrow-left"></i></a><br/>
 
-    <header id="title--section" class="d-flex align-items-center justify-content-between">
+    <header id="title--section" class="d-flex align-items-center justify-content-end mb-2">
         <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>
             <h2 class="primary">@if(!$add && !$update)causali @else Inserimento/modifica causale @endif</h2>
@@ -16,12 +16,11 @@
                     <a href="#" wire:click="add()" style="color:white">AGGIUNGI</a>
                 </div>
             </div>
-
         @endif
 
     </header>
 
-        <section id="resume-table">
+        <section id="resume-table" style="max-height: unset !important">
             <div class="compare--chart_wrapper d-none"></div>
 
             <h1>Entrata</h1>
@@ -54,9 +53,9 @@
                                 <button type="button" class="btn btn-outline-success btn-sm" wire:click="duplicate({{ $record->id }})">Duplica</button>
                                 <button type="button" class="btn" wire:click="edit({{ $record->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>
                                 @if($record->hidden)
-                                    <button type="button" class="btn btn-success" wire:click="show({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Ripristina"><i class="fa-regular fa-eye"></i></button>
+                                    <button type="button" class="btn" wire:click="show({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Ripristina"><i class="fa-regular fa-eye"></i></button>
                                 @else
-                                    <button type="button" class="btn btn-warning" onclick="confirm('Sei sicuro di voler nascondere questo elemento?') || event.stopImmediatePropagation()" wire:click="hide({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Nascondi"><i class="fa-regular fa-eye-slash"></i></button>
+                                    <button type="button" class="btn" onclick="confirm('Sei sicuro di voler nascondere questo elemento?') || event.stopImmediatePropagation()" wire:click="hide({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Nascondi"><i class="fa-regular fa-eye-slash"></i></button>
                                 @endif
                             </td>
                         </tr>
@@ -107,9 +106,9 @@
                                 <button type="button" class="btn btn-outline-success btn-sm" wire:click="duplicate({{ $record->id }})">Duplica</button>
                                 <button type="button" class="btn" wire:click="edit({{ $record->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>
                                 @if($record->hidden)
-                                    <button type="button" class="btn btn-success" wire:click="show({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Ripristina"><i class="fa-regular fa-eye"></i></button>
+                                    <button type="button" class="btn" wire:click="show({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Ripristina"><i class="fa-regular fa-eye"></i></button>
                                 @else
-                                    <button type="button" class="btn btn-warning" onclick="confirm('Sei sicuro di voler nascondere questo elemento?') || event.stopImmediatePropagation()" wire:click="hide({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Nascondi"><i class="fa-regular fa-eye-slash"></i></button>
+                                    <button type="button" class="btn" onclick="confirm('Sei sicuro di voler nascondere questo elemento?') || event.stopImmediatePropagation()" wire:click="hide({{ $record->id }})" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Nascondi"><i class="fa-regular fa-eye-slash"></i></button>
                                 @endif
                                 </td>
                         </tr>
@@ -246,6 +245,7 @@
         </div>
 
     @endif
+    <br>
 </div>
 
 @push('scripts')

+ 2 - 2
resources/views/livewire/causal_child.blade.php

@@ -16,9 +16,9 @@
                 <button type="button" class="btn btn-sm" wire:click="edit({{ $record->id }})"><i class="fa-regular fa-pen-to-square"></i></button>
 
                 @if($record->hidden)
-                    <button type="button" class="btn btn-success btn-sm" wire:click="show({{ $record->id }})"><i class="fa-regular fa-eye"></i></button>
+                    <button type="button" class="btn btn-sm" wire:click="show({{ $record->id }})"><i class="fa-regular fa-eye"></i></button>
                 @else
-                    <button type="button" class="btn btn-warning btn-sm" onclick="confirm('Sei sicuro di voler nascondere questo elemento?') || event.stopImmediatePropagation()" wire:click="hide({{ $record->id }})"><i class="fa-regular fa-eye-slash"></i></button>
+                    <button type="button" class="btn btn-sm" onclick="confirm('Sei sicuro di voler nascondere questo elemento?') || event.stopImmediatePropagation()" wire:click="hide({{ $record->id }})"><i class="fa-regular fa-eye-slash"></i></button>
                 @endif
             </td>
         </tr>

+ 2 - 2
resources/views/livewire/course.blade.php

@@ -206,7 +206,7 @@
                                 <div class="col-6 mt-2">
                                     <div class="form--item">
                                         <label for="inputName" class="form-label">Causale</label>
-                                        <livewire:causals :type="$typeIN" :idx="0" :causal_id="$causal_id" :wire:key="0" />
+                                        <livewire:causals :type="$typeIN" :idx="0" :show_hidden=0 :causal_id="$causal_id" :wire:key="0" />
                                         @error('causal_id')
                                             <span style="argin-top: 0.25rem; font-size: 0.875em; color: var(--bs-form-invalid-color);">{{ $message }}</span>
                                         @enderror
@@ -215,7 +215,7 @@
                                 <div class="col-6 mt-2">
                                     <div class="form--item">
                                         <label for="inputName" class="form-label">Causale iscrizione</label>
-                                        <livewire:causals :type="$typeIN" :idx="0" :causal_id="$sub_causal_id" :wire:key="0" :emit="$setSubscriptionCausal" />
+                                        <livewire:causals :type="$typeIN" :idx="0" :show_hidden=0 :causal_id="$sub_causal_id" :wire:key="0" :emit="$setSubscriptionCausal" />
                                         @error('sub_causal_id')
                                             <span style="argin-top: 0.25rem; font-size: 0.875em; color: var(--bs-form-invalid-color);">{{ $message }}</span>
                                         @enderror

+ 1 - 1
resources/views/livewire/records_in.blade.php

@@ -342,7 +342,7 @@
                                         @if($this->dataId > 0 && !$isDuplicate)
                                             {{$this->getCausal($rows[$idx]['causal_id'])}}<br>
                                         @else
-                                            <livewire:causals :type="$typeIN" :idx="$idx" :causal_id="$rows[$idx]['causal_id']" :wire:key="$idx"/>
+                                            <livewire:causals :type="$typeIN" :idx="$idx" :show_hidden=0 :causal_id="$rows[$idx]['causal_id']" :wire:key="$idx"/>
                                         @endif
 
                                         @error('rows.'. $idx . '.causal_id')

+ 1 - 1
resources/views/livewire/records_out.blade.php

@@ -387,7 +387,7 @@
                                 <span class="title-form d-block w-100">Causale</span>
                                 <div class="col-md-12">
 
-                                    <livewire:causals :type="$typeOUT" :idx="$idx" :causal_id="$rows[$idx]['causal_id']" :wire:key="$idx" />
+                                    <livewire:causals :type="$typeOUT" :idx="$idx" :show_hidden=0 :causal_id="$rows[$idx]['causal_id']" :wire:key="$idx" />
 
                                     @if(false)
                                         <select name="rows.{{$idx}}.causal_id" class="form-select causalClass @error('row.' . $idx . '.causal_id') is-invalid @enderror" aria-label="Seleziona una causale" wire:model="rows.{{$idx}}.causal_id">