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

Milad made major changes in road observation (e.g. fast react)

Browse Source
This commit is contained in:
Hamidreza Ranjbarpour
2024-10-03 13:32:08 +00:00
parent c82e56ebfc
commit 6651275676
10 changed files with 3273 additions and 3125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
app/Exports/V2/RoadObservation/SupervisorCartableExport.php
View File

@@ -26,11 +26,11 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
$this->toDate = $toDate;
$this->province_id = $province_id;
}
public function view(): View
{
$fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00': null;
$toDate = $this->toDate ? $this->toDate . ' 23:59:59': null;
$fromDate = $this->fromDate ? $this->fromDate . ' 00:00:00' : null;
$toDate = $this->toDate ? $this->toDate . ' 23:59:59' : null;
$status = $this->status;
@@ -38,29 +38,29 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
if (auth()->user()->hasPermissionTo('supervise-fast-react')) {
$data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
// ->where('rms_status', '!=', 0)
->whereNotNull('road_observeds.status')
->when($this->id, function($query, $id){
return $query->where('road_observeds.id', 'LIKE', '%'. $id. '%');
})
->when(!is_null($status), function($query) use ($status){
return $query->where('status', $status);
})
->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
})
->when($this->province_id, function($query, $province_id){
return $query->where('road_observeds.province_id', $province_id);
})
// ->where(function ($query) {
// $query->where('status', 0)
// ->orWhere('supervisor_id', auth()->user()->id);
// })
->selectRaw('AutoID, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
// ->where('rms_status', '!=', 0)
->whereNotNull('road_observeds.status')
->when($this->id, function ($query, $id) {
return $query->where('road_observeds.id', 'LIKE', '%' . $id . '%');
})
->when(!is_null($status), function ($query) use ($status) {
return $query->where('status', $status);
})
->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
})
->when($this->province_id, function ($query, $province_id) {
return $query->where('road_observeds.province_id', $province_id);
})
// ->where(function ($query) {
// $query->where('status', 0)
// ->orWhere('supervisor_id', auth()->user()->id);
// })
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa')
->orderBy('status')
->orderBy('road_observeds.id', 'desc')
->get();
->orderBy('status')
->orderBy('road_observeds.id', 'desc')
->get();
} elseif (auth()->user()->hasPermissionTo('supervise-fast-react-province')) {
if (is_null(auth()->user()->province_id)) {
@@ -70,30 +70,30 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
}
$data = RoadObserved::leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')
// ->where('rms_status', '!=', 0)
->where('road_observeds.province_id', auth()->user()->province_id)
->whereNotNull('road_observeds.status')
->when($this->id, function($query, $id){
return $query->where('road_observeds.id', 'LIKE', '%'. $id. '%');
})
->when(!is_null($status), function($query) use ($status){
return $query->where('status', $status);
})
->when(($fromDate && $toDate), function($query) use($fromDate, $toDate){
return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
})
// ->when($this->province_id, function($query, $province_id){
// return $query->where('province_id', $province_id);
// })
// ->where(function ($query) {
// $query->where('status', 0)
// ->orWhere('supervisor_id', auth()->user()->id);
// })
->selectRaw('AutoID, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
// ->where('rms_status', '!=', 0)
->where('road_observeds.province_id', auth()->user()->province_id)
->whereNotNull('road_observeds.status')
->when($this->id, function ($query, $id) {
return $query->where('road_observeds.id', 'LIKE', '%' . $id . '%');
})
->when(!is_null($status), function ($query) use ($status) {
return $query->where('status', $status);
})
->when(($fromDate && $toDate), function ($query) use ($fromDate, $toDate) {
return $query->whereBetween('rms_last_activity', [$fromDate, $toDate]);
})
// ->when($this->province_id, function($query, $province_id){
// return $query->where('province_id', $province_id);
// })
// ->where(function ($query) {
// $query->where('status', 0)
// ->orWhere('supervisor_id', auth()->user()->id);
// })
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, road_observeds.province_id, edarate_shahri.name_fa as edarate_shahri_name_fa, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, status_fa, supervisor_description, rms_description, province_fa, city_fa')
->orderBy('status')
->orderBy('road_observeds.id', 'desc')
->get();
->orderBy('status')
->orderBy('road_observeds.id', 'desc')
->get();
}
return view('excel.V2.RoadObservation.supervisor_cartable', [
@@ -105,11 +105,11 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
/**
* @return array
*/
*/
public function registerEvents(): array
{
return [
AfterSheet::class => function(AfterSheet $event) {
AfterSheet::class => function (AfterSheet $event) {
$event->sheet->getDelegate()->setRightToLeft(true);
},
];
@@ -126,7 +126,7 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
$drawing->setOffsetX(5);
$drawing->setOffsetY(5);
$drawing->setCoordinates('A1');
$drawing2 = new Drawing();
$drawing2->setName('Logo');
$drawing2->setDescription('This is my logo');
@@ -144,7 +144,7 @@ class SupervisorCartableExport implements FromView, ShouldAutoSize, WithEvents,
return [
// Style the first row as bold text.
'A:BA' => [
'A:BA' => [
'font' => [
'name' => 'B Nazanin'
]