RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add province to user info

Browse Source
This commit is contained in:
amirghasempoor
2025-01-08 16:27:13 +03:30
parent c3d0fec4b6
commit a295c1958b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/V3/ProfileController.php
View File

@@ -30,6 +30,7 @@ class ProfileController extends Controller
'major' => $user->major, 'major' => $user->major,
'degree' => $user->degree, 'degree' => $user->degree,
'mobile' => $user->mobile, 'mobile' => $user->mobile,
'province_id' => $user->province_id,
'avatar' => $user->avatarUrl() 'avatar' => $user->avatarUrl()
]); ]);
} }

5
app/Http/Controllers/V3/Reports/RoadItemsReportController.php
View File

@@ -113,7 +113,8 @@ class RoadItemsReportController extends Controller
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString(); $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$user = auth()->user(); $user = auth()->user();
$isSpecialUser = in_array($user->username, ['witel', 'drdanesh']); // $isSpecialUser = in_array($user->username, ['witel', 'drdanesh']);
$isSpecialUser = $user->hasPermissionTo("show-road-item-supervise-cartable");
$provinceId = $isSpecialUser ? null : $user->province_id; $provinceId = $isSpecialUser ? null : $user->province_id;
$roadItemsProjectsQuery = RoadItemsProject::query() $roadItemsProjectsQuery = RoadItemsProject::query()
@@ -176,7 +177,7 @@ class RoadItemsReportController extends Controller
->unionAll($roadItemsProjectsSummaryQuery) ->unionAll($roadItemsProjectsSummaryQuery)
->get(); ->get();
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name']); $edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name_fa']);
return $this->successResponse([ return $this->successResponse([
'activities' => $data, 'activities' => $data,