move list to reports (#2)

code4romania · Oct 31, 2023 · 85644ef · 85644ef
1 parent 217f73a
commit 85644ef
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 17 deletions.
diff --git a/app/Filament/Resources/ReportsResource/Pages/GenerateReport.php b/app/Filament/Resources/ReportsResource/Pages/GenerateReport.php
@@ -16,11 +16,12 @@
 use App\Models\MapPointType as MapPointTypeModel;
 use App\Models\RecycleMaterial as RecycleMaterialModel;
 use App\Models\Report;
+use Filament\Actions\Action;
 use Filament\Actions\Action as FormAction;
 use Filament\Actions\Contracts\HasActions;
+// use Filament\Resources\Pages\CreateRecord;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Radio;
-// use Filament\Resources\Pages\CreateRecord;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
@@ -37,6 +38,7 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 use Maatwebsite\Excel\Facades\Excel;
 
 class GenerateReport extends Page implements HasForms, WithTabs, HasTable, HasActions
@@ -72,6 +74,14 @@ public function mount(): void
         $this->data['is_grouped'] = false;
     }
 
+    protected function getHeaderActions(): array
+    {
+        return [
+            Action::make('view_list')->label(__('report.action.view_list'))->url('/admin/reports'),
+
+        ];
+    }
+
     protected function authorizeAccess(): void
     {
         static::authorizeResourceAccess();
@@ -385,7 +395,7 @@ public function table(Table $table): Table
                 {
                     $report = new Report();
                     $report->form_data = $this->data;
-                    $report->results = $this->getEloquentQuery()->get();
+                    $report->results = $this->formatResults($this->getEloquentQuery()->get());
                     $report->title = $data['title'];
                     $report->save();
                     Notification::make()
@@ -432,4 +442,27 @@ public function table(Table $table): Table
 			]);
         // ->view('filament-tables::index');
     }
+
+    public function formatResults(Collection $items): Collection
+    {
+        $values = [];
+        $columns = [];
+        foreach ($this->getTableColumns() as $column)
+        {
+            $columns[] = $column->getLabel();
+        }
+        $returnArr['header'] = $columns;
+        foreach($columns as $column)
+        {
+            $record = $items->where('grouped_by', $column)->first();
+            $value = 0;
+            if($record):
+                $value = $record->total;
+            endif;
+            $values[] = $value;
+        }
+        $returnArr['results'] = $values;
+
+        return collect($returnArr);
+    }
 }
diff --git a/app/Filament/Resources/ReportsResource/Pages/ListReport.php b/app/Filament/Resources/ReportsResource/Pages/ListReport.php
@@ -4,7 +4,7 @@
  * @Author: Bogdan Bocioaca
  * @Date:   2023-10-21 13:06:49
  * @Last Modified by:   Bogdan Bocioaca
- * @Last Modified time: 2023-10-21 13:06:55
+ * @Last Modified time: 2023-10-31 09:01:26
  */
 
 namespace App\Filament\Resources\ReportsResource\Pages;
@@ -20,7 +20,7 @@ class ListReport extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make(),
+            // Actions\CreateAction::make(),
         ];
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -32,13 +32,17 @@ public function boot(): void
 
             Filament::registerNavigationItems([
 
-                NavigationItem::make('Lista rapoarte')
-                    ->url('/admin/reports')
-                    ->icon('heroicon-o-presentation-chart-line')
-                    ->activeIcon('heroicon-s-presentation-chart-line')
-                    ->group('Rapoarte')
-                    ->sort(2)
-                    ->hidden(auth()->user() && !auth()->user()->can('view_reports')),
+                // NavigationItem::make('Lista rapoarte')
+                //     ->url('/admin/reports')
+                //     ->icon('heroicon-o-presentation-chart-line')
+                //     // ->activeIcon('heroicon-s-presentation-chart-line')
+                //     ->group('Rapoarte')
+                //     ->sort(2)
+                //     // ->isActiveWhen(function ()
+                //     // {
+                //     //     return request()->route()->uri == 'admin/reports';
+                //     // })
+                //     ->hidden(auth()->user() && !auth()->user()->can('view_reports')),
             ]);
         });
         Filament::registerNavigationGroups([

diff --git a/lang/en/report.php b/lang/en/report.php
@@ -4,7 +4,7 @@
  * @Author: Bogdan Bocioaca
  * @Date:   2023-10-23 10:36:09
  * @Last Modified by:   Bogdan Bocioaca
- * @Last Modified time: 2023-10-27 11:47:42
+ * @Last Modified time: 2023-10-31 09:00:50
  */
 return [
     'column' => [
@@ -24,10 +24,12 @@
         'created_at' => 'Created',
     ],
     'action' => [
-        'generate'=> 'Generate report',
-        'reset'=>'Reset report',
-        'save_report' => 'Save report',
-        'export' => 'Export',
+        'generate'=> 'Genereaza raport',
+        'reset'=>'Reseteaza raportul',
+        'save_report' => 'Salveaza raportul',
+        'export' => 'Exporta',
+        'view_list' => 'Vezi lista',
+
     ],
     'section'=>[
         'generator' => 'Generate report',

diff --git a/package-lock.json b/package-lock.json