show overdue assignments today
This commit is contained in:
parent
7bc7ad207b
commit
93d2f4ebd6
7 changed files with 77 additions and 13 deletions
|
|
@ -249,6 +249,8 @@ class ScheduleController extends Controller
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'id' => $assignment->getId(),
|
'id' => $assignment->getId(),
|
||||||
|
'scheduledDate' => $assignment->getScheduledDate()
|
||||||
|
->format('Y-m-d'),
|
||||||
'schedule' => [
|
'schedule' => [
|
||||||
'id' => $assignmentForDate->getScheduleId(),
|
'id' => $assignmentForDate->getScheduleId(),
|
||||||
'set' => [
|
'set' => [
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ class EloquentScheduleRepository implements ScheduleRepository
|
||||||
return $schedules;
|
return $schedules;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findAssignmentsForUserOnDate(
|
public function findIncompleteAssignmentsForUserDueOnOrBefore(
|
||||||
User $user,
|
User $user,
|
||||||
DateTimeImmutable $date,
|
DateTimeImmutable $date,
|
||||||
): array {
|
): array {
|
||||||
|
|
@ -76,11 +76,14 @@ class EloquentScheduleRepository implements ScheduleRepository
|
||||||
'schedule_assignments.schedule_id',
|
'schedule_assignments.schedule_id',
|
||||||
)
|
)
|
||||||
->where('schedules.user_id', $user->getId())
|
->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')
|
->whereNull('schedule_assignments.completed_at')
|
||||||
->with('schedule')
|
->with('schedule')
|
||||||
|
->orderBy('schedule_assignments.scheduled_date')
|
||||||
->orderByDesc('schedules.id')
|
->orderByDesc('schedules.id')
|
||||||
->orderBy('schedule_assignments.position')
|
->orderBy('schedule_assignments.position')
|
||||||
->orderBy('schedule_assignments.id')
|
->orderBy('schedule_assignments.id')
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ interface ScheduleRepository
|
||||||
/**
|
/**
|
||||||
* @return list<AssignmentForDate>
|
* @return list<AssignmentForDate>
|
||||||
*/
|
*/
|
||||||
public function findAssignmentsForUserOnDate(
|
public function findIncompleteAssignmentsForUserDueOnOrBefore(
|
||||||
User $user,
|
User $user,
|
||||||
DateTimeImmutable $date,
|
DateTimeImmutable $date,
|
||||||
): array;
|
): array;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,8 @@ class ListAssignmentsForDate
|
||||||
{
|
{
|
||||||
$date = $this->parseDate($request->date);
|
$date = $this->parseDate($request->date);
|
||||||
|
|
||||||
return $this->scheduleRepository->findAssignmentsForUserOnDate(
|
return $this->scheduleRepository
|
||||||
|
->findIncompleteAssignmentsForUserDueOnOrBefore(
|
||||||
$request->user,
|
$request->user,
|
||||||
$date,
|
$date,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ class FakeScheduleRepository implements ScheduleRepository
|
||||||
}, array_values($schedules));
|
}, array_values($schedules));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findAssignmentsForUserOnDate(
|
public function findIncompleteAssignmentsForUserDueOnOrBefore(
|
||||||
User $user,
|
User $user,
|
||||||
DateTimeImmutable $date,
|
DateTimeImmutable $date,
|
||||||
): array {
|
): array {
|
||||||
|
|
@ -86,8 +86,7 @@ class FakeScheduleRepository implements ScheduleRepository
|
||||||
|
|
||||||
foreach ($this->findAllForUser($user) as $schedule) {
|
foreach ($this->findAllForUser($user) as $schedule) {
|
||||||
foreach ($schedule->getAssignments() as $assignment) {
|
foreach ($schedule->getAssignments() as $assignment) {
|
||||||
if ($assignment->getScheduledDate()->format('Y-m-d')
|
if ($assignment->getScheduledDate() > $date
|
||||||
!== $date->format('Y-m-d')
|
|
||||||
|| $assignment->getCompletedAt() !== null
|
|| $assignment->getCompletedAt() !== null
|
||||||
) {
|
) {
|
||||||
continue;
|
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;
|
return $assignments;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ const scheduleAssignmentSchema = assignmentIdentitySchema.extend({
|
||||||
})
|
})
|
||||||
|
|
||||||
export const assignmentForDateSchema = assignmentIdentitySchema.extend({
|
export const assignmentForDateSchema = assignmentIdentitySchema.extend({
|
||||||
|
scheduledDate: isoDateSchema,
|
||||||
schedule: z.object({
|
schedule: z.object({
|
||||||
id: z.number().int().positive(),
|
id: z.number().int().positive(),
|
||||||
set: z.object({
|
set: z.object({
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,14 @@ function formatDate(value: string): string {
|
||||||
}).format(new Date(`${value}T00:00:00Z`))
|
}).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> {
|
async function completeAssignment(assignmentId: number): Promise<void> {
|
||||||
await schedulesStore.setAssignmentCompleted(assignmentId, true)
|
await schedulesStore.setAssignmentCompleted(assignmentId, true)
|
||||||
}
|
}
|
||||||
|
|
@ -76,7 +84,7 @@ async function completeAssignment(assignmentId: number): Promise<void> {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p v-else-if="assignmentsForDate.length === 0" class="today-state" role="status">
|
<p v-else-if="assignmentsForDate.length === 0" class="today-state" role="status">
|
||||||
Nothing is assigned for today.
|
Nothing is due today.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<ul v-else class="today-assignment-list" aria-label="Today's assignments">
|
<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>
|
<p>{{ assignment.schedule.set.name }}</p>
|
||||||
<span class="today-assignment__kind">{{ assignment.element.kind }}</span>
|
<span class="today-assignment__kind">{{ assignment.element.kind }}</span>
|
||||||
</div>
|
</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">
|
<p class="today-assignment__path">
|
||||||
{{ assignment.element.path.join(' / ') }}
|
{{ assignment.element.path.join(' / ') }}
|
||||||
</p>
|
</p>
|
||||||
|
|
@ -390,6 +404,19 @@ async function completeAssignment(assignmentId: number): Promise<void> {
|
||||||
text-transform: none;
|
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 {
|
.today-assignment__path {
|
||||||
margin: 1.75rem 0 0;
|
margin: 1.75rem 0 0;
|
||||||
color: #183029;
|
color: #183029;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue