|
|
@@ -355,7 +355,7 @@
|
|
|
<select name="filterScadenza" class="form-select filterScadenza" multiple="multiple">
|
|
|
<option value="1">Scaduti
|
|
|
<option value="2">In scadenza
|
|
|
- <option value="3">Non presenti
|
|
|
+ <option value="3">Non consegnato
|
|
|
<option value="4">Validi
|
|
|
</select>
|
|
|
</div>
|
|
|
@@ -1139,17 +1139,31 @@
|
|
|
<tbody id="checkall-target">
|
|
|
@foreach($member_courses as $member_course)
|
|
|
<tr>
|
|
|
- <td style="width:70%;border:0px;" colspan="3">
|
|
|
+ <td style="width:20%%;border:0px;" colspan="1">
|
|
|
<b>{{$member_course->course->name}}</b><br>
|
|
|
</td>
|
|
|
+ <td style="width:20%;border:0px;">
|
|
|
+ {{$member_course->course->frequency->name ?? ""}}<br>
|
|
|
+ </td>
|
|
|
+ <td style="width:20%;border:0px;">
|
|
|
+ {{$member_course->course->level->name ?? ""}}<br>
|
|
|
+ </td>
|
|
|
|
|
|
- <td style="text-align:right;width:15%;border:0px;">
|
|
|
+ <td style="text-align:right;width:5%;border:0px;">
|
|
|
@php
|
|
|
- $status = $member_course->getStatus();
|
|
|
+ $status = $member_course->getStatus();
|
|
|
@endphp
|
|
|
<a href="/rates?member_id={{$member_course->member_id}}&member_course_id={{$member_course->id}}"><span class="badge tessera-badge {{$status == 0 ? 'due' : ($status == 1 ? 'active' : 'suspended')}}">{{$status == 0 ? 'Da pagare' : ($status == 1 ? 'Pagato' : 'Sospeso')}}</span></a>
|
|
|
+ </td>
|
|
|
+ <td style="text-align:right;width:15%;border:0px;padding-top:15px;">
|
|
|
@if($member_course->notes != '')
|
|
|
- <button type="button" class="btn" wire:click="showHideCourse({{ $member_course->id }})"><i class="fa-solid fa-chevron-down"></i></button>
|
|
|
+ <button type="button" class="btn" wire:click="showHideCourse({{ $member_course->id }})">
|
|
|
+ @if(in_array($member_course->id, $showCourse))
|
|
|
+ <i class="fa-solid fa-chevron-circle-up"></i>
|
|
|
+ @else
|
|
|
+ <i class="fa-solid fa-chevron-circle-down"></i>
|
|
|
+ @endif
|
|
|
+ </button>
|
|
|
@endif
|
|
|
</td>
|
|
|
<td style="text-align:right;width:15%;border:0px;">
|
|
|
@@ -1166,15 +1180,13 @@
|
|
|
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td style="width:20%">
|
|
|
- {{$member_course->course->frequency->name ?? ""}}<br>
|
|
|
- </td>
|
|
|
- <td style="width:20%">
|
|
|
- {{$member_course->course->level->name ?? ""}}<br>
|
|
|
+ <td style="width:30%" colspan="2">
|
|
|
+ {{date("d/m/Y", strtotime($member_course->date_from))}} - {{date("d/m/Y", strtotime($member_course->date_to))}}
|
|
|
</td>
|
|
|
- <td style="width:30%">
|
|
|
+
|
|
|
+ <td style="width:30%"colspan="5">
|
|
|
@php
|
|
|
- $ok = false;
|
|
|
+ $ok = false;
|
|
|
@endphp
|
|
|
@foreach(json_decode($member_course->when) as $xx => $x)
|
|
|
@if($xx > 0)
|
|
|
@@ -1183,12 +1195,14 @@
|
|
|
@foreach($x->day as $zz => $d)
|
|
|
{{$zz > 0 ? '-' : ''}}{{$d}}
|
|
|
@endforeach
|
|
|
- h {{$x->from}} - {{$x->to}}
|
|
|
+ @if($x->from != '' && $x->to != '')
|
|
|
+ h {{$x->from}} - {{$x->to}}
|
|
|
+ @endif
|
|
|
@php
|
|
|
$ok = $x->from != '';
|
|
|
@endphp
|
|
|
@endforeach
|
|
|
- @if(!$ok)
|
|
|
+ @if(!$ok && $member_course->course->when != '')
|
|
|
@foreach(json_decode($member_course->course->when) as $xx => $x)
|
|
|
@php
|
|
|
$ok = true;
|
|
|
@@ -1205,9 +1219,7 @@
|
|
|
@endforeach
|
|
|
@endif
|
|
|
</td>
|
|
|
- <td style="width:30%" colspan="2">
|
|
|
- {{date("d/m/Y", strtotime($member_course->date_from))}} - {{date("d/m/Y", strtotime($member_course->date_to))}}
|
|
|
- </td>
|
|
|
+
|
|
|
|
|
|
</tr>
|
|
|
@if(in_array($member_course->id, $showCourse))
|
|
|
@@ -1236,6 +1248,10 @@
|
|
|
@endif
|
|
|
<tr >
|
|
|
<td colspan="7">
|
|
|
+ @if($member_course->notes != '')
|
|
|
+ <b>Note</b><br>
|
|
|
+ {{$member_course->notes}}
|
|
|
+ @endif
|
|
|
@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>
|
|
|
@@ -1245,10 +1261,6 @@
|
|
|
<button class="btn--ui primary" style="color:white" wire:click="reactivate({{$member_course}})">Riattiva</button>
|
|
|
@endif<br>
|
|
|
@endif
|
|
|
- @if($member_course->notes != '')
|
|
|
- <br><b>Note</b><br>
|
|
|
- {{$member_course->notes}}
|
|
|
- @endif
|
|
|
</td>
|
|
|
</tr>
|
|
|
|
|
|
@@ -2450,7 +2462,8 @@
|
|
|
}
|
|
|
if(data == ""){
|
|
|
ret += '<span class="tablesaw-cell-content d-flex align-items-center">';
|
|
|
- ret += 'Non Presente';
|
|
|
+ ret += '<i class="ico--ui check absent me-2"></i>';
|
|
|
+ ret += 'Non consegnato';
|
|
|
ret += '</span>';
|
|
|
}
|
|
|
return ret;
|
FabioFratini