diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
index 425a203e..36fa1928 100644
--- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
+++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
@@ -88,7 +88,7 @@ class SafetyAndPrivacyController extends Controller
return $this->successResponse();
}
- public function secondStepStore(SafetyAndPrivacy $safety_and_privacy, SecondStepStoreRequest $request): JsonResponse
+ public function secondStepStore(SafetyAndPrivacy $safetyAndPrivacy, SecondStepStoreRequest $request): JsonResponse
{
$user = auth()->user();
@@ -100,13 +100,13 @@ class SafetyAndPrivacyController extends Controller
return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
}
- DB::transaction(function () use ($request, $safety_and_privacy, $user)
+ DB::transaction(function () use ($request, $safetyAndPrivacy, $user)
{
$judiciary_document = [];
foreach ($request->judiciary_document as $index => $file) {
- $judiciary_document[] = FileFacade::save($file, "safety_and_privacy/{$safety_and_privacy->id}/judiciary_document");
+ $judiciary_document[] = FileFacade::save($file, "safety_and_privacy/{$safetyAndPrivacy->id}/judiciary_document");
}
- $safety_and_privacy->update([
+ $safetyAndPrivacy->update([
'judiciary_document' => serialize($judiciary_document),
'judiciary_document_upload_date' => now(),
'step' => 2,
@@ -119,7 +119,7 @@ class SafetyAndPrivacyController extends Controller
return $this->successResponse();
}
- public function thirdStepStore(SafetyAndPrivacy $safety_and_privacy, ThirdStepStoreRequest $request): JsonResponse
+ public function thirdStepStore(SafetyAndPrivacy $safetyAndPrivacy, ThirdStepStoreRequest $request): JsonResponse
{
$user = auth()->user();
@@ -131,11 +131,11 @@ class SafetyAndPrivacyController extends Controller
return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
}
- DB::transaction(function () use ($request, $safety_and_privacy, $user) {
- $safety_and_privacy->update([
+ DB::transaction(function () use ($request, $safetyAndPrivacy, $user) {
+ $safetyAndPrivacy->update([
'step' => 3,
'step_fa' => 'گام سوم (برخورد)',
- 'action_picture' => FileFacade::save($request->action_picture, "safety_and_privacy/{$safety_and_privacy->id}/action_picture"),
+ 'action_picture' => FileFacade::save($request->action_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/action_picture"),
'action_picture_document_upload_date' => now(),
]);
diff --git a/app/Services/Cartables/SafetyAndPrivacyTableService.php b/app/Services/Cartables/SafetyAndPrivacyTableService.php
index 65a1dc3f..7093dbae 100644
--- a/app/Services/Cartables/SafetyAndPrivacyTableService.php
+++ b/app/Services/Cartables/SafetyAndPrivacyTableService.php
@@ -61,28 +61,12 @@ class SafetyAndPrivacyTableService
);
$countryTotalSum = 0;
+ $activities[]["name_fa"] = 'کشوری';
+ $activities[]["province_id"] = -1;
foreach ($country as $key => $value) {
$countryTotalSum += $value->qty;
- $activities[-1]["info-".$value->info_id]["step-".$value->step] = $value->qty;
- $activities[-1]["sum"] = $countryTotalSum;
- }
-
-
- foreach (Province::all() as $key => $value) {
- $activities[$value->id]["info-89"]["step-1"] = 0;
- $activities[$value->id]["info-89"]["step-2"] = 0;
- $activities[$value->id]["info-89"]["step-3"] = 0;
-
- $activities[$value->id]["info-90"]["step-1"] = 0;
- $activities[$value->id]["info-90"]["step-2"] = 0;
- $activities[$value->id]["info-90"]["step-3"] = 0;
-
- $activities[$value->id]["info-91"]["step-1"] = 0;
- $activities[$value->id]["info-91"]["step-2"] = 0;
- $activities[$value->id]["info-91"]["step-3"] = 0;
-
- $activities[$value->id]["sum"] = 0;
- $activities[$value->id]["name_fa"] = $value->name_fa;
+ $activities[][$value->info_id][$value->step] = $value->qty;
+ $activities[]["sum"] = $countryTotalSum;
}
$provinces = DB::select(
@@ -92,9 +76,10 @@ class SafetyAndPrivacyTableService
$provinceTotalSum = 0;
foreach ($provinces as $key => $value) {
$provinceTotalSum += $value->qty;
- $activities[$value->province_id]["info-".$value->info_id]["step-".$value->step] = $value->qty;
- $activities[$value->province_id]["sum"] = $provinceTotalSum;
- $activities[$value->province_id]["province_fa"] = $value->province_fa;
+ $activities[][$value->info_id][$value->step] = $value->qty;
+ $activities[]["sum"] = $provinceTotalSum;
+ $activities[]["province_fa"] = $value->province_fa;
+ $activities[]["province_id"] = $value->province_id;
}
return [
@@ -116,30 +101,14 @@ class SafetyAndPrivacyTableService
');
$provinceTotalSum = 0;
+ $activities[]["name_fa"] = 'استانی';
+ $activities[]["edare_shahri_id"] = -1;
foreach ($province as $key => $value) {
$provinceTotalSum += $value->qty;
- $activities[-1]["info-".$value->info_id]["step-".$value->step] = $value->qty;
- $activities[-1]["sum"] = $provinceTotalSum;
+ $activities[]["info-".$value->info_id]["step-".$value->step] = $value->qty;
+ $activities[]["sum"] = $provinceTotalSum;
}
- foreach (\App\Models\EdarateShahri::query()->where('province_id', $provinceId)->get() as $key => $value) {
- $activities[$value->id]["info-89"]["step-1"] = 0;
- $activities[$value->id]["info-89"]["step-2"] = 0;
- $activities[$value->id]["info-89"]["step-3"] = 0;
-
- $activities[$value->id]["info-90"]["step-1"] = 0;
- $activities[$value->id]["info-90"]["step-2"] = 0;
- $activities[$value->id]["info-90"]["step-3"] = 0;
-
- $activities[$value->id]["info-91"]["step-1"] = 0;
- $activities[$value->id]["info-91"]["step-2"] = 0;
- $activities[$value->id]["info-91"]["step-3"] = 0;
-
- $activities[$value->id]["sum"] = 0;
- $activities[$value->id]["name_fa"] = $value->name_fa;
- }
-
-
$cities = DB::select('
SELECT edare_shahri_id, COUNT(*) as qty,info_id, step,step_fa, info_fa FROM safety_and_privacy where province_id ='.$provinceId.' and created_at BETWEEN "'.$fromDate.'" and "'.$toDate.'" GROUP BY info_id,step,edare_shahri_id
');
@@ -147,9 +116,10 @@ class SafetyAndPrivacyTableService
$cityTotalSum = 0;
foreach ($cities as $key => $value) {
$cityTotalSum += $value->qty;
- $activities[$value->edare_shahri_id]["info-".$value->info_id]["step-".$value->step] = $value->qty;
- $activities[$value->edare_shahri_id][""] = $value;
- $activities[$value->edare_shahri_id]["sum"] = $cityTotalSum;
+ $activities[][$value->info_id][$value->step] = $value->qty;
+ $activities[]["name_fa"] = \App\Models\EdarateShahri::query()->find($value->edare_shahri_id)->name_fa;
+ $activities[]["edare_shahri_id"] = $value->edare_shahri_id;
+ $activities[]["sum"] = $cityTotalSum;
}
return [
diff --git a/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php b/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php
index 2959afed..cdd69930 100644
--- a/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php
+++ b/resources/views/v3/Reports/SafetyAndPrivacy/CountryActivityReport.blade.php
@@ -90,15 +90,15 @@
| {{ $item['name_fa'] }} |
{{ $item['sum'] }} |
- {{ $item['info-89']['step-1'] }} |
- {{ $item['info-89']['step-2'] }} |
- {{ $item['info-89']['step-3'] }} |
- {{ $item['info-90']['step-1'] }} |
- {{ $item['info-90']['step-2'] }} |
- {{ $item['info-90']['step-3'] }} |
- {{ $item['info-91']['step-1'] }} |
- {{ $item['info-91']['step-2'] }} |
- {{ $item['info-91']['step-3'] }} |
+ {{ $item[89][1] }} |
+ {{ $item[89][2] }} |
+ {{ $item[89][3] }} |
+ {{ $item[90][1] }} |
+ {{ $item[90][2] }} |
+ {{ $item[90][3] }} |
+ {{ $item[91][1] }} |
+ {{ $item[91][2] }} |
+ {{ $item[91][3] }} |
@endforeach
diff --git a/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php b/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php
index ffe68f28..7faf68c3 100644
--- a/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php
+++ b/resources/views/v3/Reports/SafetyAndPrivacy/ProvinceActivityReport.blade.php
@@ -88,42 +88,31 @@
@foreach ($data as $item)
@if ($item['is_province'] == '1')
- |
- {{ $item['name_fa'] }} |
-
- {{ $item['sum'] }} |
-
- {{ $item['info-89']['step-1'] }} |
-
- {{ $item['info-89']['step-2'] }} |
-
- {{ $item['info-89']['step-3'] }} |
-
- {{ $item['info-90']['step-1'] }} |
-
- {{ $item['info-90']['step-2'] }} |
-
- {{ $item['info-90']['step-3'] }} |
-
- {{ $item['info-91']['step-1'] }} |
-
- {{ $item['info-91']['step-2'] }} |
-
- {{ $item['info-91']['step-3'] }} |
+ {{ $item['name_fa'] }} |
+ {{ $item['sum'] }} |
+ {{ $item[89][1] }} |
+ {{ $item[89][2] }} |
+ {{ $item[89][3] }} |
+ {{ $item[90][1] }} |
+ {{ $item[90][2] }} |
+ {{ $item[90][3] }} |
+ {{ $item[91][1] }} |
+ {{ $item[91][2] }} |
+ {{ $item[91][3] }} |
@else
| {{ $item['name_fa'] }} |
{{ $item['sum'] }} |
- {{ $item['info-89']['step-1'] }} |
- {{ $item['info-89']['step-2'] }} |
- {{ $item['info-89']['step-3'] }} |
- {{ $item['info-90']['step-1'] }} |
- {{ $item['info-90']['step-2'] }} |
- {{ $item['info-90']['step-3'] }} |
- {{ $item['info-91']['step-1'] }} |
- {{ $item['info-91']['step-2'] }} |
- {{ $item['info-91']['step-3'] }} |
+ {{ $item[89][1] }} |
+ {{ $item[89][2] }} |
+ {{ $item[89][3] }} |
+ {{ $item[90][1] }} |
+ {{ $item[90][2] }} |
+ {{ $item[90][3] }} |
+ {{ $item[91][1] }} |
+ {{ $item[91][2] }} |
+ {{ $item[91][3] }} |
@endif
@endforeach
diff --git a/routes/v3.php b/routes/v3.php
index 199f7d56..d312cf24 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -328,8 +328,8 @@ Route::prefix('safety_and_privacy')
->group(function () {
Route::get('/', 'index')->name('index')->middleware('permission:show-safety-and-privacy-operator-cartable|show-safety-and-privacy-operator-cartable-province|show-safety-and-privacy-operator-cartable-edarate-shahri');
Route::post('/first_step_store', 'firstStepStore')->name('firstStepStore')->middleware('permission:add-safety-and-privacy');
- Route::post('/second_step_store', 'secondStepStore')->name('secondStepStore')->middleware('permission:add-safety-and-privacy');
- Route::post('/third_step_store', 'thirdStepStore')->name('thirdStepStore')->middleware('permission:add-safety-and-privacy');
+ Route::post('/second_step_store/{safetyAndPrivacy}', 'secondStepStore')->name('secondStepStore')->middleware('permission:add-safety-and-privacy');
+ Route::post('/third_step_store/{safetyAndPrivacy}', 'thirdStepStore')->name('thirdStepStore')->middleware('permission:add-safety-and-privacy');
Route::get('/sub_items', 'subItems')->name('subItems');
Route::get('/{safetyAndPrivacy}', 'show')->name('show');
Route::delete('/{safetyAndPrivacy}', 'destroy')->name('destroy')->middleware('permission:delete-safety-and-privacy');