From bc26b75aeab079b8ecbfd558369080a3c90383c9 Mon Sep 17 00:00:00 2001 From: Hamidreza Ranjbarpour Date: Sun, 29 Sep 2024 13:31:31 +0000 Subject: [PATCH] fixed bug on every item of road items reports --- app/Exports/Activities/Two/Alaem/City.php | 2 +- app/Exports/Activities/Two/Alaem/Province.php | 4 ++-- app/Exports/Activities/Two/Bazrasi/City.php | 2 +- app/Exports/Activities/Two/Bazrasi/Province.php | 4 ++-- app/Exports/Activities/Two/Ezterari/City.php | 2 +- app/Exports/Activities/Two/Ezterari/Province.php | 4 ++-- app/Exports/Activities/Two/Harim/City.php | 2 +- app/Exports/Activities/Two/Harim/Province.php | 6 +++--- app/Exports/Activities/Two/Hefaz/City.php | 2 +- app/Exports/Activities/Two/Hefaz/Province.php | 6 +++--- app/Exports/Activities/Two/Imensazi/City.php | 2 +- app/Exports/Activities/Two/Imensazi/Province.php | 4 ++-- app/Exports/Activities/Two/Khatkeshi/City.php | 2 +- app/Exports/Activities/Two/Khatkeshi/Province.php | 4 ++-- app/Exports/Activities/Two/Mashinalat/City.php | 2 +- app/Exports/Activities/Two/Mashinalat/Province.php | 4 ++-- app/Exports/Activities/Two/Paksazi/City.php | 2 +- app/Exports/Activities/Two/Paksazi/Province.php | 4 ++-- app/Exports/Activities/Two/Pol/City.php | 2 +- app/Exports/Activities/Two/Pol/Province.php | 4 ++-- app/Exports/Activities/Two/Rahdar/City.php | 2 +- app/Exports/Activities/Two/Rahdar/Province.php | 4 ++-- app/Exports/Activities/Two/Rangamizi/City.php | 2 +- app/Exports/Activities/Two/Rangamizi/Province.php | 4 ++-- app/Exports/Activities/Two/Roshanaei/City.php | 2 +- app/Exports/Activities/Two/Roshanaei/Province.php | 4 ++-- app/Exports/Activities/Two/Shosteshoo/City.php | 2 +- app/Exports/Activities/Two/Shosteshoo/Province.php | 4 ++-- app/Exports/Activities/Two/Toonel/City.php | 2 +- app/Exports/Activities/Two/Toonel/Province.php | 4 ++-- app/Exports/Activities/Two/Zemestani/City.php | 2 +- app/Exports/Activities/Two/Zemestani/Province.php | 4 ++-- 32 files changed, 50 insertions(+), 50 deletions(-) diff --git a/app/Exports/Activities/Two/Alaem/City.php b/app/Exports/Activities/Two/Alaem/City.php index 23e26873..2f26bf03 100644 --- a/app/Exports/Activities/Two/Alaem/City.php +++ b/app/Exports/Activities/Two/Alaem/City.php @@ -56,7 +56,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Alaem.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Alaem/Province.php b/app/Exports/Activities/Two/Alaem/Province.php index 88df42b3..778b8a5d 100644 --- a/app/Exports/Activities/Two/Alaem/Province.php +++ b/app/Exports/Activities/Two/Alaem/Province.php @@ -56,7 +56,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); @@ -88,7 +88,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Alaem.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Bazrasi/City.php b/app/Exports/Activities/Two/Bazrasi/City.php index b413c93f..afc41466 100644 --- a/app/Exports/Activities/Two/Bazrasi/City.php +++ b/app/Exports/Activities/Two/Bazrasi/City.php @@ -51,7 +51,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Bazrasi.City', [ diff --git a/app/Exports/Activities/Two/Bazrasi/Province.php b/app/Exports/Activities/Two/Bazrasi/Province.php index 20d7a96f..9c086354 100644 --- a/app/Exports/Activities/Two/Bazrasi/Province.php +++ b/app/Exports/Activities/Two/Bazrasi/Province.php @@ -50,7 +50,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as AbniyeFaniCount, @@ -74,7 +74,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Bazrasi.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Ezterari/City.php b/app/Exports/Activities/Two/Ezterari/City.php index 248f6e04..68fa0405 100644 --- a/app/Exports/Activities/Two/Ezterari/City.php +++ b/app/Exports/Activities/Two/Ezterari/City.php @@ -57,7 +57,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Ezterari.City', [ diff --git a/app/Exports/Activities/Two/Ezterari/Province.php b/app/Exports/Activities/Two/Ezterari/Province.php index d48ddb2d..db627a85 100644 --- a/app/Exports/Activities/Two/Ezterari/Province.php +++ b/app/Exports/Activities/Two/Ezterari/Province.php @@ -56,7 +56,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as PaksaziCount, @@ -86,7 +86,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Ezterari.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Harim/City.php b/app/Exports/Activities/Two/Harim/City.php index cb15c3a2..d79fddde 100644 --- a/app/Exports/Activities/Two/Harim/City.php +++ b/app/Exports/Activities/Two/Harim/City.php @@ -51,7 +51,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Harim.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Harim/Province.php b/app/Exports/Activities/Two/Harim/Province.php index 11c6aa07..6add776d 100644 --- a/app/Exports/Activities/Two/Harim/Province.php +++ b/app/Exports/Activities/Two/Harim/Province.php @@ -49,7 +49,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT @@ -66,7 +66,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings COUNT(CASE WHEN sub_item = 6 THEN 1 END) as JamavariBannerCount, SUM(CASE WHEN sub_item = 6 THEN sub_item_data END) as JamavariBannerSum FROM road_items_projects - WHERE item = 10 ans status = 1"; + WHERE item = 10 and status = 1"; if ($this->province) { $countryQuery .= " AND province_id = {$this->province}"; @@ -74,7 +74,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Harim.Province', [ diff --git a/app/Exports/Activities/Two/Hefaz/City.php b/app/Exports/Activities/Two/Hefaz/City.php index 32f85012..45dc0181 100644 --- a/app/Exports/Activities/Two/Hefaz/City.php +++ b/app/Exports/Activities/Two/Hefaz/City.php @@ -45,7 +45,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Hefaz.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Hefaz/Province.php b/app/Exports/Activities/Two/Hefaz/Province.php index 7445be7e..d7bb03cc 100644 --- a/app/Exports/Activities/Two/Hefaz/Province.php +++ b/app/Exports/Activities/Two/Hefaz/Province.php @@ -36,7 +36,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings province_id, province_fa FROM road_items_projects - WHERE item = 4 ans status = 1 "; + WHERE item = 4 and status = 1 "; if ($this->province) { $query .= " AND province_id = {$this->province}"; @@ -44,7 +44,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); @@ -64,7 +64,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Hefaz.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Imensazi/City.php b/app/Exports/Activities/Two/Imensazi/City.php index 9c149bd6..4fe71912 100644 --- a/app/Exports/Activities/Two/Imensazi/City.php +++ b/app/Exports/Activities/Two/Imensazi/City.php @@ -63,7 +63,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Imensazi.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Imensazi/Province.php b/app/Exports/Activities/Two/Imensazi/Province.php index ebfdae1e..dcbfc3c3 100644 --- a/app/Exports/Activities/Two/Imensazi/Province.php +++ b/app/Exports/Activities/Two/Imensazi/Province.php @@ -62,7 +62,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as ImensaziSarguardCount, @@ -98,7 +98,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Imensazi.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Khatkeshi/City.php b/app/Exports/Activities/Two/Khatkeshi/City.php index 47118b3a..a974de12 100644 --- a/app/Exports/Activities/Two/Khatkeshi/City.php +++ b/app/Exports/Activities/Two/Khatkeshi/City.php @@ -50,7 +50,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Khatkeshi.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Khatkeshi/Province.php b/app/Exports/Activities/Two/Khatkeshi/Province.php index b85c574e..92d377d0 100644 --- a/app/Exports/Activities/Two/Khatkeshi/Province.php +++ b/app/Exports/Activities/Two/Khatkeshi/Province.php @@ -50,7 +50,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as KhatkeshiRangGarmCount, @@ -74,7 +74,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Khatkeshi.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Mashinalat/City.php b/app/Exports/Activities/Two/Mashinalat/City.php index d74139e7..15f6f0db 100644 --- a/app/Exports/Activities/Two/Mashinalat/City.php +++ b/app/Exports/Activities/Two/Mashinalat/City.php @@ -60,7 +60,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Mashinalat.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Mashinalat/Province.php b/app/Exports/Activities/Two/Mashinalat/Province.php index 9fad11cf..d5e5ae12 100644 --- a/app/Exports/Activities/Two/Mashinalat/Province.php +++ b/app/Exports/Activities/Two/Mashinalat/Province.php @@ -60,7 +60,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as BenzinMasrafiCount, @@ -86,7 +86,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Mashinalat.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Paksazi/City.php b/app/Exports/Activities/Two/Paksazi/City.php index 3e1082a2..eba382f0 100644 --- a/app/Exports/Activities/Two/Paksazi/City.php +++ b/app/Exports/Activities/Two/Paksazi/City.php @@ -76,7 +76,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Paksazi.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Paksazi/Province.php b/app/Exports/Activities/Two/Paksazi/Province.php index 3a2c33d8..1226a98c 100644 --- a/app/Exports/Activities/Two/Paksazi/Province.php +++ b/app/Exports/Activities/Two/Paksazi/Province.php @@ -76,7 +76,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as PaksaziSathRahCount, @@ -126,7 +126,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Paksazi.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Pol/City.php b/app/Exports/Activities/Two/Pol/City.php index 0136deef..086f086d 100644 --- a/app/Exports/Activities/Two/Pol/City.php +++ b/app/Exports/Activities/Two/Pol/City.php @@ -59,7 +59,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Pol.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Pol/Province.php b/app/Exports/Activities/Two/Pol/Province.php index a4b1a4dc..9b15753f 100644 --- a/app/Exports/Activities/Two/Pol/Province.php +++ b/app/Exports/Activities/Two/Pol/Province.php @@ -58,7 +58,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as EhdasGharnizPolCount, @@ -90,7 +90,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Pol.Province', [ diff --git a/app/Exports/Activities/Two/Rahdar/City.php b/app/Exports/Activities/Two/Rahdar/City.php index d358a371..0ff15e1b 100644 --- a/app/Exports/Activities/Two/Rahdar/City.php +++ b/app/Exports/Activities/Two/Rahdar/City.php @@ -45,7 +45,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Rahdar.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Rahdar/Province.php b/app/Exports/Activities/Two/Rahdar/Province.php index a102a116..b7933b56 100644 --- a/app/Exports/Activities/Two/Rahdar/Province.php +++ b/app/Exports/Activities/Two/Rahdar/Province.php @@ -42,7 +42,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as TamiratCount, @@ -58,7 +58,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Rahdar.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Rangamizi/City.php b/app/Exports/Activities/Two/Rangamizi/City.php index fa13ba89..94aba458 100644 --- a/app/Exports/Activities/Two/Rangamizi/City.php +++ b/app/Exports/Activities/Two/Rangamizi/City.php @@ -57,7 +57,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Rangamizi.City', [ diff --git a/app/Exports/Activities/Two/Rangamizi/Province.php b/app/Exports/Activities/Two/Rangamizi/Province.php index 9a294bb3..01a1b74a 100644 --- a/app/Exports/Activities/Two/Rangamizi/Province.php +++ b/app/Exports/Activities/Two/Rangamizi/Province.php @@ -55,7 +55,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as RangamiziTabloCount, @@ -85,7 +85,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Rangamizi.Province', [ diff --git a/app/Exports/Activities/Two/Roshanaei/City.php b/app/Exports/Activities/Two/Roshanaei/City.php index d9006734..650e4b83 100644 --- a/app/Exports/Activities/Two/Roshanaei/City.php +++ b/app/Exports/Activities/Two/Roshanaei/City.php @@ -61,7 +61,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Roshanaei.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Roshanaei/Province.php b/app/Exports/Activities/Two/Roshanaei/Province.php index ed22a371..0edbdb43 100644 --- a/app/Exports/Activities/Two/Roshanaei/Province.php +++ b/app/Exports/Activities/Two/Roshanaei/Province.php @@ -60,7 +60,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT COUNT(CASE WHEN sub_item = 1 THEN 1 END) as NegahdariToolCount, @@ -94,7 +94,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Roshanaei.Province', [ diff --git a/app/Exports/Activities/Two/Shosteshoo/City.php b/app/Exports/Activities/Two/Shosteshoo/City.php index 8512844b..58fa146e 100644 --- a/app/Exports/Activities/Two/Shosteshoo/City.php +++ b/app/Exports/Activities/Two/Shosteshoo/City.php @@ -52,7 +52,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Shosteshoo.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Shosteshoo/Province.php b/app/Exports/Activities/Two/Shosteshoo/Province.php index 7440be9b..18b2dea9 100644 --- a/app/Exports/Activities/Two/Shosteshoo/Province.php +++ b/app/Exports/Activities/Two/Shosteshoo/Province.php @@ -51,7 +51,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); $countryQuery = "SELECT @@ -78,7 +78,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Shosteshoo.Province', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Toonel/City.php b/app/Exports/Activities/Two/Toonel/City.php index 1bd56375..1edd3fdd 100644 --- a/app/Exports/Activities/Two/Toonel/City.php +++ b/app/Exports/Activities/Two/Toonel/City.php @@ -59,7 +59,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Toonel.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Toonel/Province.php b/app/Exports/Activities/Two/Toonel/Province.php index 87d3cde0..603eb938 100644 --- a/app/Exports/Activities/Two/Toonel/Province.php +++ b/app/Exports/Activities/Two/Toonel/Province.php @@ -57,7 +57,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); @@ -91,7 +91,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Toonel.Province', [ diff --git a/app/Exports/Activities/Two/Zemestani/City.php b/app/Exports/Activities/Two/Zemestani/City.php index 124680a9..4e997d93 100644 --- a/app/Exports/Activities/Two/Zemestani/City.php +++ b/app/Exports/Activities/Two/Zemestani/City.php @@ -50,7 +50,7 @@ class City implements FromView, ShouldAutoSize, WithEvents, WithDrawings $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY city_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); return view('excel.CurrentActivities.Zemestani.City', [ 'data' => $data, diff --git a/app/Exports/Activities/Two/Zemestani/Province.php b/app/Exports/Activities/Two/Zemestani/Province.php index f9bcb581..c3b54950 100644 --- a/app/Exports/Activities/Two/Zemestani/Province.php +++ b/app/Exports/Activities/Two/Zemestani/Province.php @@ -47,7 +47,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings } $query .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}' GROUP BY province_id ORDER BY province_id ASC;"; - $data = DB::select(DB::raw($query)); + $data = DB::select($query); @@ -71,7 +71,7 @@ class Province implements FromView, ShouldAutoSize, WithEvents, WithDrawings $countryQuery .= " AND activity_date_time BETWEEN '{$fromDate}' AND '{$toDate}';"; - $country = DB::select(DB::raw($countryQuery)); + $country = DB::select($countryQuery); return view('excel.CurrentActivities.Zemestani.Province', [