Merge branch 'fix/overdue-today'

backend/app/Http/Controllers/ScheduleController.php

@@ -249,6 +249,8 @@ class ScheduleController extends Controller
 
         return [
             'id' => $assignment->getId(),
+            'scheduledDate' => $assignment->getScheduledDate()
+                ->format('Y-m-d'),
             'schedule' => [
                 'id' => $assignmentForDate->getScheduleId(),
                 'set' => [

backend/app/Schedule/EloquentScheduleRepository.php

@@ -63,7 +63,7 @@ class EloquentScheduleRepository implements ScheduleRepository
         return $schedules;
     }
 
-    public function findAssignmentsForUserOnDate(
+    public function findIncompleteAssignmentsForUserDueOnOrBefore(
         User $user,
         DateTimeImmutable $date,
     ): array {
@@ -76,11 +76,14 @@ class EloquentScheduleRepository implements ScheduleRepository
                 'schedule_assignments.schedule_id',
             )
             ->where('schedules.user_id', $user->getId())
-            ->where('schedule_assignments.scheduled_date', $date->format(
+            ->where(
-                'Y-m-d',
+                'schedule_assignments.scheduled_date',
-            ))
+                '<=',
+                $date->format('Y-m-d'),
+            )
             ->whereNull('schedule_assignments.completed_at')
             ->with('schedule')
+            ->orderBy('schedule_assignments.scheduled_date')
             ->orderByDesc('schedules.id')
             ->orderBy('schedule_assignments.position')
             ->orderBy('schedule_assignments.id')

backend/app/Schedule/ScheduleRepository.php

@@ -19,7 +19,7 @@ interface ScheduleRepository
     /**
      * @return list<AssignmentForDate>
      */
-    public function findAssignmentsForUserOnDate(
+    public function findIncompleteAssignmentsForUserDueOnOrBefore(
         User $user,
         DateTimeImmutable $date,
     ): array;

backend/app/Schedule/UseCases/ListAssignmentsForDate/ListAssignmentsForDate.php

@@ -22,7 +22,8 @@ class ListAssignmentsForDate
     {
         $date = $this->parseDate($request->date);
 
-        return $this->scheduleRepository->findAssignmentsForUserOnDate(
+        return $this->scheduleRepository
+            ->findIncompleteAssignmentsForUserDueOnOrBefore(
                 $request->user,
                 $date,
             );

backend/tests/Fakes/FakeScheduleRepository.php

@@ -78,7 +78,7 @@ class FakeScheduleRepository implements ScheduleRepository
         }, array_values($schedules));
     }
 
-    public function findAssignmentsForUserOnDate(
+    public function findIncompleteAssignmentsForUserDueOnOrBefore(
         User $user,
         DateTimeImmutable $date,
     ): array {
@@ -86,8 +86,7 @@ class FakeScheduleRepository implements ScheduleRepository
 
         foreach ($this->findAllForUser($user) as $schedule) {
             foreach ($schedule->getAssignments() as $assignment) {
-                if ($assignment->getScheduledDate()->format('Y-m-d')
+                if ($assignment->getScheduledDate() > $date
-                    !== $date->format('Y-m-d')
                     || $assignment->getCompletedAt() !== null
                 ) {
                     continue;
@@ -101,6 +100,37 @@ class FakeScheduleRepository implements ScheduleRepository
             }
         }
 
+        usort(
+            $assignments,
+            function (
+                AssignmentForDate $first,
+                AssignmentForDate $second,
+            ): int {
+                $firstAssignment = $first->getAssignment();
+                $secondAssignment = $second->getAssignment();
+                $dateComparison = $firstAssignment->getScheduledDate()
+                    <=> $secondAssignment->getScheduledDate();
+                if ($dateComparison !== 0) {
+                    return $dateComparison;
+                }
+
+                $scheduleComparison = $second->getScheduleId()
+                    <=> $first->getScheduleId();
+                if ($scheduleComparison !== 0) {
+                    return $scheduleComparison;
+                }
+
+                $positionComparison = $firstAssignment->getPosition()
+                    <=> $secondAssignment->getPosition();
+                if ($positionComparison !== 0) {
+                    return $positionComparison;
+                }
+
+                return $firstAssignment->getId()
+                    <=> $secondAssignment->getId();
+            },
+        );
+
         return $assignments;
     }
 

backend/tests/Feature/Schedule/ScheduleEndpointTest.php

@@ -225,7 +225,7 @@ class ScheduleEndpointTest extends TestCase
             ]);
     }
 
-    public function test_it_lists_the_users_assignments_for_a_date(): void
+    public function test_it_lists_the_users_assignments_due_through_a_date(): void
     {
         $user = $this->createUser('reader@example.com');
         $otherUser = $this->createUser('other@example.com');
@@ -255,8 +255,8 @@ class ScheduleEndpointTest extends TestCase
         $this->credentialedPost('/api/schedules', [
             'setId' => $olderSet->getId(),
             'levelId' => $olderLevel->getId(),
-            'startDate' => '2026-08-15',
+            'startDate' => '2026-08-14',
-            'targetDate' => '2026-08-15',
+            'targetDate' => '2026-08-14',
         ])->assertCreated();
         $this->credentialedPost('/api/schedules', [
             'setId' => $newerSet->getId(),
@@ -286,22 +286,9 @@ class ScheduleEndpointTest extends TestCase
             ->assertExactJson([
                 'date' => '2026-08-15',
                 'assignments' => [
-                    [
-                        'id' => 3,
-                        'schedule' => [
-                            'id' => 2,
-                            'set' => [
-                                'name' => 'Newer course',
-                            ],
-                        ],
-                        'element' => [
-                            'name' => 'Only chapter',
-                            'kind' => 'chapter',
-                            'path' => ['Only chapter'],
-                        ],
-                    ],
                     [
                         'id' => 1,
+                        'scheduledDate' => '2026-08-14',
                         'schedule' => [
                             'id' => 1,
                             'set' => [
@@ -316,6 +303,7 @@ class ScheduleEndpointTest extends TestCase
                     ],
                     [
                         'id' => 2,
+                        'scheduledDate' => '2026-08-14',
                         'schedule' => [
                             'id' => 1,
                             'set' => [
@@ -328,6 +316,21 @@ class ScheduleEndpointTest extends TestCase
                             'path' => ['Second lesson'],
                         ],
                     ],
+                    [
+                        'id' => 3,
+                        'scheduledDate' => '2026-08-15',
+                        'schedule' => [
+                            'id' => 2,
+                            'set' => [
+                                'name' => 'Newer course',
+                            ],
+                        ],
+                        'element' => [
+                            'name' => 'Only chapter',
+                            'kind' => 'chapter',
+                            'path' => ['Only chapter'],
+                        ],
+                    ],
                 ],
             ]);
     }

backend/tests/Unit/Schedule/UseCases/ListAssignmentsForDateTest.php

@@ -17,7 +17,7 @@ use Tests\Fakes\FakeScheduleRepository;
 
 class ListAssignmentsForDateTest extends TestCase
 {
-    public function test_it_lists_the_users_assignments_for_the_date(): void
+    public function test_it_lists_the_users_assignments_due_through_the_date(): void
     {
         $user = $this->user(1, 'reader@example.com');
         $otherUser = $this->user(2, 'other@example.com');
@@ -25,7 +25,7 @@ class ListAssignmentsForDateTest extends TestCase
         $olderSchedule = $repository->create($this->schedule(
             user: $user,
             setName: 'Older plan',
-            date: '2026-08-15',
+            date: '2026-08-14',
             assignmentNames: ['First', 'Second'],
         ));
         $repository->create($this->schedule(
@@ -37,7 +37,7 @@ class ListAssignmentsForDateTest extends TestCase
         $repository->create($this->schedule(
             user: $otherUser,
             setName: 'Private plan',
-            date: '2026-08-15',
+            date: '2026-08-13',
             assignmentNames: ['Hidden'],
         ));
         $repository->create($this->schedule(
@@ -61,18 +61,18 @@ class ListAssignmentsForDateTest extends TestCase
         );
 
         $this->assertSame(
-            ['Newer plan', 'Older plan'],
+            ['Older plan', 'Newer plan'],
             array_map(function ($assignment): string {
                 return $assignment->getSetName();
             }, $assignments),
         );
         $this->assertSame(
-            ['Third', 'Second'],
+            ['Second', 'Third'],
             array_map(function ($assignment): string {
                 return $assignment->getAssignment()->getName();
             }, $assignments),
         );
-        $this->assertSame(2, $assignments[0]->getScheduleId());
+        $this->assertSame(1, $assignments[0]->getScheduleId());
     }
 
     public function test_it_rejects_a_missing_date(): void

frontend/website/cypress/e2e/today-assignments.cy.ts

@@ -36,6 +36,7 @@ describe("today's assignments", () => {
           assignments: [
             {
               id: 12,
+              scheduledDate: '2026-08-13',
               schedule: {
                 id: 73,
                 set: { name: 'Bible' },
@@ -48,6 +49,7 @@ describe("today's assignments", () => {
             },
             {
               id: 13,
+              scheduledDate: browserToday,
               schedule: {
                 id: 81,
                 set: { name: 'Course' },
@@ -77,6 +79,16 @@ describe("today's assignments", () => {
       'have.length',
       2,
     )
+    cy.get('[data-today-assignment]')
+      .first()
+      .should('have.attr', 'data-today-assignment', '12')
+    cy.get('[data-today-assignment="12"] .today-assignment__overdue').should(
+      'have.text',
+      'Overdue · Due Aug 13, 2026',
+    )
+    cy.get('[data-today-assignment="13"] .today-assignment__overdue').should(
+      'not.exist',
+    )
     cy.contains('a', 'Genesis / Creation / Chapter 1')
       .should('contain.text', 'Bible')
       .and('have.attr', 'href', '/schedules/73')
@@ -109,7 +121,7 @@ describe("today's assignments", () => {
 
     cy.get('.today-assignments [role="status"]').should(
       'contain.text',
-      'Nothing is assigned for today.',
+      'Nothing is due today.',
     )
   })
 
@@ -121,6 +133,7 @@ describe("today's assignments", () => {
         assignments: [
           {
             id: 12,
+            scheduledDate: browserToday,
             schedule: {
               id: 73,
               set: { name: 'Bible' },
@@ -177,7 +190,7 @@ describe("today's assignments", () => {
     cy.get('[data-today-assignment="12"]').should('not.exist')
     cy.get('.today-assignments [role="status"]').should(
       'contain.text',
-      'Nothing is assigned for today.',
+      'Nothing is due today.',
     )
   })
 
@@ -219,7 +232,7 @@ describe("today's assignments", () => {
 
     cy.get('.today-assignments [role="status"]').should(
       'contain.text',
-      'Nothing is assigned for today.',
+      'Nothing is due today.',
     )
   })
 })

frontend/website/src/stores/schedules.ts

@@ -31,6 +31,7 @@ const scheduleAssignmentSchema = assignmentIdentitySchema.extend({
 })
 
 export const assignmentForDateSchema = assignmentIdentitySchema.extend({
+  scheduledDate: isoDateSchema,
   schedule: z.object({
     id: z.number().int().positive(),
     set: z.object({

frontend/website/src/views/DashboardView.vue

@@ -36,6 +36,14 @@ function formatDate(value: string): string {
   }).format(new Date(`${value}T00:00:00Z`))
 }
 
+function isOverdue(scheduledDate: string): boolean {
+  return scheduledDate < todayDate.value
+}
+
+function overdueLabel(scheduledDate: string): string {
+  return `Overdue · Due ${formatDate(scheduledDate)}`
+}
+
 async function completeAssignment(assignmentId: number): Promise<void> {
   await schedulesStore.setAssignmentCompleted(assignmentId, true)
 }
@@ -76,7 +84,7 @@ async function completeAssignment(assignmentId: number): Promise<void> {
       </div>
 
       <p v-else-if="assignmentsForDate.length === 0" class="today-state" role="status">
-        Nothing is assigned for today.
+        Nothing is due today.
       </p>
 
       <ul v-else class="today-assignment-list" aria-label="Today's assignments">
@@ -97,6 +105,12 @@ async function completeAssignment(assignmentId: number): Promise<void> {
                 <p>{{ assignment.schedule.set.name }}</p>
                 <span class="today-assignment__kind">{{ assignment.element.kind }}</span>
               </div>
+              <time
+                v-if="isOverdue(assignment.scheduledDate)"
+                class="today-assignment__overdue"
+                :datetime="assignment.scheduledDate"
+                v-text="overdueLabel(assignment.scheduledDate)"
+              ></time>
               <p class="today-assignment__path">
                 {{ assignment.element.path.join(' / ') }}
               </p>
@@ -390,6 +404,19 @@ async function completeAssignment(assignmentId: number): Promise<void> {
   text-transform: none;
 }
 
+.today-assignment__overdue {
+  display: inline-flex;
+  width: fit-content;
+  margin-top: 0.85rem;
+  padding: 0.3rem 0.55rem;
+  border-radius: 999px;
+  color: #923f31;
+  background: #f7e5dc;
+  font-size: 0.68rem;
+  font-weight: 800;
+  letter-spacing: 0.025em;
+}
+
 .today-assignment__path {
   margin: 1.75rem 0 0;
   color: #183029;