Compare commits
6 Commits
a8c71de069
...
feature/Mi
| Author | SHA1 | Date | |
|---|---|---|---|
| 17a6e903ae | |||
| 5f2d214a56 | |||
| 1e106a0c87 | |||
| 1937f57dd3 | |||
| 72462e8016 | |||
| b5aa3371da |
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Console\Commands;
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use App\Models\Mission;
|
||||||
use App\Services\PolylineEncoder;
|
use App\Services\PolylineEncoder;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
|
|
||||||
@@ -24,8 +25,15 @@ class EncodePolyLineCommand extends Command
|
|||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*/
|
*/
|
||||||
public function handle(PolylineEncoder $polylineEncoder)
|
public function handle(PolylineEncoder $polylineEncoder): void
|
||||||
{
|
{
|
||||||
|
Mission::query()->whereNotNull('area')->each(function ($mission) use ($polylineEncoder) {
|
||||||
|
$encodedValue = $polylineEncoder->encodePolyLine($mission, lng_lat_format:true);
|
||||||
|
$mission->update([
|
||||||
|
'encoded_route' => $encodedValue,
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->info("updated successfully");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ class CMMSMachinesController extends Controller
|
|||||||
$request,
|
$request,
|
||||||
allowedFilters: ['*'],
|
allowedFilters: ['*'],
|
||||||
allowedSortings: ['*'],
|
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'],
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
19
app/Http/Controllers/V3/CityController.php
Normal file
19
app/Http/Controllers/V3/CityController.php
Normal file
@@ -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']));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -74,6 +74,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
|
public function provinceMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
|
||||||
{
|
{
|
||||||
return $this->successResponse([
|
return $this->successResponse([
|
||||||
@@ -97,8 +109,20 @@ class ReportMachineController extends Controller
|
|||||||
allowedSortings: ['*'],
|
allowedSortings: ['*'],
|
||||||
allowedSelects: [
|
allowedSelects: [
|
||||||
'id', 'province_id', 'province_name', 'city_id', 'city_name',
|
'id', 'province_id', 'province_name', 'city_id', 'city_name',
|
||||||
'end_km', 'km', 'driver_name', 'state_name',
|
'end_km', 'km', 'driver_name', 'state_name', 'station_name'
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class RequestPortalController extends Controller
|
|||||||
return response()->json($requestPortalService->datatable($request));
|
return response()->json($requestPortalService->datatable($request));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function violations(Request $request): JsonResponse
|
public function violations(Request $request): array
|
||||||
{
|
{
|
||||||
$query = MissionViolation::query()->where([
|
$query = MissionViolation::query()->where([
|
||||||
['status', '=', MissionViolationStatus::BEDON_EGHDAM->value],
|
['status', '=', MissionViolationStatus::BEDON_EGHDAM->value],
|
||||||
|
|||||||
19
app/Http/Controllers/V3/ProvinceController.php
Normal file
19
app/Http/Controllers/V3/ProvinceController.php
Normal file
@@ -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']));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ class City extends Model
|
|||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
protected $guarded = ['id'];
|
||||||
protected $hidden = [
|
protected $hidden = [
|
||||||
'name_en',
|
'name_en',
|
||||||
'feature_id',
|
'feature_id',
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ class Province extends Model
|
|||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
protected $guarded = ['id'];
|
||||||
protected $hidden = [
|
protected $hidden = [
|
||||||
'feature_id',
|
'feature_id',
|
||||||
//'center_lat',
|
//'center_lat',
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ class ReportMachineService
|
|||||||
m.machine_code,
|
m.machine_code,
|
||||||
cm.car_name,
|
cm.car_name,
|
||||||
COUNT(*) AS missions,
|
COUNT(*) AS missions,
|
||||||
SUM(m.end_km - m.km) AS func,
|
SUM(m.end_km - m.km) AS func
|
||||||
FROM missions m
|
FROM missions m
|
||||||
JOIN cmms_machines cm ON cm.id = m.machine_id
|
JOIN cmms_machines cm ON cm.id = m.machine_id
|
||||||
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
|
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
|
||||||
@@ -59,7 +59,7 @@ class ReportMachineService
|
|||||||
$sql = "SELECT
|
$sql = "SELECT
|
||||||
cm.car_type,
|
cm.car_type,
|
||||||
COUNT(*) AS missions,
|
COUNT(*) AS missions,
|
||||||
SUM(m.end_km - m.km) AS func,
|
SUM(m.end_km - m.km) AS func
|
||||||
FROM missions m
|
FROM missions m
|
||||||
JOIN cmms_machines cm ON cm.id = m.machine_id
|
JOIN cmms_machines cm ON cm.id = m.machine_id
|
||||||
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
|
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
|
||||||
@@ -80,7 +80,7 @@ class ReportMachineService
|
|||||||
$sql = "SELECT
|
$sql = "SELECT
|
||||||
cm.car_type,
|
cm.car_type,
|
||||||
COUNT(*) AS missions,
|
COUNT(*) AS missions,
|
||||||
SUM(m.end_km - m.km) AS func,
|
SUM(m.end_km - m.km) AS func
|
||||||
FROM missions m
|
FROM missions m
|
||||||
JOIN cmms_machines cm ON cm.id = m.machine_id
|
JOIN cmms_machines cm ON cm.id = m.machine_id
|
||||||
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
|
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
|
||||||
@@ -102,7 +102,7 @@ class ReportMachineService
|
|||||||
m.driver_id,
|
m.driver_id,
|
||||||
m.driver_name,
|
m.driver_name,
|
||||||
COUNT(*) AS missions,
|
COUNT(*) AS missions,
|
||||||
SUM(m.end_km - m.km) AS func,
|
SUM(m.end_km - m.km) AS func
|
||||||
FROM missions m
|
FROM missions m
|
||||||
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
|
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
|
||||||
GROUP BY m.driver_id;";
|
GROUP BY m.driver_id;";
|
||||||
@@ -123,7 +123,7 @@ class ReportMachineService
|
|||||||
m.driver_id,
|
m.driver_id,
|
||||||
m.driver_name,
|
m.driver_name,
|
||||||
COUNT(*) AS missions,
|
COUNT(*) AS missions,
|
||||||
SUM(m.end_km - m.km) AS func,
|
SUM(m.end_km - m.km) AS func
|
||||||
FROM missions m
|
FROM missions m
|
||||||
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
|
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
|
||||||
GROUP BY m.driver_id;";
|
GROUP BY m.driver_id;";
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Http\Controllers\V3\Auth\LogoutController;
|
use App\Http\Controllers\V3\Auth\LogoutController;
|
||||||
|
use App\Http\Controllers\V3\CityController;
|
||||||
use App\Http\Controllers\V3\CMMSMachinesController;
|
use App\Http\Controllers\V3\CMMSMachinesController;
|
||||||
use App\Http\Controllers\V3\DamageManagementController;
|
use App\Http\Controllers\V3\DamageManagementController;
|
||||||
use App\Http\Controllers\V3\Dashboard\Accident\AccidentReceiptController;
|
use App\Http\Controllers\V3\Dashboard\Accident\AccidentReceiptController;
|
||||||
@@ -38,6 +39,7 @@ use App\Http\Controllers\V3\LogListManagementController;
|
|||||||
use App\Http\Controllers\V3\NotificationController;
|
use App\Http\Controllers\V3\NotificationController;
|
||||||
use App\Http\Controllers\V3\PermissionManagementController;
|
use App\Http\Controllers\V3\PermissionManagementController;
|
||||||
use App\Http\Controllers\V3\ProfileController;
|
use App\Http\Controllers\V3\ProfileController;
|
||||||
|
use App\Http\Controllers\V3\ProvinceController;
|
||||||
use App\Http\Controllers\V3\RahdaranController;
|
use App\Http\Controllers\V3\RahdaranController;
|
||||||
use App\Http\Controllers\V3\WebServices\RoadItemController;
|
use App\Http\Controllers\V3\WebServices\RoadItemController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
@@ -495,7 +497,7 @@ Route::prefix('missions')
|
|||||||
Route::get('/', 'index')->name('index');
|
Route::get('/', 'index')->name('index');
|
||||||
Route::get('/violations', 'violations')->name('violations');
|
Route::get('/violations', 'violations')->name('violations');
|
||||||
Route::post('/', 'store')->name('store');
|
Route::post('/', 'store')->name('store');
|
||||||
Route::post('/clarifyUnauthorizedExit/{violation}','clarifyUnauthorizedExit')->name('clarifyUnauthorizedExit');
|
Route::post('/clarify_unauthorized_exit/{violation}','clarifyUnauthorizedExit')->name('clarifyUnauthorizedExit');
|
||||||
Route::post('/continue/{mission}','continueMission')->name('continueMission');
|
Route::post('/continue/{mission}','continueMission')->name('continueMission');
|
||||||
Route::get('/{mission}', 'show')->name('show');
|
Route::get('/{mission}', 'show')->name('show');
|
||||||
Route::post('/{mission}', 'update')->name('update');
|
Route::post('/{mission}', 'update')->name('update');
|
||||||
@@ -684,3 +686,17 @@ Route::get('/test', function () {
|
|||||||
$csvExporter = new \Laracsv\Export();
|
$csvExporter = new \Laracsv\Export();
|
||||||
$csvExporter->build(\App\Models\User::all(), ['id' => 'کد یکتا', 'username' => 'نام کاربری'])->download();
|
$csvExporter->build(\App\Models\User::all(), ['id' => 'کد یکتا', 'username' => 'نام کاربری'])->download();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Route::prefix('provinces')
|
||||||
|
->name('provinces.')
|
||||||
|
->controller(ProvinceController::class)
|
||||||
|
->group(function () {
|
||||||
|
Route::get('/list', 'list')->name('list');
|
||||||
|
});
|
||||||
|
|
||||||
|
Route::prefix('cities')
|
||||||
|
->name('cities.')
|
||||||
|
->controller(CityController::class)
|
||||||
|
->group(function () {
|
||||||
|
Route::get('/list', 'list')->name('list');
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user