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

Resolve "Remove ... shortening in tables" #858

Merged
jankstudio merged 1 commit from 51-remove-shortening-in-tables into master 2018-03-14 14:30:25 +00:00
Conversation 2 Commits 1 Files changed 4 +21 -20
4 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Controller/VehicleManufacturerController.php
View file

@ -281,7 +281,8 @@ class VehicleManufacturerController extends BaseController
'mfg_name' => $vehicle->getManufacturer()->getName(), 'mfg_name' => $vehicle->getManufacturer()->getName(),
'make' => $vehicle->getMake(), 'make' => $vehicle->getMake(),
'model_year_from' => $vehicle->getModelYearFrom(), 'model_year_from' => $vehicle->getModelYearFrom(),
'model_year_to' => $vehicle->getModelYearTo() 'model_year_to' => $vehicle->getModelYearTo(),
'model_year' => $vehicle->getModelYearFormatted(),
]; ];
} }

15
templates/battery/form.html.twig
View file

@ -377,8 +377,7 @@
id: "{{ vehicle.getID }}", id: "{{ vehicle.getID }}",
mfg_name: "{{ vehicle.getManufacturer.getName }}", mfg_name: "{{ vehicle.getManufacturer.getName }}",
make: "{{ vehicle.getMake }}", make: "{{ vehicle.getMake }}",
model_year_from: "{{ vehicle.getModelYearFrom }}", model_year: "{{ vehicle.getModelYearFormatted }}",
model_year_to: "{{ vehicle.getModelYearTo }}"
}; };
vehicleRows.push(vrow); vehicleRows.push(vrow);
@ -410,7 +409,10 @@
var html = ''; var html = '';
$.each(response.data, function(index, vehicle) { $.each(response.data, function(index, vehicle) {
html += '<option value="' + vehicle.id + '" data-index="' + index + '">' + vehicle.make + ' (' + vehicle.model_year_from + '-' + vehicle.model_year_to + ')</option>'; var model_year = ''
if (vehicle.model_year != "-")
model_year = ' (' + vehicle.model_year + ')';
html += '<option value="' + vehicle.id + '" data-index="' + index + '">' + vehicle.make + model_year + '</option>';
}); });
field.html(html).prop('disabled', false); field.html(html).prop('disabled', false);
@ -485,7 +487,7 @@
{ {
field: 'id', field: 'id',
title: 'ID', title: 'ID',
width: 30 width: 60
}, },
{ {
field: 'mfg_name', field: 'mfg_name',
@ -496,11 +498,8 @@
title: 'Make' title: 'Make'
}, },
{ {
field: 'model_year_from', field: 'model_year',
title: 'Year', title: 'Year',
template: function (data) {
return data.model_year_from + ' - ' + data.model_year_to;
}
}, },
{ {
field: 'Actions', field: 'Actions',

19
templates/battery/list.html.twig
View file

@ -101,15 +101,15 @@
width: 150 width: 150
}, },
*/ */
{
field: 'model_name',
title: 'Brand',
width: 150
},
{ {
field: 'size_name', field: 'size_name',
title: 'Size', title: 'Size',
width: 100 width: 180
},
{
field: 'model_name',
title: 'Brand',
width: 120
}, },
/* /*
{ {
@ -121,16 +121,17 @@
{ {
field: 'warr_private', field: 'warr_private',
title: 'Private Wty.', title: 'Private Wty.',
width: 170 width: 50
}, },
{ {
field: 'warr_commercial', field: 'warr_commercial',
title: 'Commercial Wty.', title: 'Commercial Wty.',
width: 170 width: 50
}, },
{ {
field: 'sell_price', field: 'sell_price',
title: 'Price' title: 'Price',
width: 100
}, },
{ {
field: 'Actions', field: 'Actions',

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

@ -78,7 +78,7 @@
{ {
field: 'id', field: 'id',
title: 'ID', title: 'ID',
width: 30 width: 60
}, },
{ {
field: 'mfg_name', field: 'mfg_name',