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

fixed bug on every item of road items reports

Browse Source
This commit is contained in:
Hamidreza Ranjbarpour
2024-09-29 13:31:31 +00:00
parent aa2db2f145
commit bc26b75aea
32 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exports/Activities/Two/Alaem/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Alaem/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Bazrasi/City.php
View File

@@ -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', [

4
app/Exports/Activities/Two/Bazrasi/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Ezterari/City.php
View File

@@ -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', [

4
app/Exports/Activities/Two/Ezterari/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Harim/City.php
View File

@@ -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,

6
app/Exports/Activities/Two/Harim/Province.php
View File

@@ -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', [

2
app/Exports/Activities/Two/Hefaz/City.php
View File

@@ -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,

6
app/Exports/Activities/Two/Hefaz/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Imensazi/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Imensazi/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Khatkeshi/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Khatkeshi/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Mashinalat/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Mashinalat/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Paksazi/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Paksazi/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Pol/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Pol/Province.php
View File

@@ -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', [

2
app/Exports/Activities/Two/Rahdar/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Rahdar/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Rangamizi/City.php
View File

@@ -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', [

4
app/Exports/Activities/Two/Rangamizi/Province.php
View File

@@ -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', [

2
app/Exports/Activities/Two/Roshanaei/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Roshanaei/Province.php
View File

@@ -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', [

2
app/Exports/Activities/Two/Shosteshoo/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Shosteshoo/Province.php
View File

@@ -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,

2
app/Exports/Activities/Two/Toonel/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Toonel/Province.php
View File

@@ -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', [

2
app/Exports/Activities/Two/Zemestani/City.php
View File

@@ -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,

4
app/Exports/Activities/Two/Zemestani/Province.php
View File

@@ -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', [