Merge branch 'iao_team' of http://host.webmagistri.biz:3000/parisio/iao_team into iao_team_ferrari

app/Http/Livewire/Course.php

@@ -136,7 +136,14 @@ class Course extends Component
         if (isset($_GET["year"]))
             $this->selectedYear = $_GET["year"];
         else
-            $this->selectedYear = $this->course_years[0];
+        {
+            if (date("m") >= env('FISCAL_YEAR_MONTH_FROM', 1))
+                $this->selectedYear = date("Y") . "-" . (date("Y") + 1);
+            else
+                $this->selectedYear = (date("Y") - 1) . "-" . date("Y");
+            //$this->selectedYear = $this->course_years[0];
+
+        }
             //$this->selectedYear = date("Y") . "-" . (date("Y") + 1);
         $this->records = \App\Models\Course::where('parent_id', null)->where('year', $this->selectedYear)->with('type', 'duration')->get();
         return view('livewire.course');

app/Http/Livewire/CourseList.php

@@ -33,6 +33,7 @@ class CourseList extends Component
 
     public $courseId = 0;
 
+    public $filterYear = '';
     public $filterCourse = [];
     public $filterLevel = [];
     public $filterFrequency = [];
@@ -66,11 +67,20 @@ class CourseList extends Component
 
         $this->courses = \App\Models\Course::orderBy('name')->groupBy('name')->pluck('name');
 
+        if (date("m") >= env('FISCAL_YEAR_MONTH_FROM', 1))
+            $this->filterYear = date("Y") . "-" . (date("Y") + 1);
+        else
+            $this->filterYear = (date("Y") - 1) . "-" . date("Y");
+
         //if (sizeof($this->courses) > 0)
         //    $this->courseId = $this->courses[0]->id;
 
     }
 
+    public function updatedfilterYear($value){
+        $this->emit('load-data-table');
+    }
+
     public function updatedfilterCourse($value){
         $this->emit('load-data-table');
     }
@@ -117,6 +127,12 @@ class CourseList extends Component
             $member_course = $member_course->whereIn('member_id', $member_ids);
         }
 
+        if ($this->filterYear != "") 
+        {
+            $course_ids = \App\Models\Course::where('year', $this->filterYear)->pluck('id');
+            $member_course = $member_course->whereIn('course_id', $course_ids);
+        }
+
         if ($this->hasFilter)
         {
             if (isset($_GET["search"]["value"]))
@@ -139,6 +155,8 @@ class CourseList extends Component
                 }
             }
 
+            
+
             if (sizeof($this->filterCourse) > 0)
             {
                 $course_ids = [];

app/Http/Livewire/CourseMember.php

@@ -59,6 +59,11 @@ class CourseMember extends Component
         $this->course_years = \App\Models\Course::select('year')->where('year', '<>', '')->groupBy('year')->pluck('year');
         $this->courses = \App\Models\Course::orderBy('name')->groupBy('name')->pluck('name');
 
+        if (date("m") >= env('FISCAL_YEAR_MONTH_FROM', 1))
+            $this->filterYear = date("Y") . "-" . (date("Y") + 1);
+        else
+            $this->filterYear = (date("Y") - 1) . "-" . date("Y");
+
     }
 
     public function render()

app/Http/Livewire/Member.php

@@ -797,11 +797,13 @@ class Member extends Component
             $dow = date('w', strtotime($calendar->from));
             $d = $days[$dow];
 
+            $h = date('H:i', strtotime($calendar->from));
+
             // Elenco corsi per tipologia in base al calendario
             $courses = \App\Models\Course::where('name', $calendar->name)->where('date_from', '<=', $calendar->from)->where('date_to', '>=', $calendar->to)->pluck('id')->toArray();
 
             // Elenco utenti iscritti al corso "padre"
-            if (\App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
+            if (\App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
             {
                 $status = '';
                 if (in_array($calendar->id, $presences))

app/Http/Livewire/Presence.php

@@ -74,12 +74,14 @@ class Presence extends Component
             $dow = date('w', strtotime($this->calendar->from));
             $d = $days[$dow];
 
+            $h = date('H:i', strtotime($this->calendar->from));
+
             // Elenco corsi per tipologia in base al calendario
             $courses = \App\Models\Course::where('name', $this->calendar->name)->where('date_from', '<=', $this->calendar->from)->where('date_to', '>=', $this->calendar->to)->pluck('id')->toArray();
 
 
             // Elenco utenti iscritti al corso "padre"
-            $members_courses = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->whereIn('course_id', $courses)->pluck('member_id')->toArray();
+            $members_courses = \App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereIn('course_id', $courses)->pluck('member_id')->toArray();
 
             if ($this->filter != '')
             {
@@ -171,6 +173,7 @@ class Presence extends Component
 
         $presence = false;
         $my_presence = false;
+        $motivation = '';
         $status = 0;
 
         $has_presence = \App\Models\Presence::where('calendar_id', $this->calendar->id)->where('member_id', $member->id)->first();
@@ -178,6 +181,10 @@ class Presence extends Component
         {
             $presence = true;
             $my_presence = $has_presence->user_id == \Auth::user()->id;
+            if ($has_presence->motivation_id > 0)
+            {
+                $motivation = \App\Models\Motivation::findOrFail($has_presence->motivation_id)->name;
+            }
             $status = $has_presence->status;
         }
 
@@ -187,7 +194,7 @@ class Presence extends Component
             $my_presence = true;
         }
 
-        return array('id' => $member->id, 'first_name' => $member->first_name, 'last_name' => $member->last_name, 'certificate' => $y, 'presence' => $presence, 'my_presence' => $my_presence, 'status' => $status);
+        return array('id' => $member->id, 'first_name' => $member->first_name, 'last_name' => $member->last_name, 'certificate' => $y, 'presence' => $presence, 'my_presence' => $my_presence, 'status' => $status, 'motivation' => $motivation);
 
     }
 
@@ -266,6 +273,9 @@ class Presence extends Component
         if (!$this->added)
         {
             $this->newMemberFiscalCodeExist = false;
+            $this->validate([
+                "newMemberMotivationId" => 'required',
+            ]);
             /*$this->validate([
                 // 'newMemberFiscalCode'=>'required|max:16',
                 'newMemberFirstName'=>'required',
@@ -319,10 +329,13 @@ class Presence extends Component
 
             if ($this->member_ids != null)
             {
+                $this->validate([
+                    "newMemberMotivationId" => 'required',
+                ]);
                 foreach($this->member_ids as $m)
                 {
-                    if ($this->manual)
-                    {
+                    //if ($this->manual)
+                    //{
                         //\App\Models\Presence::where('calendar_id', $this->calendar->id)->where('user_id', \Auth::user()->id)->where('status', '<>', 99)->delete();
                         //foreach($ids as $id)
                         //{
@@ -334,12 +347,12 @@ class Presence extends Component
                             $p->status = 0;
                             $p->save();
                         //}
-                    }
+                    /*}
                     else
                     {
                         if (!in_array($m, $this->newMembers))
                             $this->newMembers[] = $m;
-                    }
+                    }*/
                 }
             }
 

app/Http/Livewire/RecordIN.php

@@ -393,7 +393,7 @@ class RecordIN extends Component
                     if ($m > date("M"))
                         $this->rows[0]["when"][$idx]["year"] = $m < env('FISCAL_YEAR_MONTH_FROM', 1) ? (date("Y") + 1) : date("Y");
                     else
-                        $this->rows[0]["when"][$idx]["year"] = $m > env('FISCAL_YEAR_MONTH_TO', 1) ? (date("Y") - 1) : date("Y");
+                        $this->rows[0]["when"][$idx]["year"] = $m > env('FISCAL_YEAR_MONTH_TO', 1) ? (date("Y")) : date("Y") + 1;
 
                     if ($idx > 0)
                     {

app/Http/Livewire/User.php

@@ -52,7 +52,7 @@ class User extends Component
                 'email' => $this->email,
                 'password' => bcrypt($this->password),
                 'level' => $this->level,
-                'enabled' => $this->enabled
+                'enabled' => $this->enabled ? 1 : 0
             ]);
             session()->flash('success','Dato creato');
             $this->resetFields();
@@ -70,8 +70,9 @@ class User extends Component
             } else {
                 $this->name = $user->name;
                 $this->email = $user->email;
-                $this->password = $user->password;
+                $this->oldPassword = $user->password;
                 $this->level = $user->level;
+                $this->enabled = $user->enabled == 1;
                 $this->dataId = $user->id;
                 $this->update = true;
                 $this->add = false;
@@ -83,15 +84,19 @@ class User extends Component
 
     public function update()
     {
-        $this->validate();
+        $this->validate(
+            [
+                'name' => 'required',
+                'email' => 'required',
+            ]
+        );
         try {
-            if ($this->pa)
             \App\Models\User::whereId($this->dataId)->update([
                 'name' => $this->name,
                 'email' => $this->email,
-                'password' => bcrypt($this->password),
+                'password' => $this->password != '' ? bcrypt($this->password) : $this->oldPassword,
                 'level' => $this->level,
-                'enabled' => $this->enabled
+                'enabled' => $this->enabled ? 1 : 0
             ]);
             session()->flash('success','Dato aggiornato');
             $this->resetFields();

app/Models/Presence.php

@@ -26,4 +26,9 @@ class Presence extends Model
     {
         return $this->belongsTo(\App\Models\Calendar::class);
     }
+
+    public function motivation()
+    {
+        return $this->belongsTo(\App\Models\Motivation::class);
+    }
 }

resources/views/layouts/app.blade.php

@@ -315,7 +315,7 @@
                                     Corsi
                                 </button>
                             </h2>
-                            <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_list') || Request::is('course_member') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
+                            <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_list') || Request::is('course_member') || 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" style="{{Request::is('course_member') ? 'background-color: #c5d9e6;' : ''}}">

resources/views/livewire/course.blade.php

@@ -37,8 +37,17 @@
                             try
                             {
                                 list($f, $t) = explode("-", $c);
-                                if ($f == date("Y") - 1)
-                                    $selected = 'selected';
+                                if (date("m") >= env('FISCAL_YEAR_MONTH_FROM', 1))
+                                {
+                                    if ($f == date("Y"))
+                                        $selected = 'selected';
+                                }
+                                else
+                                {
+                                    if ($f == date("Y") - 1)
+                                        $selected = 'selected';
+                                }
+                                
                             } catch (Exception $e) {
 
                             }

resources/views/livewire/course_list.blade.php

@@ -57,11 +57,11 @@
                         <b>Anno</b>
                     </div>
                     <div class="col-12">
-                        <select class="form-select filterYear" >
+                        <select class="form-select filterYear" wire:model="filterYear">
                             <option value="">--Seleziona--
                             @foreach($course_years as $c)
                                 @php
-                                $selected = '';
+                                /*$selected = '';
                                 try
                                 {
                                     list($f, $t) = explode("-", $c);
@@ -69,9 +69,9 @@
                                         $selected = 'selected';
                                 } catch (Exception $e) {
 
-                                }
+                                }*/
                                 @endphp
-                                <option value="{{$c}}" {{$selected}}>{{$c}}
+                                <option value="{{$c}}">{{$c}}
                             @endforeach
                         </select>
                     </div>
@@ -508,7 +508,15 @@
         } );
 
         $('.filterYear').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
-        $('.filterYear').val('{{date("Y")-1}}-{{date("Y")}}').trigger("change");
+        $('.filterYear').val('{{$filterYear}}').trigger("change");
+
+        $('.filterYear').on('change', function (e) {
+            var data = $('.filterYear').select2("val");
+            if (data == null) data = '';
+            @this.set('filterYear', data);
+            //@this.search();
+        });
+
         $('.filterCourse').select2({"language": {"noResults": function(){return "Nessun risultato";}}});
         $('.filterCourse').on('change', function (e) {
             var data = $('.filterCourse').select2("val");

resources/views/livewire/course_member.blade.php

@@ -415,6 +415,7 @@
 
 
         $('.filterYear').select2({ "language": { "noResults": function () { return "Nessun risultato"; } } });
+        $('.filterYear').val('{{$filterYear}}').trigger("change");
         $('.filterCards').select2({ "language": { "noResults": function () { return "Nessun risultato"; } } });
 
 

resources/views/livewire/member.blade.php

@@ -152,7 +152,7 @@
                                 <div class="d-flex align-items-center corsi--user_details">
 
                                     <div class="title me-3">
-                                        <h4>{{$member_course->course->getTree()}}</h4>
+                                        <h4>{{$member_course->course->getTree()}} ({{$member_course->course ? $member_course->course->year : ''}})</h4>
                                     </div>
                                     <div class="corsi--mesi me-3">
                                         <span class="corsi_mesi_text">
@@ -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

@@ -60,7 +60,7 @@
 
         </div>    
         
-        <section id="resume-table" class="mt-5"  style="margin-bottom:20px">
+        <div id="resume-table" class="mt-5" >
             <div class="compare--chart_wrapper d-none"></div>
             
             <div class="row">
@@ -69,6 +69,7 @@
                     <input type="text" class="form-control" placeholder="Cerca utente" wire:model="filter">
                 </div>
             </div>
+        </div>
         
             <table class="table tablesaw tableHead tablesaw-stack" id="tablesaw-350" width="100%">
                 <thead>
@@ -77,6 +78,7 @@
                         <th scope="col">Cognome</th>
                         <th scope="col">Nome</th>
                         <th scope="col">Certificato</th>
+                        <th scope="col">Motivazione</th>
                         <th scope="col">Presenza</th>
                     </tr>
                 </thead>
@@ -102,6 +104,10 @@
                                     @endif
                                     {{$date}}
                                 </span>
+                            </td>
+                            <td>
+                                {{$record["motivation"]}}
+                            </td>
                             <td>
                                 @if ($record["status"] != 99)
                                     @if ($record["presence"])
@@ -127,7 +133,7 @@
                 </tbody>
             </table>
 
-        </section>
+        
 
         @if($calendar->status == 0)
             <div class="row">
@@ -202,7 +208,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 +253,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>

routes/web.php

@@ -606,7 +606,8 @@ Route::get('/get_record_in', function () {
 
         if (!in_array($r->payment_method_id, $moneys)) {
             //if ((!in_array($r->member_id, $exclude_from_records) || in_array($r->causal_id, $moneysCausal)) && (!$r->deleted || $r->deleted == null) && (!in_array($r->causal_id, $excludeCausals) || in_array($r->causal_id, $moneysCausal)) && (!$r->financial_movement || $r->financial_movement == null) && (!$r->corrispettivo_fiscale || $r->corrispettivo_fiscale == null) && !$r->commercial) {
-            if ((!in_array($r->member_id, $exclude_from_records) || in_array($r->causal_id, $moneysCausal)) && (!$r->deleted || $r->deleted == null) && (!in_array($r->causal_id, $excludeCausals) || in_array($r->causal_id, $moneysCausal)) && (!$r->financial_movement || $r->financial_movement == null)) {
+            //if ((!in_array($r->member_id, $exclude_from_records) || in_array($r->causal_id, $moneysCausal)) && (!$r->deleted || $r->deleted == null) && (!in_array($r->causal_id, $excludeCausals) || in_array($r->causal_id, $moneysCausal)) && (!$r->financial_movement || $r->financial_movement == null)) {
+            if ((!in_array($r->member_id, $exclude_from_records) || in_array($r->causal_id, $moneysCausal)) && (!$r->deleted || $r->deleted == null) && (!in_array($r->causal_id, $excludeCausals) || in_array($r->causal_id, $moneysCausal)) && (!$r->financial_movement || $r->financial_movement == null) && (!$r->corrispettivo_fiscale || $r->corrispettivo_fiscale == null)) {
                 if (sizeof($causals) == 0 || in_array($r->causal_id, $causals)) {
                     $total += $r->amount;
                     if ($r->vat_id > 0)