rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Add mfg id to exported vehicle list, fix default sorting of vehicle results #746

Browse source
This commit is contained in:
Ramon Gutierrez 2023-08-09 06:01:24 +08:00
parent 4516566d56
commit e3af21f741
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Controller/VehicleController.php
View file

@ -70,11 +70,14 @@ class VehicleController extends Controller
// build query // build query
$query = $qb->select('q') $query = $qb->select('q')
->addSelect('mfg.name as mfg_name'); ->addSelect('mfg.name as mfg_name')
->addSelect('mfg.id as mfg_id');
// add filters to query // add filters to query
$this->setQueryFilters($datatable, $query); $this->setQueryFilters($datatable, $query);
error_log("test");
// check if sorting is present, otherwise use default // check if sorting is present, otherwise use default
if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) { if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
$prefix = ''; $prefix = '';
@ -85,7 +88,8 @@ class VehicleController extends Controller
$order = $datatable['sort']['sort'] ?? 'asc'; $order = $datatable['sort']['sort'] ?? 'asc';
$query->orderBy($prefix . $datatable['sort']['field'], $order); $query->orderBy($prefix . $datatable['sort']['field'], $order);
} else { } else {
$query->orderBy('mfg_name', 'asc'); $query->orderBy('mfg_name', 'asc')
->addOrderBy('q.make', 'asc');
} }
// get rows for this page // get rows for this page
@ -100,6 +104,7 @@ class VehicleController extends Controller
// add row data // add row data
$row['id'] = $orow[0]->getID(); $row['id'] = $orow[0]->getID();
$row['mfg_name'] = $orow['mfg_name']; $row['mfg_name'] = $orow['mfg_name'];
$row['mfg_id'] = $orow['mfg_id'];
$row['make'] = $orow[0]->getMake(); $row['make'] = $orow[0]->getMake();
$row['model_year_from'] = $orow[0]->getModelYearFrom(); $row['model_year_from'] = $orow[0]->getModelYearFrom();
$row['model_year_to'] = $orow[0]->getModelYearTo(); $row['model_year_to'] = $orow[0]->getModelYearTo();

2
templates/vehicle/list.html.twig
View file

@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<div class="col-xl-4 order-1 order-xl-2 m--align-right"> <div class="col-xl-4 order-1 order-xl-2 m--align-right">
<button type="button" class="btn btn-success m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill mr-2" data-export-csv data-url="{{ url('vehicle_rows') }}" data-method="post" data-headers="ID,Name,Manufacturer" data-fields="id,make,mfg_name" data-filename="resq-vehicle-make-list-{{ 'now'|date('Y-m-d') }}"> <button type="button" class="btn btn-success m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill mr-2" data-export-csv data-url="{{ url('vehicle_rows') }}" data-method="post" data-headers="ID,Name,Manufacturer ID,Manufacturer,Model Year From,Model Year To" data-fields="id,make,mfg_id,mfg_name,model_year_from,model_year_to" data-filename="resq-vehicle-make-list-{{ 'now'|date('Y-m-d') }}">
<span> <span>
<i class="fa fa-list"></i> <i class="fa fa-list"></i>
<span>Export Vehicle List</span> <span>Export Vehicle List</span>