Merge pull request 'create list for province and city' (#16) from feature/MachineAndDriverInMission into develop

Reviewed-on: #16

app/Http/Controllers/V3/CMMSMachinesController.php

@@ -23,7 +23,8 @@ class CMMSMachinesController extends Controller
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
-            allowedSelects: ['machine_code', 'id', 'plak_number', 'car_name', 'car_type', 'status'],
+            allowedSelects: ['machine_code', 'id', 'plak_number', 'car_name', 'car_type', 'status',
+                'province_id', 'city_id', 'station_id', 'status','driver_name'],
         ));
     }
 

app/Http/Controllers/V3/CityController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\V3;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\City;
+use App\Models\Province;
+use Illuminate\Http\Request;
+
+class CityController extends Controller
+{
+    use ApiResponse;
+
+    public function list(Request $request)
+    {
+        return $this->successResponse(City::query()->where('cities.province_id', $request->query('province_id'))->get(['id', 'name_fa']));
+    }
+}

app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php

@@ -72,6 +72,18 @@ class ReportMachineController extends Controller
         ]);
     }
 
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     */
+    public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    {
+        $data = $reportMachineService->countryMachineTypesActivity($request);
+        $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+
+        return Excel::download(new machineReport($data), $name);
+    }
+
     public function provinceMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
     {
         return $this->successResponse([
@@ -85,4 +97,16 @@ class ReportMachineController extends Controller
 //                ->get(['id', 'name_fa'])
         ]);
     }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     */
+    public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
+    {
+        $data = $reportMachineService->provinceMachineTypesActivity($request);
+        $name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+
+        return Excel::download(new machineReport($data), $name);
+    }
 }

app/Http/Controllers/V3/ProvinceController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\V3;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\City;
+use App\Models\Province;
+use Illuminate\Http\Request;
+
+class ProvinceController extends Controller
+{
+    use ApiResponse;
+
+    public function list()
+    {
+        return $this->successResponse(Province::all(['id', 'name_fa']));
+    }
+}