Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portabilis patch 03/12/2024 #981

Merged
merged 10 commits into from
Dec 3, 2024
Merged

Portabilis patch 03/12/2024 #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ea0a7c3
Melhora e corrige função de formatar carga horária
robertfsousa Nov 21, 2024
f748535
Merge pull request #9918 from portabilis/issue-5215
robertfsousa Nov 25, 2024
f06b07f
Melhora função de formatação da nota
robertfsousa Nov 26, 2024
94684f5
Incrementa versão dos assets
robertfsousa Nov 26, 2024
682046b
Evita erro ao abrir detalhes da turma
edineivaldameri Nov 26, 2024
4ff3b9f
Merge pull request #9920 from portabilis/honey-114752948
edineivaldameri Nov 28, 2024
70b3906
Style code
robertfsousa Nov 29, 2024
43966b1
Merge pull request #9919 from portabilis/issue-5221
robertfsousa Nov 29, 2024
214583f
Merge branch 'main' into portabilis-patch-2024-12-03
edersoares Dec 3, 2024
9a5b247
Version
edersoares Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions app/Services/Reports/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,25 @@ public static function sumTimes(array|Collection|null $times): string

public static function formatWorkload(?float $workload): string
{
if ($workload) {
$hour = (int) $workload;
$workload -= $hour;
$minutes = round($workload * 60);
if ($minutes < 10) {
$minutes = '0' . $minutes;
if ($workload !== null) {
$hours = (int)$workload;
$minutes = (int)round(($workload - $hours) * 60);
if ($minutes === 60) {
$hours++;
$minutes = 0;
}

if ($hour < 10) {
$hour = '0' . $hour;
}

return $hour . ':' . $minutes;
return sprintf('%02d:%02d', $hours, $minutes);
}

return '00:00';
}

public static function format(mixed $value, ?int $decimalPlaces = null): string
{
$value = str_replace(',', '.', (string) $value);
$value = bcdiv($value, '1', $decimalPlaces ?? 1);

return number_format($value, $decimalPlaces ?? 1, ',', '.');
}

Expand Down
Loading
Loading