Skip to content

Commit a40abd6

Browse files
atmonshiatmonshi
authored
Merge pull request #4 from lara-zeus/int-display-progress
Refactor progress components to use a new Progress class and display progress as Int
2 parents 356034e + 83a2428 commit a40abd6

File tree

10 files changed

+122
-146
lines changed

10 files changed

+122
-146
lines changed

‎resources/views/infolists/components/circle-progress-entry.blade.php‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
11
<x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
22
@php
3-
$total = $getState()['total'];
4-
$progress = $getState()['progress'];
5-
$progress = $total > 0 ? ($progress / $total) * 100 : 0;
6-
7-
if($progress === 100){
8-
$progressColor = '#2980b9';
9-
} else if($progress > 50){
10-
$progressColor = '#27ae60';
11-
} else if($progress > 25){
12-
$progressColor = '#f39c12';
13-
} else {
14-
$progressColor = '#e74c3c';
15-
}
16-
17-
$displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
3+
$data = $column->getProgressData($getState());
184
@endphp
19-
5+
206
<div class="progress-circle" style="
217
background: conic-gradient(
22-
{{ $progressColor }} {{ $displayProgress * 3.6 }}deg,
23-
#e5e7eb {{ $displayProgress * 3.6 }}deg
8+
{{ $data['progressColor'] }} {{ $data['displayProgress'] * 3.6 }}deg,
9+
#e5e7eb {{ $data['displayProgress'] * 3.6 }}deg
2410
);">
2511
@if($entry instanceof \LaraZeus\Progress\Infolists\Components\CircleProgressEntry && $entry->getCanShow())
26-
<small>{{ $displayProgress }}%</small>
12+
<small>{{ $data['displayProgress'] }}%</small>
2713
@endif
2814
</div>
29-
15+
3016
<style>
3117
.progress-circle {
3218
position: relative;

‎resources/views/infolists/components/progress-bar-entry.blade.php‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
11
<x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
22
@php
3-
$total = $getState()['total'];
4-
$progress = $getState()['progress'];
5-
$progress = $total > 0 ? ($progress / $total) * 100 : 0;
6-
7-
if($progress === 100){
8-
$progressColor = '#2980b9';
9-
} else if($progress > 50){
10-
$progressColor = '#27ae60';
11-
} else if($progress > 25){
12-
$progressColor = '#f39c12';
13-
} else {
14-
$progressColor = '#e74c3c';
15-
}
16-
17-
$displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
3+
$data = $column->getProgressData($getState());
184
@endphp
195

206
<div class="progress-container">
21-
<div class="progress-bar" style="width: {{ $displayProgress }}%; background-color: {{ $progressColor }};"></div>
7+
<div class="progress-bar" style="width: {{ $data['displayProgress'] }}%; background-color: {{ $data['progressColor'] }};"></div>
228
<div class="progress-text">
239
@if($entry instanceof \LaraZeus\Progress\Infolists\Components\ProgressBarEntry && $entry->getCanShow())
2410
<small @class([
25-
'text-gray-700' => $displayProgress != 100,
26-
'text-white' => $displayProgress == 100
11+
'text-gray-700' => $data['displayProgress'] != 100,
12+
'text-white' => $data['displayProgress'] == 100
2713
])>
28-
{{ $displayProgress }}%
14+
{{ $data['displayProgress'] }}%
2915
</small>
3016
@endif
3117
</div>

‎resources/views/tables/columns/circle-progress.blade.php‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
11
@php
2-
$total = $getState()['total'];
3-
$progress = $getState()['progress'];
4-
$progress = $total > 0 ? ($progress / $total) * 100 : 0;
5-
6-
if($progress === 100){
7-
$progressColor = '#2980b9';
8-
} else if($progress > 50){
9-
$progressColor = '#27ae60';
10-
} else if($progress > 25){
11-
$progressColor = '#f39c12';
12-
} else {
13-
$progressColor = '#e74c3c';
14-
}
15-
16-
$displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
2+
$data = $column->getProgressData($getState());
173
@endphp
184

195
<div class="progress-circle" style="
206
background: conic-gradient(
21-
{{ $progressColor }} {{ $displayProgress * 3.6 }}deg,
22-
#e5e7eb {{ $displayProgress * 3.6 }}deg
7+
{{ $data['progressColor'] }} {{ $data['displayProgress'] * 3.6 }}deg,
8+
#e5e7eb {{ $data['displayProgress'] * 3.6 }}deg
239
);">
2410
@if($column instanceof \LaraZeus\Progress\Tables\Columns\CircleProgress && $column->getCanShow())
25-
<small>{{ $displayProgress }}%</small>
11+
<small>{{ $data['displayProgress'] }}%</small>
2612
@endif
2713
</div>
2814

@@ -55,4 +41,4 @@
5541
font-size: 8pt;
5642
z-index: 2;
5743
}
58-
</style>
44+
</style>

‎resources/views/tables/columns/progress-bar.blade.php‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
11
@php
2-
$total = $getState()['total'];
3-
$progress = $getState()['progress'];
4-
$progress = $total > 0 ? ($progress / $total) * 100 : 0;
5-
6-
if($progress === 100){
7-
$progressColor = '#2980b9';
8-
} else if($progress > 50){
9-
$progressColor = '#27ae60';
10-
} else if($progress > 25){
11-
$progressColor = '#f39c12';
12-
} else {
13-
$progressColor = '#e74c3c';
14-
}
15-
16-
$displayProgress = $progress === 100 ? number_format($progress, 0) : number_format($progress, 2);
2+
$data = $column->getProgressData($getState());
173
@endphp
184

195
<div class="progress-container">
20-
<div class="progress-bar" style="width: {{ $displayProgress }}%; background-color: {{ $progressColor }};"></div>
6+
<div class="progress-bar" style="width: {{ $data['displayProgress'] }}%; background-color: {{ $data['progressColor'] }};"></div>
217
<div class="progress-text">
228
@if($column instanceof \LaraZeus\Progress\Tables\Columns\ProgressBar && $column->getCanShow())
239
<small @class([
24-
'text-gray-700' => $displayProgress !== 100,
25-
'text-white' => $displayProgress === 100
10+
'text-gray-700' => $data['displayProgress'] !== 100,
11+
'text-white' => $data['displayProgress'] === 100
2612
])>
27-
{{ $displayProgress }}%
13+
{{ $data['displayProgress'] }}%
2814
</small>
2915
@endif
3016
</div>
@@ -77,4 +63,4 @@
7763
background-position: 0 0;
7864
}
7965
}
80-
</style>
66+
</style>

‎src/Infolists/Components/CircleProgressEntry.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22

33
namespace LaraZeus\Progress\Infolists\Components;
44

5-
use Filament\Infolists\Components\Entry;
6-
7-
class CircleProgressEntry extends Entry
5+
class CircleProgressEntry extends ProgressEntry
86
{
9-
protected bool $canShow = true;
10-
117
protected string $view = 'lara-zeus-progress::infolists.components.circle-progress-entry';
12-
13-
public function hideProgressValue($canShow = false): static
14-
{
15-
$this->canShow = $canShow;
16-
17-
return $this;
18-
}
19-
20-
public function getCanShow(): bool
21-
{
22-
return $this->canShow;
23-
}
248
}

‎src/Infolists/Components/ProgressBarEntry.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22

33
namespace LaraZeus\Progress\Infolists\Components;
44

5-
use Filament\Infolists\Components\Entry;
6-
7-
class ProgressBarEntry extends Entry
5+
class ProgressBarEntry extends ProgressEntry
86
{
9-
protected bool $canShow = true;
10-
117
protected string $view = 'lara-zeus-progress::infolists.components.progress-bar-entry';
12-
13-
public function hideProgressValue($canShow = false): static
14-
{
15-
$this->canShow = $canShow;
16-
17-
return $this;
18-
}
19-
20-
public function getCanShow(): bool
21-
{
22-
return $this->canShow;
23-
}
248
}

‎src/Infolists/Components/ProgressEntry.php‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
namespace LaraZeus\Progress\Infolists\Components;
4+
5+
use Filament\Infolists\Components\Entry;
6+
7+
class ProgressEntry extends Entry
8+
{
9+
protected bool $canShow = true;
10+
11+
protected string $view = 'lara-zeus-progress::infolists.components.circle-progress-entry';
12+
13+
public function hideProgressValue($canShow = false): static
14+
{
15+
$this->canShow = $canShow;
16+
17+
return $this;
18+
}
19+
20+
public function getCanShow(): bool
21+
{
22+
return $this->canShow;
23+
}
24+
25+
public function getProgressData(array $state): array
26+
{
27+
$total = $state['total'] ?? 0;
28+
$progress = $state['progress'] ?? 0;
29+
$progress = $total > 0 ? ($progress / $total) * 100 : 0;
30+
31+
if ($progress === 100) {
32+
$progressColor = '#2980b9';
33+
} elseif ($progress > 50) {
34+
$progressColor = '#27ae60';
35+
} elseif ($progress > 25) {
36+
$progressColor = '#f39c12';
37+
} else {
38+
$progressColor = '#e74c3c';
39+
}
40+
41+
$displayProgress = number_format($progress);
42+
43+
return [
44+
'progress' => $progress,
45+
'progressColor' => $progressColor,
46+
'displayProgress' => $displayProgress,
47+
];
48+
}
49+
}

‎src/Tables/Columns/CircleProgress.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22

33
namespace LaraZeus\Progress\Tables\Columns;
44

5-
use Filament\Tables\Columns\Column;
6-
7-
class CircleProgress extends Column
5+
class CircleProgress extends Progress
86
{
9-
protected bool $canShow = true;
10-
117
protected string $view = 'lara-zeus-progress::tables.columns.circle-progress';
12-
13-
public function hideProgressValue($canShow = false): static
14-
{
15-
$this->canShow = $canShow;
16-
17-
return $this;
18-
}
19-
20-
public function getCanShow(): bool
21-
{
22-
return $this->canShow;
23-
}
248
}

‎src/Tables/Columns/Progress.php‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
3+
namespace LaraZeus\Progress\Tables\Columns;
4+
5+
use Filament\Tables\Columns\Column;
6+
7+
class Progress extends Column
8+
{
9+
protected bool $canShow = true;
10+
11+
public function hideProgressValue($canShow = false): static
12+
{
13+
$this->canShow = $canShow;
14+
15+
return $this;
16+
}
17+
18+
public function getCanShow(): bool
19+
{
20+
return $this->canShow;
21+
}
22+
23+
public function getProgressData(array $state): array
24+
{
25+
$total = $state['total'] ?? 0;
26+
$progress = $state['progress'] ?? 0;
27+
$progress = $total > 0 ? ($progress / $total) * 100 : 0;
28+
29+
if ($progress === 100) {
30+
$progressColor = '#2980b9';
31+
} elseif ($progress > 50) {
32+
$progressColor = '#27ae60';
33+
} elseif ($progress > 25) {
34+
$progressColor = '#f39c12';
35+
} else {
36+
$progressColor = '#e74c3c';
37+
}
38+
39+
$displayProgress = number_format($progress);
40+
41+
return [
42+
'progress' => $progress,
43+
'progressColor' => $progressColor,
44+
'displayProgress' => $displayProgress,
45+
];
46+
}
47+
}

‎src/Tables/Columns/ProgressBar.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22

33
namespace LaraZeus\Progress\Tables\Columns;
44

5-
use Filament\Tables\Columns\Column;
6-
7-
class ProgressBar extends Column
5+
class ProgressBar extends Progress
86
{
9-
protected bool $canShow = true;
10-
117
protected string $view = 'lara-zeus-progress::tables.columns.progress-bar';
12-
13-
public function hideProgressValue($canShow = false): static
14-
{
15-
$this->canShow = $canShow;
16-
17-
return $this;
18-
}
19-
20-
public function getCanShow(): bool
21-
{
22-
return $this->canShow;
23-
}
248
}

0 commit comments

Comments
 (0)