- @forelse ($incidents as $date => $incident)
-
- @empty
-
- {{ __('No incidents reported between :from and :to.', ['from' => $from, 'to' => $to]) }}
+ @foreach ($incidents as $date => $incident)
+
+
+
+
+ @if(count($incident) === 0 && count($schedules[$date]) === 0)
+
+
+
+ {{ __('No incidents reported.') }}
+
+
+
+ @endif
+ @endforeach
- @endforelse
diff --git a/resources/views/status-page/index.blade.php b/resources/views/status-page/index.blade.php
index 5fef4e98..6d076988 100644
--- a/resources/views/status-page/index.blade.php
+++ b/resources/views/status-page/index.blade.php
@@ -18,7 +18,7 @@
@endif
-
+
diff --git a/src/Models/Schedule.php b/src/Models/Schedule.php
index bbbb5b2f..492e67f1 100644
--- a/src/Models/Schedule.php
+++ b/src/Models/Schedule.php
@@ -4,6 +4,7 @@
use Cachet\Database\Factories\ScheduleFactory;
use Cachet\Enums\ScheduleStatusEnum;
+use Cachet\Filament\Resources\ScheduleResource;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\Factory;
@@ -113,6 +114,19 @@ public function scopeInThePast(Builder $query): Builder
return $query->where('completed_at', '<=', Carbon::now());
}
+ /**
+ * Get the URL to the schedule page within the dashboard.
+ */
+ public function filamentDashboardEditUrl(): string
+ {
+ return ScheduleResource::getUrl(name: 'edit', parameters: ['record' => $this->id]);
+ }
+
+ public function timestamp(): Attribute
+ {
+ return Attribute::get(fn () => $this->completed_at ?: $this->scheduled_at);
+ }
+
/**
* Create a new factory instance for the model.
*/
diff --git a/src/View/Components/IncidentTimeline.php b/src/View/Components/Timeline.php
similarity index 65%
rename from src/View/Components/IncidentTimeline.php
rename to src/View/Components/Timeline.php
index c9cfeab6..6921a4d0 100644
--- a/src/View/Components/IncidentTimeline.php
+++ b/src/View/Components/Timeline.php
@@ -3,6 +3,7 @@
namespace Cachet\View\Components;
use Cachet\Models\Incident;
+use Cachet\Models\Schedule;
use Cachet\Settings\AppSettings;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Builder;
@@ -10,7 +11,7 @@
use Illuminate\Support\Collection;
use Illuminate\View\Component;
-class IncidentTimeline extends Component
+class Timeline extends Component
{
public function __construct(private AppSettings $appSettings)
{
@@ -23,12 +24,17 @@ public function render(): View
$startDate = Carbon::createFromFormat('Y-m-d', request('from', now()->toDateString()));
$endDate = $startDate->clone()->subDays($incidentDays);
- return view('cachet::components.incident-timeline', [
+ return view('cachet::components.timeline', [
'incidents' => $this->incidents(
$startDate,
$endDate,
$this->appSettings->only_disrupted_days
),
+ 'schedules' => $this->schedules(
+ $startDate,
+ $endDate,
+ $this->appSettings->only_disrupted_days
+ ),
'from' => $startDate->toDateString(),
'to' => $endDate->toDateString(),
'nextPeriodFrom' => $startDate->clone()->subDays($incidentDays + 1)->toDateString(),
@@ -72,4 +78,33 @@ private function incidents(Carbon $startDate, Carbon $endDate, bool $onlyDisrupt
->when($onlyDisruptedDays, fn ($collection) => $collection->filter(fn ($incidents) => $incidents->isNotEmpty()))
->sortKeysDesc();
}
+
+ /**
+ * Fetch the schedules that occurred between the given start and end date.
+ * Schedules will be grouped by days.
+ */
+ private function schedules(Carbon $startDate, Carbon $endDate, bool $onlyDisruptedDays = false): Collection
+ {
+ return Schedule::query()
+ ->with([
+ 'components',
+ ])
+ ->where(function (Builder $query) use ($endDate, $startDate) {
+ $query->whereBetween('completed_at', [
+ $endDate->startOfDay()->toDateTimeString(),
+ $startDate->endofDay()->toDateTimeString(),
+ ]);
+ })
+ ->orderBy('completed_at', 'desc')
+ ->get()
+ ->groupBy(fn (Schedule $schedule) => $schedule->completed_at->toDateString())
+ ->union(
+ // Back-fill any missing dates...
+ collect($endDate->toPeriod($startDate))
+ ->keyBy(fn ($period) => $period->toDateString())
+ ->map(fn ($period) => collect())
+ )
+ ->when($onlyDisruptedDays, fn ($collection) => $collection->filter(fn ($schedules) => $schedules->isNotEmpty()))
+ ->sortKeysDesc();
+ }
}