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

change nominatim original function

Browse Source
This commit is contained in:
Witel Group
2024-02-19 10:15:00 +00:00
parent 8176faf117
commit 1074a2dc79
88 changed files with 2334847 additions and 27475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/ContractsController.php
View File

@@ -540,7 +540,7 @@ class ContractsController extends Controller
order by project_type_id"
;
foreach (DB::select(DB::raw($summaryProjectsStatus)) as $key => $value) {
foreach (DB::select($summaryProjectsStatus) as $key => $value) {
$summaryProjectsStatusExecute[$value->project_type_id] = [
'project_count' => $value->project_count,
'AvgProgressProjects' => $value->AvgProgressProjects,
@@ -555,7 +555,7 @@ class ContractsController extends Controller
where province_id = {$request->province}"
;
$summaryProjectsAllExecute = DB::select(DB::raw($summaryProjectsAll));
$summaryProjectsAllExecute = DB::select($summaryProjectsAll);
/// summary project status by last status
$summaryProjectsStatusByLastStatus = "SELECT
@@ -572,7 +572,7 @@ class ContractsController extends Controller
GROUP BY last_status_id"
;
$summaryProjectsStatusByLastStatusExecute = DB::select(DB::raw($summaryProjectsStatusByLastStatus));
$summaryProjectsStatusByLastStatusExecute = DB::select($summaryProjectsStatusByLastStatus);
/// project status divide by cities
$projectsStatusByCities = "SELECT
@@ -591,7 +591,7 @@ class ContractsController extends Controller
GROUP BY city_id"
;
$projectsStatusByCitiesExecute = DB::select(DB::raw($projectsStatusByCities));
$projectsStatusByCitiesExecute = DB::select($projectsStatusByCities);
/// important maintanance projects
$importantMaintananceProjects = "SELECT
@@ -613,7 +613,7 @@ class ContractsController extends Controller
GROUP BY unique_code) AS temp_table"
;
$importantMaintananceProjectsExecute = DB::select(DB::raw($importantMaintananceProjects));
$importantMaintananceProjectsExecute = DB::select($importantMaintananceProjects);
/// important danger points projects
@@ -632,7 +632,7 @@ class ContractsController extends Controller
AND project_type_id = 2"
;
$importantDangerPointsProjectExecute = DB::select(DB::raw($importantDangerPointsProject));
$importantDangerPointsProjectExecute = DB::select($importantDangerPointsProject);
/// important road upgrade safeties projects
$importantRoadUpgradeSafetiesProject = "SELECT
@@ -655,7 +655,7 @@ class ContractsController extends Controller
GROUP BY unique_code) AS temp_table"
;
$importantRoadUpgradeSafetiesProjectExecute = DB::select(DB::raw($importantRoadUpgradeSafetiesProject));
$importantRoadUpgradeSafetiesProjectExecute = DB::select($importantRoadUpgradeSafetiesProject);
/// important techincal projects
$importantTechnicalProject = "SELECT
@@ -673,7 +673,7 @@ class ContractsController extends Controller
AND project_type_id = 4"
;
$importantTechnicalProjectExecute = DB::select(DB::raw($importantTechnicalProject));
$importantTechnicalProjectExecute = DB::select($importantTechnicalProject);
/// important Tollhouse projects
$importantTollhouseProject = "SELECT
@@ -691,7 +691,7 @@ class ContractsController extends Controller
AND project_type_id = 5"
;
$importantTollhouseProjectExecute = DB::select(DB::raw($importantTollhouseProject));
$importantTollhouseProjectExecute = DB::select($importantTollhouseProject);
/// important VillageRoad projects
$importantVillageRoadProject = "SELECT
@@ -713,7 +713,7 @@ class ContractsController extends Controller
GROUP BY unique_code) AS temp_table"
;
$importantVillageRoadProjectExecute = DB::select(DB::raw($importantVillageRoadProject));
$importantVillageRoadProjectExecute = DB::select($importantVillageRoadProject);

14
app/Http/Controllers/DailyAccidentController.php
View File

@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\Storage;
use Carbon\Carbon;
use App\Http\Requests\DailyAccidentRequest;
use Spatie\Permission\Models\Permission;
use App\Services\NominatimService;
class DailyAccidentController extends Controller
@@ -131,9 +131,9 @@ class DailyAccidentController extends Controller
}
public function store(DailyAccidentRequest $request)
public function store(DailyAccidentRequest $request, NominatimService $nominatimService)
{
DB::transaction(function () use ($request) {
DB::transaction(function () use ($request, $nominatimService) {
$new_daily_accident = new DailyAccident();
$new_daily_accident->province_id = $request->province_id;
@@ -217,7 +217,7 @@ class DailyAccidentController extends Controller
$new_daily_accident->accident_reason_ebham_dar_masir = $request->accident_reason_ebham_dar_masir ?? 0;
$new_daily_accident->accident_reason_qus_tond_ofoghi = $request->accident_reason_qus_tond_ofoghi ?? 0;
$new_daily_accident->way_id = self::get_way_id_from_nominatim($request->lat, $request->lng);
$new_daily_accident->way_id = $nominatimService->get_way_id_from_nominatim($request->lat, $request->lng);
$new_daily_accident->save();
@@ -521,9 +521,9 @@ class DailyAccidentController extends Controller
], 200);
}
public function update(DailyAccident $accident, Request $request)
public function update(DailyAccident $accident, Request $request, NominatimService $nominatimService)
{
DB::transaction(function () use ($request, $accident) {
DB::transaction(function () use ($request, $accident, $nominatimService) {
;
auth()->user()->addActivityComplete(1119, $accident);
@@ -608,7 +608,7 @@ class DailyAccidentController extends Controller
$accident->accident_reason_ebham_dar_masir = $request->accident_reason_ebham_dar_masir ?? 0;
$accident->accident_reason_qus_tond_ofoghi = $request->accident_reason_qus_tond_ofoghi ?? 0;
$accident->way_id = self::get_way_id_from_nominatim($request->lat, $request->lng);
$accident->way_id = $nominatimService->get_way_id_from_nominatim($request->lat, $request->lng);
$accident->save();

9
app/Http/Controllers/ReceiptController.php
View File

@@ -14,6 +14,8 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Arr;
use App\Facades\Sms\Sms;
use App\Services\NominatimService;
class ReceiptController extends Controller
{
@@ -68,9 +70,9 @@ class ReceiptController extends Controller
);
}
public function store(Request $request)
public function store(Request $request, NominatimService $nominatimService)
{
DB::transaction(function () use ($request) {
DB::transaction(function () use ($request, $nominatimService) {
$new_accident = new Accident();
@@ -96,7 +98,8 @@ class ReceiptController extends Controller
$new_accident->accident_date = $request->accident_date;
$new_accident->accident_time = $request->accident_time;
$new_accident->way_id = get_way_id_from_nominatim($request->lat, $request->lng);
// $new_accident->way_id = get_way_id_from_nominatim($request->lat, $request->lng);
$new_accident->way_id = $nominatimService->get_way_id_from_nominatim($request->lat, $request->lng);
$new_accident->save();

2
app/Http/Controllers/ReceiptReportController.php
View File

@@ -15,7 +15,7 @@ use Illuminate\View\View;
use Symfony\Component\HttpFoundation\JsonResponse;
use Maatwebsite\Excel\Facades\Excel;
use App\Exports\V2\Receipt\ReceiptTable\AllSheets as ReceiptTable;
use App\Exports\V2\Receipt\RecieptTable\AllSheets as ReceiptTable;
class ReceiptReportController extends Controller

44
app/Http/Controllers/UserActivityController.php
View File

@@ -219,14 +219,14 @@ class UserActivityController extends Controller
GROUP BY user_id
ORDER BY majmoe desc;";
foreach (DB::select(DB::raw($user_activity_quantity_sql)) as $key => $value) {
foreach (DB::select($user_activity_quantity_sql) as $key => $value) {
$user_activity_quantity_temp[$value->user_id] = [
"majmoe" => $value->quantity ?? 0,
"name" => $value->user_first_name ? $value->user_first_name." ".$value->user_last_name." (".$value->username.")" : $value->user_name." (".$value->username.")",
];
}
foreach (DB::select(DB::raw($user_activity_time_sql)) as $key => $value) {
foreach (DB::select($user_activity_time_sql) as $key => $value) {
$user_activity_time_temp[$value->user_id] = [
"majmoe" => $value->majmoe ?? 0,
"name" => $value->user_first_name ? $value->user_first_name." ".$value->user_last_name." (".$value->username.")" : $value->user_name." (".$value->username.")",
@@ -245,7 +245,7 @@ class UserActivityController extends Controller
LIMIT 5
";
$activity_list = DB::select(DB::raw($user_activity_top_5_temp_sql));
$activity_list = DB::select($user_activity_top_5_temp_sql);
$sum = 0;
foreach ($activity_list as $index => $item) {
$sum += (int) $item->quantity;
@@ -263,17 +263,17 @@ class UserActivityController extends Controller
'fromDate' => $request->fromDate ? $request->fromDate : null,
'toDate' => $request->toDate ? $request->toDate : null,
'user_activity_time' => $ids_list ? $user_activity_time_temp : null,
'hourly_activity_chart' => $ids_list ? DB::select(DB::raw($hourly_activity_chart_sql)): null,
'quantitative_activity_chart' => $ids_list ? DB::select(DB::raw($quantitative_activity_chart_sql)): null,
'total_activity_quantity' => $ids_list ? DB::select(DB::raw($total_activity_quantity_sql))[0]->total_activity_quantity : null,
'total_activity_time' => $ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : null,
'top_10_activity_list' => $ids_list ? DB::select(DB::raw($top_10_activity_list_sql)) : null,
'hourly_activity_chart' => $ids_list ? DB::select($hourly_activity_chart_sql): null,
'quantitative_activity_chart' => $ids_list ? DB::select($quantitative_activity_chart_sql): null,
'total_activity_quantity' => $ids_list ? DB::select($total_activity_quantity_sql)[0]->total_activity_quantity : null,
'total_activity_time' => $ids_list ? DB::select($total_activity_time_sql)[0]->activity : null,
'top_10_activity_list' => $ids_list ? DB::select($top_10_activity_list_sql) : null,
'user_activity_quantity' => $ids_list ? $user_activity_quantity_temp : null,
'group_name' => $role->name_fa,
'average' => round(($ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : 0) / count($users), 2) ,
'average' => round(($ids_list ? DB::select($total_activity_time_sql)[0]->activity : 0) / count($users), 2) ,
'user_activity_top_5_temp' => $user_activity_top_5_temp,
'total_user_count' => count($users),
'active_user_count' => $ids_list ? DB::select(DB::raw($active_user_count_sql))[0]->active_user_count : null,
'active_user_count' => $ids_list ? DB::select($active_user_count_sql)[0]->active_user_count : null,
'group_id' => $role->id
];
@@ -382,7 +382,7 @@ class UserActivityController extends Controller
) user_activity_by_hour_and_
GROUP BY user_id) AS calculated_table;";
$activity = DB::select(DB::raw($temp_sql))[0]->activity;
$activity = DB::select($temp_sql)[0]->activity;
$users_activity[] = [
'activity_time' => $ids_list ? $activity : null,
'average' => round(($ids_list ? $activity : 0) / count($users), 2) ,
@@ -424,8 +424,8 @@ class UserActivityController extends Controller
GROUP BY user_id) AS calculated_table;";
$users_activity[] = [
'activity_time' => $country_group_ids_list ? DB::select(DB::raw($country_temp_sql))[0]->activity : null,
'average' => round(($country_group_ids_list ? DB::select(DB::raw($country_temp_sql))[0]->activity : 0) / $country_group_user_quantity, 2) ,
'activity_time' => $country_group_ids_list ? DB::select($country_temp_sql)[0]->activity : null,
'average' => round(($country_group_ids_list ? DB::select($country_temp_sql)[0]->activity : 0) / $country_group_user_quantity, 2) ,
'group_name' => 'کشوری',
'user_count' => $country_group_user_quantity,
'is_static' => 1,
@@ -464,8 +464,8 @@ class UserActivityController extends Controller
GROUP BY user_id) AS calculated_table;";
$users_activity[] = [
'activity_time' => $organization_group_ids_list ? DB::select(DB::raw($organization_temp_sql))[0]->activity : null,
'average' => round(($organization_group_ids_list ? DB::select(DB::raw($organization_temp_sql))[0]->activity : 0) / $organization_group_user_quantity, 2) ,
'activity_time' => $organization_group_ids_list ? DB::select($organization_temp_sql)[0]->activity : null,
'average' => round(($organization_group_ids_list ? DB::select($organization_temp_sql)[0]->activity : 0) / $organization_group_user_quantity, 2) ,
'group_name' => 'سازمانی',
'user_count' => $organization_group_user_quantity,
'is_static' => 2,
@@ -696,8 +696,8 @@ class UserActivityController extends Controller
dd;";
$data['labels'][] = $role->name_fa;
$data['hourly_activity_chart'][] = isset(DB::select(DB::raw($hourly_activity_chart_sql))[0]->majmoe) ? DB::select(DB::raw($hourly_activity_chart_sql))[0]->majmoe: 0;
$data['quantitative_activity_chart'][] = isset(DB::select(DB::raw($quantitative_activity_chart_sql))[0]->quantity) ? DB::select(DB::raw($quantitative_activity_chart_sql))[0]->quantity: 0;
$data['hourly_activity_chart'][] = isset(DB::select($hourly_activity_chart_sql)[0]->majmoe) ? DB::select($hourly_activity_chart_sql)[0]->majmoe: 0;
$data['quantitative_activity_chart'][] = isset(DB::select($quantitative_activity_chart_sql)[0]->quantity) ? DB::select($quantitative_activity_chart_sql)[0]->quantity: 0;
}
@@ -707,7 +707,7 @@ class UserActivityController extends Controller
WHERE created_at between '{$request->fromDate}' and '{$request->toDate}' and user_id IN(".$total_ids_list.")
";
$data['total_activity_quantity'] = $total_ids_list ? DB::select(DB::raw($total_activity_quantity_sql))[0]->total_activity_quantity : null;
$data['total_activity_quantity'] = $total_ids_list ? DB::select($total_activity_quantity_sql)[0]->total_activity_quantity : null;
$data['total_user_count'] = count(explode(',', $total_ids_list));
@@ -721,7 +721,7 @@ class UserActivityController extends Controller
GROUP BY user_id
) grpuped_by_user_id";
$data['active_user_count'] = $total_ids_list ? DB::select(DB::raw($active_user_count_sql))[0]->active_user_count : null;
$data['active_user_count'] = $total_ids_list ? DB::select($active_user_count_sql)[0]->active_user_count : null;
$total_activity_time_sql = "
SELECT sum(majmoe) AS activity FROM (SELECT *,
@@ -739,9 +739,9 @@ class UserActivityController extends Controller
) user_activity_by_hour_and_
GROUP BY user_id) AS calculated_table;";
$data['total_activity_time'] = $total_ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : null;
$data['total_activity_time'] = $total_ids_list ? DB::select($total_activity_time_sql)[0]->activity : null;
$data['average'] = round(($total_ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : 0) / count(explode(',', $total_ids_list)), 2);
$data['average'] = round(($total_ids_list ? DB::select($total_activity_time_sql)[0]->activity : 0) / count(explode(',', $total_ids_list)), 2);
$top_10_activity_list_sql = "
SELECT *,
@@ -758,7 +758,7 @@ class UserActivityController extends Controller
ORDER BY quantity desc
LIMIT 10";
$data['top_10_activity_list'] = $total_ids_list ? DB::select(DB::raw($top_10_activity_list_sql)) : null;
$data['top_10_activity_list'] = $total_ids_list ? DB::select($top_10_activity_list_sql) : null;
$data['fromDate'] = $request->fromDate ? $request->fromDate : null;

30
app/Http/Controllers/UserController.php
View File

@@ -187,14 +187,14 @@ class UserController extends Controller
GROUP BY user_id
ORDER BY majmoe desc;";
foreach (DB::select(DB::raw($user_activity_quantity_sql)) as $key => $value) {
foreach (DB::select($user_activity_quantity_sql) as $key => $value) {
$user_activity_quantity_temp[$value->user_id] = [
"majmoe" => $value->quantity ?? 0,
"name" => $value->user_first_name ? $value->user_first_name." ".$value->user_last_name." (".$value->username.")" : $value->user_name." (".$value->username.")",
];
}
foreach (DB::select(DB::raw($user_activity_time_sql)) as $key => $value) {
foreach (DB::select($user_activity_time_sql) as $key => $value) {
$user_activity_time_temp[$value->user_id] = [
"majmoe" => $value->majmoe ?? 0,
"name" => $value->user_first_name ? $value->user_first_name." ".$value->user_last_name." (".$value->username.")" : $value->user_name." (".$value->username.")",
@@ -213,7 +213,7 @@ class UserController extends Controller
LIMIT 5
";
$activity_list = DB::select(DB::raw($user_activity_top_5_temp_sql));
$activity_list = DB::select($user_activity_top_5_temp_sql);
$sum = 0;
foreach ($activity_list as $index => $item) {
$sum += (int) $item->quantity;
@@ -231,17 +231,17 @@ class UserController extends Controller
'fromDate' => $request->fromDate ? $request->fromDate : null,
'toDate' => $request->toDate ? $request->toDate : null,
'user_activity_time' => $ids_list ? $user_activity_time_temp : null,
'hourly_activity_chart' => $ids_list ? DB::select(DB::raw($hourly_activity_chart_sql)) : null,
'quantitative_activity_chart' => $ids_list ? DB::select(DB::raw($quantitative_activity_chart_sql)) : null,
'total_activity_quantity' => $ids_list ? DB::select(DB::raw($total_activity_quantity_sql))[0]->total_activity_quantity : null,
'total_activity_time' => $ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : null,
'top_10_activity_list' => $ids_list ? DB::select(DB::raw($top_10_activity_list_sql)) : null,
'hourly_activity_chart' => $ids_list ? DB::select($hourly_activity_chart_sql) : null,
'quantitative_activity_chart' => $ids_list ? DB::select($quantitative_activity_chart_sql) : null,
'total_activity_quantity' => $ids_list ? DB::select($total_activity_quantity_sql)[0]->total_activity_quantity : null,
'total_activity_time' => $ids_list ? DB::select($total_activity_time_sql)[0]->activity : null,
'top_10_activity_list' => $ids_list ? DB::select($top_10_activity_list_sql) : null,
'user_activity_quantity' => $ids_list ? $user_activity_quantity_temp : null,
'group_name' => $user->first_name." ".$user->last_name,
'average' => round(($ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : 0) / 1, 2) ,
'average' => round(($ids_list ? DB::select($total_activity_time_sql)[0]->activity : 0) / 1, 2) ,
'user_activity_top_5_temp' => $user_activity_top_5_temp,
'total_user_count' => 1,
'active_user_count' => $ids_list ? DB::select(DB::raw($active_user_count_sql))[0]->active_user_count : null,
'active_user_count' => $ids_list ? DB::select($active_user_count_sql)[0]->active_user_count : null,
'group_id' => $user->id
];
@@ -1550,7 +1550,7 @@ class UserController extends Controller
->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id')
->leftJoin('cities', 'cities.id', '=', 'users.city_id')
->where('city_id', '>', 0)
->select(DB::raw('count(*) as count, item, city_id, name_fa'))
->select('count(*) as count, item, city_id, name_fa')
->groupBy('city_id', 'item')
->get();
// $items_array = $itemss->toArray();
@@ -1906,9 +1906,9 @@ class UserController extends Controller
WHERE created_at between '{$request->fromDate}' and '{$request->toDate}' and user_id IN(".$user->id.")
ORDER BY cnt desc";
$number_of_active_days = (DB::select(DB::raw($number_of_active_days))[0]->cnt ? DB::select(DB::raw($number_of_active_days))[0]->cnt : -1);
$activity_time = DB::select(DB::raw($temp_sql_for_activity_time))[0]->activity;
$number_of_activities = DB::select(DB::raw($number_of_activities))[0]->cnt;
$number_of_active_days = (DB::select($number_of_active_days)[0]->cnt ? DB::select($number_of_active_days)[0]->cnt : -1);
$activity_time = DB::select($temp_sql_for_activity_time)[0]->activity;
$number_of_activities = DB::select($number_of_activities)[0]->cnt;
$data = [
'number_of_active_days' => $number_of_active_days,
@@ -1917,7 +1917,7 @@ class UserController extends Controller
'number_of_activities' => $number_of_activities ,
'average_activity_number' => round(($user->id ? $number_of_activities : 0) / $number_of_active_days, 2) ,
'activity_list' => $user->id ? DB::select(DB::raw($temp_sql_for_activity_list)) : null,
'activity_list' => $user->id ? DB::select($temp_sql_for_activity_list) : null,
'last_login' => $user->last_login,
];
return $data;

5
app/Http/Controllers/V2/Dashboard/RoadObservationController.php
View File

@@ -24,6 +24,7 @@ use App\Exports\V2\RoadObservation\OperatorCartableExport;
use App\Exports\V2\RoadObservation\SupervisorCartableExport;
use App\Exports\V2\RoadObservation\PendingComplaintsExport;
use App\Exports\V2\RoadObservation\ReportComplaintsExport;
use Illuminate\Support\Str;
class RoadObservationController extends Controller
{
@@ -434,7 +435,9 @@ class RoadObservationController extends Controller
$files_path = [];
$file_index = 0;
$file_time = time();
$uuid = \Uuid::generate();
// $uuid = \Uuid::generate();
$uuid = (string) Str::uuid();
if ($request->file('image-before-1')) {
$roadObserved->files()->where('path', 'like', '%_image-before-1_%')->delete();

42
app/Http/Controllers/V2/Dashboard/RoadObservationReportController.php
View File

@@ -50,48 +50,6 @@ class RoadObservationReportController extends Controller
$data = processDataTable($request, '', $fields, $query);
// $data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')->select('road_observeds.id', 'province_fa', 'city_fa', 'FeatureTypeTitle', 'road_observeds.created_at', 'Title', 'Description', 'MobileForSendEventSms', 'lat', 'lng', 'rms_description', 'road_observeds.updated_at', 'rms_status', 'rms_last_activity_fa', 'rms_description', 'AutoId', 'edarate_shahri.name_fa')
// ->whereIn('fk_FeatureType', ['1', '2', '3', '4', '5', '6'])
// ->where('rms_status', "<>", 1)
// ->get();
// $all = DB::select(DB::raw(
// 'SELECT
// "کشوری" as province_fa,
// -1 as province_id,
// COUNT(*) tedade,
// SUM(tedad_mavarede_moshede_shode) as tedad_mavarede_moshede_shode,
// SUM(tedad_mavarede_peygiri_shode) as tedad_mavarede_peygiri_shode,
// SUM(tedad_faliyat_sabt_shode) as tedad_faliyat_sabt_shode,
// ROUND(SUM(distance)) as masafat_tey_shode
// FROM (SELECT
// province_id,
// province_fa,
// distance,
// (SELECT COUNT(*) FROM `observed_items` oi WHERE rp.`id`= oi.road_patrol_id) AS tedad_mavarede_moshede_shode,
// (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NOT NULL) AS tedad_mavarede_peygiri_shode,
// (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NULL) AS tedad_faliyat_sabt_shode
// FROM `road_patrols` rp where rp.start_time BETWEEN "'.$from_date.'" AND "'.$date_to.'") temp
// union
// SELECT
// province_fa,
// province_id,
// COUNT(*) tedade,
// SUM(tedad_mavarede_moshede_shode) as tedad_mavarede_moshede_shode,
// SUM(tedad_mavarede_peygiri_shode) as tedad_mavarede_peygiri_shode,
// SUM(tedad_faliyat_sabt_shode) as tedad_faliyat_sabt_shode,
// ROUND(SUM(distance)) as masafat_tey_shode
// FROM (SELECT
// province_id,
// province_fa,
// distance,
// (SELECT COUNT(*) FROM `observed_items` oi WHERE rp.`id`= oi.road_patrol_id) AS tedad_mavarede_moshede_shode,
// (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NOT NULL) AS tedad_mavarede_peygiri_shode,
// (SELECT COUNT(*) FROM `observed_items` oii WHERE rp.`id`= oii.road_patrol_id AND oii.road_item_id IS NOT NULL AND priority IS NULL) AS tedad_faliyat_sabt_shode
// FROM `road_patrols` rp where rp.start_time BETWEEN "'.$from_date.'" AND "'.$date_to.'") temp
// GROUP BY province_id
// '
// ));
return response()->json(
$data,
$data['status'],

14
app/Http/Controllers/V2/Dashboard/RoadPatrolProjectController.php
View File

@@ -18,7 +18,7 @@ use App\Models\RoadPatrol;
use App\Models\RoadItemsProject;
use App\Models\EdarateShahri;
use App\Models\InfoItem;
use App\Services\NominatimService;
use App\Exports\V2\RoadPatrol\OperatorCartableExport;
use App\Exports\V2\RoadPatrol\SupervisorCartableExport;
@@ -206,7 +206,7 @@ class RoadPatrolProjectController extends Controller
);
}
public function store(Request $request)
public function store(Request $request, NominatimService $nominatimService)
{
if (!auth()->user()->hasPermissionTo('add-road-patrol')) {
return response()->json([
@@ -264,7 +264,7 @@ class RoadPatrolProjectController extends Controller
$edare_name = auth()->user()->edarate_shahri_id ? auth()->user()->edarate_shahri_name : auth()->user()->edarate_ostani_name;
try {
$road_patrol = \DB::transaction(function () use ($request, $start_coordinates, $end_coordinates, $edare_id, $edare_name) {
$road_patrol = \DB::transaction(function () use ($request, $start_coordinates, $end_coordinates, $edare_id, $edare_name, $nominatimService) {
if (!$request->observed_items && !$request->description) {
throw ValidationException::withMessages([
"description" => __('validation.required', ['attribute' => 'description']),
@@ -287,8 +287,8 @@ class RoadPatrolProjectController extends Controller
'city_fa' => auth()->user()->city_fa,
'edare_id' => $edare_id,
'edare_name' => $edare_name,
'start_way_id' => get_way_id_from_nominatim($start_coordinates[0], $start_coordinates[1]),
'end_way_id' => get_way_id_from_nominatim($end_coordinates[0], $end_coordinates[1]),
'start_way_id' => $nominatimService->get_way_id_from_nominatim($start_coordinates[0], $start_coordinates[1]),
'end_way_id' => $nominatimService->get_way_id_from_nominatim($end_coordinates[0], $end_coordinates[1]),
'status' => 0,
'status_fa' => 'در حال بررسی',
'distance' => $request->distance,
@@ -397,8 +397,8 @@ class RoadPatrolProjectController extends Controller
'city_id' => auth()->user()->city_id,
'city_fa' => auth()->user()->city_fa,
'user_name' => auth()->user()->name,
'start_way_id' => get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
'end_way_id' => $item_end_coordinates ? get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
'start_way_id' => $nominatimService->get_way_id_from_nominatim($item_start_coordinates[0], $item_start_coordinates[1]),
'end_way_id' => $item_end_coordinates ? $nominatimService->get_way_id_from_nominatim($item_end_coordinates[0], $item_end_coordinates[1]) : null,
'unit_fa' => $info_item->sub_item_unit,
'created_at_fa' => verta(Carbon::now())->format('Y-m-d H:i:s'),
'info_id' => $info_item->id,

7
app/Http/Controllers/V2/Dashboard/SafetyAndPrivacyController.php
View File

@@ -17,6 +17,7 @@ use App\Models\EdarateShahri;
use App\Models\Contractor;
use Illuminate\Support\Facades\Validator;
use App\Models\SafetyAndPrivacy;
use App\Services\NominatimService;
use App\Models\InfoItem;
class SafetyAndPrivacyController extends Controller
@@ -84,7 +85,7 @@ class SafetyAndPrivacyController extends Controller
return view('version2.dashboard_pages.safety_and_privacy.operation_create');
}
public function operatorFirstStepStore(Request $request)
public function operatorFirstStepStore(Request $request, NominatimService $nominatimService)
{
if (! auth()->user()->hasAnyPermission(['add-safety-and-privacy'])) {
abort(403);
@@ -118,7 +119,7 @@ class SafetyAndPrivacyController extends Controller
$item = InfoItem::where('id', $request->info_id)->where('item', 17)->firstOrFail();
try {
$safety_and_privacy = \DB::transaction(function () use ($request, $coordinates, $item) {
$safety_and_privacy = \DB::transaction(function () use ($request, $coordinates, $item, $nominatimService) {
$safety_and_privacy = SafetyAndPrivacy::create([
'lat' => $coordinates[0],
'lon' => $coordinates[1],
@@ -133,7 +134,7 @@ class SafetyAndPrivacyController extends Controller
'activity_date_time' => $request->activity_date." ".$request->activity_time,
'edare_shahri_id' => auth()->user()->edarate_shahri_id,
'edare_shahri_name' => auth()->user()->edarate_shahri_name,
'way_id' => get_way_id_from_nominatim($coordinates[0], $coordinates[1]),
'way_id' => $nominatimService->get_way_id_from_nominatim(),
]);
if ($request->has('recognize_picture')) {