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

change the report/map routes into v2

Browse Source
This commit is contained in:
Witel Group
2024-02-18 08:33:19 +00:00
parent 25c33eb478
commit 8176faf117
123 changed files with 217538 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Traits/ReceiptReportAble.php
View File

@@ -7,7 +7,7 @@ trait ReceiptReportAble
{
public static function cityReceiptData($from_date, $date_to, $province_id): array
{
return DB::select(DB::raw(
return DB::select(
'SELECT
city_fa,
city_id,
@@ -25,13 +25,13 @@ trait ReceiptReportAble
where created_at BETWEEN "'.$from_date.'" AND "'.$date_to.'" AND province_id ='.$province_id.'
GROUP BY city_id
'
));
);
}
public static function provinceReceiptData($from_date, $date_to) : array {
return DB::select(DB::raw(
return DB::select(
'SELECT
"کشوری" as province_fa,
-1 as province_id,
@@ -67,7 +67,7 @@ trait ReceiptReportAble
where created_at BETWEEN "'.$from_date.'" AND "'.$date_to.'"
GROUP BY province_id
'
));
);
}
}

12
app/Traits/RoadPatrolTrait.php → app/Traits/ReportAble.php
View File

@@ -7,7 +7,7 @@ trait ReportAble
{
public static function edarehPatrolData($from_date, $date_to, $province_id): array
{
return DB::select(DB::raw(
return DB::select(
'SELECT
province_fa,
province_id,
@@ -34,13 +34,12 @@ trait ReportAble
FROM `road_patrols` rp where rp.province_id = "'.$province_id.'" AND rp.start_time BETWEEN "'.$from_date.'" AND "'.$date_to.'") temp
GROUP BY edare_id
'
));
);
}
public static function provincePatrolData($from_date, $date_to) : array {
return DB::select(DB::raw(
'SELECT
return DB::select('SELECT
"کشوری" as province_fa,
-1 as province_id,
COUNT(*) tedade,
@@ -81,9 +80,8 @@ trait ReportAble
(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
'
));
GROUP BY province_id'
);
}
}

4
app/Traits/SafetyAndPrivacyReportAble.php
View File

@@ -53,7 +53,7 @@ trait SafetyAndPrivacyReportAble
$all[$value->id]["id"] = $value->id;
}
$temp = DB::select(DB::raw("SELECT COUNT(*) as qty,info_id, step,step_fa, info_fa FROM safety_and_privacy where created_at BETWEEN '".$from_date."' and '".$date_to."' GROUP BY info_id,step"));
$temp = DB::select("SELECT COUNT(*) as qty,info_id, step,step_fa, info_fa FROM safety_and_privacy where created_at BETWEEN '".$from_date."' and '".$date_to."' GROUP BY info_id,step");
$sum = 0;
foreach ($temp as $key => $value) {
@@ -62,7 +62,7 @@ trait SafetyAndPrivacyReportAble
$all[0]["sum"] = $sum;
}
$temp = DB::select(DB::raw("SELECT province_id, COUNT(*) as qty,info_id, step,step_fa, info_fa FROM safety_and_privacy where created_at BETWEEN '".$from_date."' and '".$date_to."' GROUP BY info_id,step,province_id order by province_id"));
$temp = DB::select("SELECT province_id, COUNT(*) as qty,info_id, step,step_fa, info_fa FROM safety_and_privacy where created_at BETWEEN '".$from_date."' and '".$date_to."' GROUP BY info_id,step,province_id order by province_id");
$province_id_flag = "";
$sum = 0;