create there culum for safty and privacy and use in controller
This commit is contained in:
@@ -87,6 +87,9 @@ class OperatorController extends Controller
|
|||||||
$safety_and_privacy->recognize_picture = $request->has('recognize_picture') ?
|
$safety_and_privacy->recognize_picture = $request->has('recognize_picture') ?
|
||||||
FileFacade::save($request->recognize_picture, "safety_and_privacy/{$safety_and_privacy->id}") :
|
FileFacade::save($request->recognize_picture, "safety_and_privacy/{$safety_and_privacy->id}") :
|
||||||
null;
|
null;
|
||||||
|
$safety_and_privacy->recognize_picture_2 = $request->has('recognize_picture_2') ?
|
||||||
|
FileFacade::save($request->recognize_picture_2, "safety_and_privacy/{$safety_and_privacy->id}") :
|
||||||
|
null;
|
||||||
$safety_and_privacy->save();
|
$safety_and_privacy->save();
|
||||||
|
|
||||||
$user->addActivityComplete(1134);
|
$user->addActivityComplete(1134);
|
||||||
@@ -142,7 +145,9 @@ class OperatorController extends Controller
|
|||||||
'step_fa' => SafetyAndPrivacySteps::name($step),
|
'step_fa' => SafetyAndPrivacySteps::name($step),
|
||||||
'status' => $status_id,
|
'status' => $status_id,
|
||||||
'status_fa' => SafetyAndPrivacyStatus::name($status_id),
|
'status_fa' => SafetyAndPrivacyStatus::name($status_id),
|
||||||
'action_picture' => FileFacade::save($request->action_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/action_picture"),
|
'action_picture' => FileFacade::save($request->action_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/action_picture"),
|
||||||
|
'finish_picture' => FileFacade::save($request->finish_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/finish_picture"),
|
||||||
|
'evidence_picture' => FileFacade::save($request->evidence_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/evidence_picture"),
|
||||||
'action_picture_document_upload_date' => now(),
|
'action_picture_document_upload_date' => now(),
|
||||||
'action_date' => $request->action_date,
|
'action_date' => $request->action_date,
|
||||||
'is_finished' => true,
|
'is_finished' => true,
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ class FirstStepStoreRequest extends FormRequest
|
|||||||
'activity_date' => 'required|date_format:Y-m-d',
|
'activity_date' => 'required|date_format:Y-m-d',
|
||||||
'activity_time' => 'required|date_format:H:i',
|
'activity_time' => 'required|date_format:H:i',
|
||||||
'recognize_picture' => 'required|image',
|
'recognize_picture' => 'required|image',
|
||||||
|
'recognize_picture_2' => 'required|image',
|
||||||
'axis_type_id' => 'required|integer|exists:axis_types,id',
|
'axis_type_id' => 'required|integer|exists:axis_types,id',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ class ThirdStepStoreRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'action_picture' => 'required|image',
|
'action_picture' => 'required|image',
|
||||||
|
'finish_picture' => 'required|image',
|
||||||
|
'evidence_picture' => 'required|image',
|
||||||
'action_date' => 'required|date',
|
'action_date' => 'required|date',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,10 @@ class SafetyAndPrivacy extends Model
|
|||||||
'need_judiciary',
|
'need_judiciary',
|
||||||
'operator_description',
|
'operator_description',
|
||||||
'supervisor_name',
|
'supervisor_name',
|
||||||
'supervisor_id'
|
'supervisor_id',
|
||||||
|
'finish_picture',
|
||||||
|
'evidence_picture',
|
||||||
|
'recognize_picture_2',
|
||||||
];
|
];
|
||||||
|
|
||||||
public $table = "safety_and_privacy";
|
public $table = "safety_and_privacy";
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ class OperatorService
|
|||||||
$fields = [
|
$fields = [
|
||||||
'id','lat','lon', 'recognize_picture','action_picture','created_at','step', 'final_description',
|
'id','lat','lon', 'recognize_picture','action_picture','created_at','step', 'final_description',
|
||||||
'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date',
|
'info_fa', 'activity_date_time', 'action_picture_document_upload_date', 'judiciary_document_upload_date',
|
||||||
'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description', 'operator_description'
|
'step_fa', 'axis_type_id', 'axis_type_name', 'action_date', 'is_finished', 'status_fa', 'supervisor_description',
|
||||||
|
'operator_description', 'finish_picture', 'evidence_picture', 'recognize_picture_2'
|
||||||
];
|
];
|
||||||
|
|
||||||
throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));
|
throw_if(is_null($user->edarate_shahri_id), new ProhibitedAction('اداره ای برای شما در سامانه ثبت نشده است!'));
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('safety_and_privacy', function (Blueprint $table) {
|
||||||
|
$table->string('recognize_picture_2');
|
||||||
|
$table->string('finish_picture');
|
||||||
|
$table->string('evidence_picture');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('safety_and_privacy', function (Blueprint $table) {
|
||||||
|
$table->dropColumn(['recognize_picture_2', 'finish_picture', 'evidence_picture']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user