Merge pull request #54 from mihaisolomon/feature/timesheet-dashboard

heloufir · web-flow · commit d2ff6e21c6cd · 2023-01-26T11:10:42.000+01:00
diff --git a/app/Filament/Widgets/Timesheet/ActivitiesReport.php b/app/Filament/Widgets/Timesheet/ActivitiesReport.php
@@ -20,7 +20,7 @@ class ActivitiesReport extends BarChartWidget
     ];
 
     public ?string $filter = '2023';
-    
+
     protected function getHeading(): string
     {
         return __('Logged time by activity');
@@ -68,7 +68,7 @@ protected function getDatasets(Collection $collection): array
 
         foreach ($collection as $item) {
             $datasets['sets'][] = $item->value;
-            $datasets['labels'][] = $item->activity->name;
+            $datasets['labels'][] = $item->activity?->name ?? __('No activity');
         }
 
         return $datasets;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ActivitiesReport extends BarChartWidget`
`20`	`20`	`];`
`21`	`21`
`22`	`22`	`public ?string $filter = '2023';`
`23`		`-`
	`23`	`+`
`24`	`24`	`protected function getHeading(): string`
`25`	`25`	`{`
`26`	`26`	`return __('Logged time by activity');`
`@@ -68,7 +68,7 @@ protected function getDatasets(Collection $collection): array`
`68`	`68`
`69`	`69`	`foreach ($collection as $item) {`
`70`	`70`	`$datasets['sets'][] = $item->value;`
`71`		`- $datasets['labels'][] = $item->activity->name;`
	`71`	`+ $datasets['labels'][] = $item->activity?->name ?? __('No activity');`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`return $datasets;`