#628 progress default page changed

app/Helpers/ChapterHelper.php

@@ -34,4 +34,20 @@ public static function getChapterOriginLinkForNumber(string $chapter): ?string
 
         return $links[$chapter] ?? null;
     }
+
+    public static function getChapterDescendants(Chapter $chapter): array
+    {
+        $descendants = [];
+        $children = $chapter->children;
+
+        foreach ($children as $child) {
+            if (!$child->children->isEmpty()) {
+                $descendants = [...$descendants, ...self::getChapterDescendants($child)];
+            } else {
+                $descendants[] = $child;
+            }
+        }
+
+        return $descendants;
+    }
 }

app/Http/Controllers/MyController.php

@@ -21,7 +21,19 @@ public function __invoke(): View
         $user->load('readChapters', 'exerciseMembers');
 
         $chapters = Chapter::with('children', 'exercises')->get();
-        $mainChapters = $chapters->where('parent_id', null);
+        $mainChapters = $chapters->where('parent_id', null)->sortBy('id');
+
+        $firstUnfinishedChapter = 1;
+        foreach ($mainChapters as $mainChapter) {
+            if (!$user->haveReadMainChapter($mainChapter)) {
+                break;
+            }
+            $firstUnfinishedChapter += 1;
+        }
+        if ($firstUnfinishedChapter > $mainChapters->count()) {
+            $firstUnfinishedChapter = 1;
+        }
+
         $exerciseMembers = $user->exerciseMembers->keyBy('exercise_id');
         $savedSolutionsExercises = $user->solutions()
             ->versioned()
@@ -36,7 +48,8 @@ public function __invoke(): View
             'chapters',
             'mainChapters',
             'exerciseMembers',
-            'savedSolutionsExercises'
+            'savedSolutionsExercises',
+            'firstUnfinishedChapter',
         ));
     }
 }

app/Models/User.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Helpers\ChapterHelper;
 use App\Presenters\UserPresenter;
 use Database\Factories\UserFactory;
 use Hemp\Presenter\Presentable;
@@ -127,4 +128,17 @@ public function haveRead(Chapter $chapter): bool
     {
         return $this->chapters->contains($chapter);
     }
+
+    public function haveReadMainChapter(Chapter $chapter): bool
+    {
+        $subChapters = ChapterHelper::getChapterDescendants($chapter);
+
+        foreach ($subChapters as $subChapter) {
+            if (!$this->haveRead($subChapter)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

resources/views/my/progresses/_my_chapters.blade.php

@@ -2,7 +2,7 @@
   <div class="col-12 col-md-4 border-end x-z-index-0">
     <div class="nav nav-pills flex-column sticky-top m-2 pt-2" role="tablist" aria-orientation="vertical">
       @foreach ($mainChapters as $mainChapter)
-        <button class="nav-link text-start {{ $mainChapter->path === '1' ? 'active' : '' }}"
+        <button class="nav-link text-start {{ $mainChapter->path === (string) $firstUnfinishedChapter ? 'active' : '' }}"
           id="subChapters{{ $mainChapter->id }}-tab" data-bs-target="#subChapters{{ $mainChapter->id }}"
           data-bs-toggle="tab" type="button" role="tab" aria-controls="subChapters{{ $mainChapter->id }}"
           aria-selected="{{ $mainChapter->path === '1' ? 'true' : 'false' }}">
@@ -15,7 +15,7 @@
     {{ BsForm::open(route('users.chapters.store', [$user])) }}
     <div class="tab-content m-2 m-lg-4">
       @foreach ($mainChapters as $mainChapter)
-        <div class="tab-pane fade {{ $mainChapter->path === '1' ? 'show active' : '' }}"
+        <div class="tab-pane fade {{ $mainChapter->path === (string) $firstUnfinishedChapter ? 'show active' : '' }}"
           id="subChapters{{ $mainChapter->id }}" role="tabpanel"
           aria-labelledby="subChapters{{ $mainChapter->id }}-tab">
           @include('partials.chapter_form_element', ['chapter' => $mainChapter])