#39 - cr fixes
This commit is contained in:
@@ -48,6 +48,6 @@ enum Month: string
|
||||
|
||||
public static function fromNameOrCurrent(string $name): Month
|
||||
{
|
||||
return Month::tryFrom($name) ?? Month::current();
|
||||
return Month::tryFrom($name) ?? Month::current();
|
||||
}
|
||||
}
|
||||
|
@@ -7,6 +7,7 @@ namespace Toby\Domain;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
|
||||
use Toby\Eloquent\Models\User;
|
||||
|
||||
class TimesheetExport implements WithMultipleSheets
|
||||
{
|
||||
@@ -15,13 +16,9 @@ class TimesheetExport implements WithMultipleSheets
|
||||
|
||||
public function sheets(): array
|
||||
{
|
||||
$sheets = [];
|
||||
|
||||
foreach ($this->users as $user) {
|
||||
$sheets[] = new TimesheetPerUserSheet($user, $this->month);
|
||||
}
|
||||
|
||||
return $sheets;
|
||||
return $this->users
|
||||
->map(fn(User $user) => new TimesheetPerUserSheet($user, $this->month))
|
||||
->toArray();
|
||||
}
|
||||
|
||||
public function forUsers(Collection $users): static
|
||||
|
@@ -35,6 +35,8 @@ class TimesheetPerUserSheet implements WithTitle, WithHeadings, WithEvents, With
|
||||
use RegistersEventListeners;
|
||||
|
||||
protected const HOURS_PER_DAY = 8;
|
||||
protected const START_HOUR = 8;
|
||||
protected const END_HOUR = 16;
|
||||
|
||||
public function __construct(
|
||||
protected User $user,
|
||||
@@ -79,8 +81,8 @@ class TimesheetPerUserSheet implements WithTitle, WithHeadings, WithEvents, With
|
||||
$row = [
|
||||
Date::dateTimeToExcel($day),
|
||||
$day->translatedFormat("l"),
|
||||
$workedThisDay ? $this->toExcelTime(Carbon::createFromTime(8)) : null,
|
||||
$workedThisDay ? $this->toExcelTime(Carbon::createFromTime(16)) : null,
|
||||
$workedThisDay ? $this->toExcelTime(Carbon::createFromTime(static::START_HOUR)) : null,
|
||||
$workedThisDay ? $this->toExcelTime(Carbon::createFromTime(static::END_HOUR)) : null,
|
||||
$workedThisDay ? static::HOURS_PER_DAY : null,
|
||||
];
|
||||
|
||||
|
Reference in New Issue
Block a user