fix motivazione obbligatoria in presenze, aggiunto anno alla visualizzazione corso membro

app/Http/Livewire/Presence.php

@@ -266,6 +266,9 @@ class Presence extends Component
         if (!$this->added)
         {
             $this->newMemberFiscalCodeExist = false;
+            $this->validate([
+                "newMemberMotivationId" => 'required',
+            ]);
             /*$this->validate([
                 // 'newMemberFiscalCode'=>'required|max:16',
                 'newMemberFirstName'=>'required',
@@ -319,6 +322,9 @@ class Presence extends Component
 
             if ($this->member_ids != null)
             {
+                $this->validate([
+                    "newMemberMotivationId" => 'required',
+                ]);
                 foreach($this->member_ids as $m)
                 {
                     if ($this->manual)

resources/views/livewire/member.blade.php

@@ -1224,12 +1224,15 @@
                                                                 <b>{{$member_course->course->name}}</b><br>
                                                             </td>
                                                             <td style="width:10%">
+                                                                {{$member_course->course->year}}<br>
+                                                            </td>
+                                                            <td style="width:5%">
                                                                 {{$member_course->course->type->name ?? ""}}<br>
                                                             </td>
                                                             <td style="width:10%">
                                                                 {{$member_course->course->level->name ?? ""}}<br>
                                                             </td>
-                                                            <td style="width:30%">
+                                                            <td style="width:25%">
                                                                 @foreach(json_decode($member_course->when) as $xx => $x)
                                                                     @if($xx > 0)
                                                                         <br>
@@ -1263,7 +1266,7 @@
                                                         </tr>
                                                         @if(in_array($member_course->id, $showCourse))
                                                             <tr>
-                                                                <td colspan="5">
+                                                                <td colspan="6">
                                                                     <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}})" {{in_array($this->getMonthStatus(9, $member_course->months, $member_course->id), ['blue', 'orange', 'yellow', 'orange half']) ? '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}})" {{in_array($this->getMonthStatus(10, $member_course->months, $member_course->id), ['blue', 'orange', 'yellow', 'orange half']) ? 'style=cursor:pointer' : ''}}>Ott</a>&nbsp;
@@ -1284,7 +1287,7 @@
                                                                 </td>
                                                             </tr>
                                                             <tr>
-                                                                <td colspan="6">
+                                                                <td colspan="7">
                                                                     @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;
@@ -1577,7 +1580,7 @@
                                             <div class="resume--info d-flex align-items-center">
                                                 <div class="row" style="margin-top:10px">
                                                     <div class="row">
-                                                        <strong>{{$member_course->course->getTree()}}</strong></span><br>
+                                                        <strong>{{$member_course->course->getTree()}} <span style="font-weight:lighter">({{$member_course->course->year}})</span></strong></span><br>
                                                     </div>
                                                     <div class="row">
                                                         <span class="title-detail">

resources/views/livewire/presence.blade.php

@@ -202,7 +202,7 @@
                         </div>
                         <div class="col-md-6">
                             <label for="newMotivation" class="form-label">Motivazione</label>
-                            <select class="form-select form-select-lg me-1 " id="newMemberMotivationId">
+                            <select class="form-select form-select-lg me-1 @error('newMemberMotivationId') is-invalid @enderror" id="newMemberMotivationId">
                                 <option value="">
                                 @foreach($motivations_add as $m)
                                     <option value="{{$m["id"]}}">{{$m["name"]}}</option>
@@ -247,7 +247,7 @@
                         </div>
                         <div class="col-md-6">
                             <label for="newMotivation" class="form-label">Motivazione</label>
-                            <select class="form-select form-select-lg me-1 " id="newMemberMotivationIdX">
+                            <select class="form-select form-select-lg me-1 @error('newMemberMotivationId') is-invalid @enderror" id="newMemberMotivationIdX">
                                 <option value="">
                                 @foreach($motivations_add as $m)
                                     <option value="{{$m["id"]}}">{{$m["name"]}}</option>