refactor blades

This commit is contained in:
2025-02-05 13:36:40 +03:30
parent 05f6e42a80
commit 943b2dbb93
9 changed files with 170 additions and 190 deletions

View File

@@ -17,18 +17,18 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class CountryActivityPerItemReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings
{
public function __construct(private ?array $activities){}
public function __construct(private ?array $data){}
public function view(): View
{
$activities = $this->activities;
$fromDate = $activities['fromDate'] ?? '2021-03-21 00:00:00';
$toDate = $activities['toDate'] ?? \Carbon\Carbon::now();
$data = $this->data;
return view('v3.Reports.RoadItems.CountryActivityPerItem', [
'activities' => $activities['data'],
'fromDate' => $fromDate,
'toDate' => $toDate
'data' => $data['activities']['data'],
'provinces' => $data['provinces'],
'items' => $data['items'],
'fromDate' => $data['activities']['fromDate'],
'toDate' => $data['activities']['toDate']
]);
}

View File

@@ -6,6 +6,7 @@ use App\Models\Province;
use App\Models\RoadItemsProject;
use Carbon\Carbon;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\DB;
use Maatwebsite\Excel\Concerns\FromView;
use Maatwebsite\Excel\Concerns\ShouldAutoSize;
@@ -17,7 +18,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class OperatorCartableReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings
{
public function __construct(private ?string $data){}
public function __construct(private ?Collection $data){}
public function view(): View
{

View File

@@ -17,18 +17,18 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings
{
public function __construct(private ?array $activities){}
public function __construct(private ?array $data){}
public function view(): View
{
$activities = $this->activities;
$fromDate = $activities['fromDate'] ?? '2021-03-21 00:00:00';
$toDate = $activities['toDate'] ?? \Carbon\Carbon::now();
$data = $this->data;
return view('v3.Reports.RoadItems.ProvinceActivityPerItem', [
'activitis' => $activities['data'],
'fromDate' => $fromDate,
'toDate' => $toDate
'data' => $data['activities']['data'],
'edarateShahri' => $data['edarateShahri'],
'items' => $data['items'],
'fromDate' => $data['activities']['fromDate'],
'toDate' => $data['activities']['toDate']
]);
}

View File

@@ -6,6 +6,7 @@ use App\Models\Province;
use App\Models\RoadItemsProject;
use Carbon\Carbon;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\DB;
use Maatwebsite\Excel\Concerns\FromView;
use Maatwebsite\Excel\Concerns\ShouldAutoSize;
@@ -17,7 +18,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class SupervisorCartableReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings
{
public function __construct(private ?string $data){}
public function __construct(private ?Collection $data){}
public function view(): View
{