Merge branch 'feature/ControlUnitAction' into 'develop'
add start and finish action See merge request witelgroup/rms_v2!129
This commit is contained in:
@@ -2,15 +2,58 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers\V3\Dashboard\Mission;
|
namespace App\Http\Controllers\V3\Dashboard\Mission;
|
||||||
|
|
||||||
|
use App\Enums\MissionStates;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Http\Traits\ApiResponse;
|
||||||
|
use App\Models\Mission;
|
||||||
use App\Services\Cartables\Mission\ControlUnitService;
|
use App\Services\Cartables\Mission\ControlUnitService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
class ControlUnitController extends Controller
|
class ControlUnitController extends Controller
|
||||||
{
|
{
|
||||||
|
use ApiResponse;
|
||||||
public function index(Request $request, ControlUnitService $controlUnitService): JsonResponse
|
public function index(Request $request, ControlUnitService $controlUnitService): JsonResponse
|
||||||
{
|
{
|
||||||
return response()->json($controlUnitService->datatable($request));
|
return response()->json($controlUnitService->datatable($request));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function start(Request $request, Mission $mission): JsonResponse
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($request, $mission) {
|
||||||
|
$mission->histories()->create([
|
||||||
|
'user_id' => auth()->user()->id,
|
||||||
|
'previous_state_id' => $mission->state_id,
|
||||||
|
'previous_state_name' => $mission->state_name
|
||||||
|
]);
|
||||||
|
|
||||||
|
$state = MissionStates::START_MISSION->value;
|
||||||
|
$mission->update([
|
||||||
|
'state_id' => $state,
|
||||||
|
'state_name' => MissionStates::name($state),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
return $this->successResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function finish(Request $request, Mission $mission): JsonResponse
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($request, $mission) {
|
||||||
|
$mission->histories()->create([
|
||||||
|
'user_id' => auth()->user()->id,
|
||||||
|
'previous_state_id' => $mission->state_id,
|
||||||
|
'previous_state_name' => $mission->state_name
|
||||||
|
]);
|
||||||
|
|
||||||
|
$state = MissionStates::END_MISSION->value;
|
||||||
|
$mission->update([
|
||||||
|
'state_id' => $state,
|
||||||
|
'state_name' => MissionStates::name($state),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
return $this->successResponse();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ class ControlUnitService
|
|||||||
{
|
{
|
||||||
$fields = [
|
$fields = [
|
||||||
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
|
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
|
||||||
'description', 'requested_machines', 'type', 'start_date',
|
'description', 'requested_machines', 'type', 'type_fa', 'start_date',
|
||||||
'end_date', 'request_date', 'end_point',
|
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa'
|
||||||
];
|
];
|
||||||
|
|
||||||
$query = Mission::query()
|
$query = Mission::query()
|
||||||
|
|||||||
@@ -469,6 +469,8 @@ Route::prefix('missions')
|
|||||||
->controller(ControlUnitController::class)
|
->controller(ControlUnitController::class)
|
||||||
->group(function () {
|
->group(function () {
|
||||||
Route::get('/', 'index')->name('index');
|
Route::get('/', 'index')->name('index');
|
||||||
|
Route::get('/start', 'start')->name('start');
|
||||||
|
Route::get('/finish', 'finish')->name('finish');
|
||||||
});
|
});
|
||||||
Route::prefix('details')
|
Route::prefix('details')
|
||||||
->name('details.')
|
->name('details.')
|
||||||
|
|||||||
Reference in New Issue
Block a user