updated folder colors, reordering, new todo page, updated sidebar
tests / ci (push) Canceled after 0s
tests / ci (push) Canceled after 0s
This commit is contained in:
@@ -16,17 +16,23 @@ use Illuminate\Support\Collection;
|
||||
* @property int $id
|
||||
* @property int $user_id
|
||||
* @property string $name
|
||||
* @property string|null $color
|
||||
* @property int|null $parent_id
|
||||
* @property Folder|null $parent
|
||||
* @property Carbon|null $created_at
|
||||
* @property Carbon|null $updated_at
|
||||
*/
|
||||
#[Fillable(['user_id', 'name', 'parent_id'])]
|
||||
#[Fillable(['user_id', 'name', 'parent_id', 'color'])]
|
||||
class Folder extends Model
|
||||
{
|
||||
/** @use HasFactory<FolderFactory> */
|
||||
use HasFactory;
|
||||
|
||||
public const COLORS = [
|
||||
'zinc', 'red', 'orange', 'amber', 'green', 'emerald',
|
||||
'sky', 'blue', 'indigo', 'violet', 'fuchsia', 'pink',
|
||||
];
|
||||
|
||||
/** @return BelongsTo<User, $this> */
|
||||
public function user(): BelongsTo
|
||||
{
|
||||
|
||||
+32
-1
@@ -18,13 +18,14 @@ use Illuminate\Support\Carbon;
|
||||
* @property string $description
|
||||
* @property string|null $notes
|
||||
* @property TodoStatus $status
|
||||
* @property int|null $position
|
||||
* @property Carbon|null $due_date
|
||||
* @property Carbon|null $completed_at
|
||||
* @property Folder $folder
|
||||
* @property Carbon|null $created_at
|
||||
* @property Carbon|null $updated_at
|
||||
*/
|
||||
#[Fillable(['user_id', 'folder_id', 'description', 'notes', 'status', 'due_date', 'completed_at'])]
|
||||
#[Fillable(['user_id', 'folder_id', 'description', 'notes', 'status', 'position', 'due_date', 'completed_at'])]
|
||||
class Todo extends Model
|
||||
{
|
||||
/** @use HasFactory<TodoFactory> */
|
||||
@@ -101,6 +102,7 @@ class Todo extends Model
|
||||
return $query->incomplete()->whereNotIn('status', [
|
||||
TodoStatus::Cancelled->value,
|
||||
TodoStatus::Deferred->value,
|
||||
TodoStatus::Completed->value,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -125,4 +127,33 @@ class Todo extends Model
|
||||
{
|
||||
return $query->active()->whereDate('due_date', today());
|
||||
}
|
||||
|
||||
public function scopePriority(Builder $query): Builder
|
||||
{
|
||||
return $query
|
||||
->orderByRaw('completed_at IS NOT NULL')
|
||||
->orderByRaw('position IS NULL')
|
||||
->orderBy('position')
|
||||
->orderByDesc('id');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the position to assign to a new todo so it appears at the top of the
|
||||
* priority order for the given user.
|
||||
*/
|
||||
public static function nextPositionFor(User|int $user): int
|
||||
{
|
||||
$min = static::query()->forUser($user)->min('position');
|
||||
|
||||
return $min === null ? 1 : $min - 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the number of days between creation and completion, or null when the
|
||||
* todo has not been completed.
|
||||
*/
|
||||
public function daysToComplete(): ?int
|
||||
{
|
||||
return $this->completed_at === null ? null : $this->created_at->diffInDays($this->completed_at);
|
||||
}
|
||||
}
|
||||
|
||||
+4
-1
@@ -10,6 +10,7 @@ enum TodoStatus: string
|
||||
case Blocked = 'blocked';
|
||||
case Cancelled = 'cancelled';
|
||||
case Deferred = 'deferred';
|
||||
case Completed = 'completed';
|
||||
|
||||
/**
|
||||
* Get the human-friendly label for the status.
|
||||
@@ -23,6 +24,7 @@ enum TodoStatus: string
|
||||
self::Blocked => 'Blocked',
|
||||
self::Cancelled => 'Cancelled',
|
||||
self::Deferred => 'Deferred',
|
||||
self::Completed => 'Completed',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,6 +40,7 @@ enum TodoStatus: string
|
||||
self::Blocked => 'red',
|
||||
self::Cancelled => 'zinc',
|
||||
self::Deferred => 'purple',
|
||||
self::Completed => 'emerald',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -46,6 +49,6 @@ enum TodoStatus: string
|
||||
*/
|
||||
public function isTerminal(): bool
|
||||
{
|
||||
return in_array($this, [self::Cancelled, self::Deferred], true);
|
||||
return in_array($this, [self::Cancelled, self::Deferred, self::Completed], true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user