format the blades
This commit is contained in:
@@ -76,7 +76,7 @@ class RoadItemReportService
|
|||||||
public function countryActivityPerSubItem(Request $request): array
|
public function countryActivityPerSubItem(Request $request): array
|
||||||
{
|
{
|
||||||
$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->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
|
||||||
$item = $request->item;
|
$item = $request->item;
|
||||||
|
|
||||||
$provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
|
$provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
|
||||||
@@ -114,7 +114,7 @@ class RoadItemReportService
|
|||||||
public function provinceActivityPerSubItem(Request $request): array
|
public function provinceActivityPerSubItem(Request $request): array
|
||||||
{
|
{
|
||||||
$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->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
|
||||||
$item = $request->item;
|
$item = $request->item;
|
||||||
$province = $request->province_id;
|
$province = $request->province_id;
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@ class RoadItemReportService
|
|||||||
public function countryActivityPerItem(Request $request): array
|
public function countryActivityPerItem(Request $request): array
|
||||||
{
|
{
|
||||||
$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->to_date ? $request->to_date . ' 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");
|
$isSpecialUser = $user->hasPermissionTo("show-road-item-supervise-cartable");
|
||||||
@@ -198,7 +198,7 @@ class RoadItemReportService
|
|||||||
{
|
{
|
||||||
$provinceId = $request->province_id;
|
$provinceId = $request->province_id;
|
||||||
$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->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
|
||||||
|
|
||||||
$edarehActivity = RoadItemsProject::query()
|
$edarehActivity = RoadItemsProject::query()
|
||||||
->selectRaw('
|
->selectRaw('
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="14"
|
<th colspan="14"
|
||||||
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
|
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
|
||||||
گزارش کارتابل عملیات فعالیت های روزانه و جاری
|
گزارش کارتابل عملیات فعالیت های روزانه و جاری
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -107,7 +107,6 @@
|
|||||||
</td>
|
</td>
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
|
<td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
|
<td style="border: 1px solid black;text-align: center;">{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
|
||||||
</td>
|
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
|
<td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['supervisor_description'] ?? '-' }}</td>
|
<td style="border: 1px solid black;text-align: center;">{{ $item['supervisor_description'] ?? '-' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="14"
|
<th colspan="14"
|
||||||
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
|
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
|
||||||
گزارش کارتابل ارزیابی فعالیت های روزانه و جاری
|
گزارش کارتابل ارزیابی فعالیت های روزانه و جاری
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -107,7 +107,6 @@
|
|||||||
</td>
|
</td>
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
|
<td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
|
<td style="border: 1px solid black;text-align: center;">{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
|
||||||
</td>
|
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
|
<td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
|
||||||
<td style="border: 1px solid black;text-align: center;">{{ $item['supervisor_description'] ?? '-' }}</td>
|
<td style="border: 1px solid black;text-align: center;">{{ $item['supervisor_description'] ?? '-' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user