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

corretta la visualizzazione dei corsi in sidebar utente + visualizzazione solo corsi dell'anno in corso

ferrari 3 месяцев назад
Родитель
Сommit
1ebd6dc046
1 измененных файлов с 114 добавлено и 62 удалено
  1. 114 62
      resources/views/livewire/member.blade.php

+ 114 - 62
resources/views/livewire/member.blade.php

@@ -161,41 +161,67 @@
                         <div class="resume--tab_info corsi">
                             <h2 class="title d-flex align-items-center mb-3 gap-4"><i class="fa-solid fa-chalkboard"></i>Corsi</h2>
                             @foreach($currentMember->courses as $member_course)
-                                <div class="resume--info resume-corso d-flex align-items-center">
-                                    <div class="row">
-                                        <div class="row">
-                                            <strong>{{$member_course->course->getTree()}}</strong></span><br>
-                                        </div>
-                                        <div class="row">
-                                            <span class="title-detail">
-                                                @php
-                                                $aMo = json_decode($member_course->months);
-                                                if (sizeof($aMo) == 1)
-                                                {
-                                                    print($this->getMonth($aMo[0]->m));
-                                                }
-                                                if (sizeof($aMo) > 1)
-                                                {
-                                                    print($this->getMonth($aMo[0]->m) . " - " . $this->getMonth($aMo[sizeof($aMo) - 1]->m));
-                                                }
-                                                @endphp
-                                            </span>
-                                        </div>
+                                @php
+                                    $course_year = date('Y', strtotime($member_course->date_from));
+                                    $current_year = date('Y');
+                                    $course_month = date('m', strtotime($member_course->date_from));
+                                    $current_month = date('m');
+                                @endphp
+                                @if (
+                                    ($course_year == (date('Y') + 1) && $course_month <=8) ||
+                                    ($course_year == date('Y') && $course_month >= 9)
+                                )
+                                    <div class="resume--info resume-corso d-flex align-items-center">
                                         <div class="row">
-                                            <span class="title-detail">
-                                                @foreach(json_decode($member_course->when) as $xx => $x)
-                                                    @if($xx > 0)
-                                                        <br>
-                                                    @endif
-                                                    @foreach($x->day as $d)
-                                                        {{$d}}
+                                            <div class="row">
+                                                <strong>{{$member_course->course->getTree()}}</strong>
+                                            </div>
+                                            <div class="row">
+                                                <span class="title-detail">
+                                                    {{$member_course->course->level->name ?? ""}}<br>
+                                                    {{$member_course->course->frequency->name ?? ""}}
+                                                </span>
+                                            </div>
+                                            <div class="row">
+                                                <span class="title-detail">
+                                                    @php
+                                                        $ok = false;
+                                                    @endphp
+                                                    @foreach(json_decode($member_course->when) as $xx => $x)
+                                                        @if($xx > 0)
+                                                            <br>
+                                                        @endif
+                                                        @foreach($x->day as $zz => $d)
+                                                            {{$zz > 0 ? '-' : ''}}{{$d}}
+                                                        @endforeach
+                                                        @if($x->from != '' && $x->to != '')
+                                                            h {{$x->from}} - {{$x->to}}
+                                                        @endif
+                                                        @php
+                                                            $ok = $x->from != '';
+                                                        @endphp
                                                     @endforeach
-                                                    {{$x->from}} - {{$x->to}}
-                                                @endforeach
-                                            </span>
+                                                    @if(!$ok && $member_course->course->when != '')
+                                                        @foreach(json_decode($member_course->course->when) as $xx => $x)
+                                                            @php
+                                                                $ok = true;
+                                                            @endphp
+                                                            @if($xx > 0)
+                                                                <br>
+                                                            @endif
+                                                            @foreach($x->day as $zz => $d)
+                                                                {{$zz > 0 ? '-' : ''}}{{$d}}
+                                                            @endforeach
+                                                            @if($x->from != '')
+                                                                h {{$x->from}} - {{$x->to}}
+                                                            @endif
+                                                        @endforeach
+                                                    @endif
+                                                </span>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
+                                @endif
                             @endforeach
                         </div>
                     </div>
@@ -1453,41 +1479,67 @@
                                     <div class="resume--tab_info gruppi corsi">
                                         <h2 class="mb-3"><i class="fa-solid fa-chalkboard"></i><span>Corsi</span></h2>
                                         @foreach($member_courses as $member_course)
-                                            <div class="resume--info resume-corso d-flex align-items-center">
-                                                <div class="row">
-                                                    <div class="row">
-                                                        <strong>{{$member_course->course->getTree()}}</strong></span><br>
-                                                    </div>
-                                                    <div class="row">
-                                                        <span class="title-detail">
-                                                            @php
-                                                            $aMo = json_decode($member_course->months);
-                                                            if (sizeof($aMo) == 1)
-                                                            {
-                                                                print($this->getMonth($aMo[0]->m));
-                                                            }
-                                                            if (sizeof($aMo) > 1)
-                                                            {
-                                                                print($this->getMonth($aMo[0]->m) . " - " . $this->getMonth($aMo[sizeof($aMo) - 1]->m));
-                                                            }
-                                                            @endphp
-                                                        </span>
-                                                    </div>
+                                            @php
+                                                $course_year = date('Y', strtotime($member_course->date_from));
+                                                $current_year = date('Y');
+                                                $course_month = date('m', strtotime($member_course->date_from));
+                                                $current_month = date('m');
+                                            @endphp
+                                            @if (
+                                                ($course_year == (date('Y') + 1) && $course_month <=8) ||
+                                                ($course_year == date('Y') && $course_month >= 9)
+                                            )
+                                                <div class="resume--info resume-corso d-flex align-items-center">
                                                     <div class="row">
-                                                        <span class="title-detail">
-                                                            @foreach(json_decode($member_course->when) as $xx => $x)
-                                                                @if($xx > 0)
-                                                                    <br>
-                                                                @endif
-                                                                @foreach($x->day as $d)
-                                                                    {{$d}}
+                                                        <div class="row">
+                                                            <strong>{{$member_course->course->getTree()}}</strong>
+                                                        </div>
+                                                        <div class="row">
+                                                            <span class="title-detail">
+                                                                {{$member_course->course->level->name ?? ""}}<br>
+                                                                {{$member_course->course->frequency->name ?? ""}}
+                                                            </span>
+                                                        </div>
+                                                        <div class="row">
+                                                            <span class="title-detail">
+                                                                @php
+                                                                    $ok = false;
+                                                                @endphp
+                                                                @foreach(json_decode($member_course->when) as $xx => $x)
+                                                                    @if($xx > 0)
+                                                                        <br>
+                                                                    @endif
+                                                                    @foreach($x->day as $zz => $d)
+                                                                        {{$zz > 0 ? '-' : ''}}{{$d}}
+                                                                    @endforeach
+                                                                    @if($x->from != '' && $x->to != '')
+                                                                        h {{$x->from}} - {{$x->to}}
+                                                                    @endif
+                                                                    @php
+                                                                        $ok = $x->from != '';
+                                                                    @endphp
                                                                 @endforeach
-                                                                {{$x->from}} - {{$x->to}}
-                                                            @endforeach
-                                                        </span>
+                                                                @if(!$ok && $member_course->course->when != '')
+                                                                    @foreach(json_decode($member_course->course->when) as $xx => $x)
+                                                                        @php
+                                                                            $ok = true;
+                                                                        @endphp
+                                                                        @if($xx > 0)
+                                                                            <br>
+                                                                        @endif
+                                                                        @foreach($x->day as $zz => $d)
+                                                                            {{$zz > 0 ? '-' : ''}}{{$d}}
+                                                                        @endforeach
+                                                                        @if($x->from != '')
+                                                                            h {{$x->from}} - {{$x->to}}
+                                                                        @endif
+                                                                    @endforeach
+                                                                @endif
+                                                            </span>
+                                                        </div>
                                                     </div>
                                                 </div>
-                                            </div>
+                                            @endif
                                         @endforeach
                                     </div>
                                     <div class="resume--tab_info gruppi">