Unwanted white space in shift resource
This commit is contained in:
@@ -282,34 +282,32 @@ class ShiftResource extends Resource
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected static function calculateEndTime(?string $startTime, ?string $duration): ?string
|
protected static function calculateEndTime(?string $startTime, ?string $duration): ?string
|
||||||
{
|
{
|
||||||
if (!$startTime || !$duration) {
|
if (!$startTime || !$duration) {
|
||||||
return null;
|
return null;
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Convert start_time to Carbon instance
|
|
||||||
$startTimeCarbon = Carbon::createFromFormat('H:i:s', $startTime);
|
|
||||||
|
|
||||||
// Ensure duration is in a valid numeric format
|
|
||||||
$duration = str_replace(',', '.', $duration); // Handle decimal formats
|
|
||||||
if (!is_numeric($duration)) {
|
|
||||||
return null; // Invalid duration format
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract hours and minutes correctly
|
try {
|
||||||
[$hours, $decimalMinutes] = explode('.', $duration) + [0, 0]; // Ensure two parts
|
// Convert start_time to Carbon instance
|
||||||
$hours = (int) $hours; // Convert to integer hours
|
$startTimeCarbon = Carbon::createFromFormat('H:i:s', $startTime);
|
||||||
$minutes = (int) $decimalMinutes; // Directly use decimal part as minutes
|
|
||||||
|
|
||||||
// Calculate end time
|
// Ensure duration is in a valid numeric format
|
||||||
$endTimeCarbon = $startTimeCarbon->addHours($hours)->addMinutes($minutes);
|
$duration = str_replace(',', '.', $duration); // Handle decimal formats
|
||||||
|
if (!is_numeric($duration)) {
|
||||||
|
return null; // Invalid duration format
|
||||||
|
}
|
||||||
|
|
||||||
return $endTimeCarbon->format('H:i:s'); // Return formatted end time
|
// Extract hours and minutes correctly
|
||||||
} catch (\Exception $e) {
|
[$hours, $decimalMinutes] = explode('.', $duration) + [0, 0]; // Ensure two parts
|
||||||
return null;
|
$hours = (int) $hours; // Convert to integer hours
|
||||||
|
$minutes = (int) $decimalMinutes; // Directly use decimal part as minutes
|
||||||
|
|
||||||
|
// Calculate end time
|
||||||
|
$endTimeCarbon = $startTimeCarbon->addHours($hours)->addMinutes($minutes);
|
||||||
|
|
||||||
|
return $endTimeCarbon->format('H:i:s'); // Return formatted end time
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user