mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 01:25:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show manufacturer, partUnit and footprint in parts table.

Browse source
This commit is contained in:
Jan Böhmer 2019-09-07 13:12:24 +02:00
parent 41a0317736
commit 01eff5e873
1 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/DataTables/PartsDataTable.php
View file

@ -58,6 +58,20 @@ class PartsDataTable implements DataTableTypeInterface
$this->translator = $translator; $this->translator = $translator;
} }
protected function getQuery(QueryBuilder $builder)
{
$builder->select('p')
->addSelect('category')
->addSelect('footprint')
->addSelect('manufacturer')
->addSelect('partUnit')
->from(Part::class, 'p')
->leftJoin('p.category', 'category')
->leftJoin('p.footprint', 'footprint')
->leftJoin('p.manufacturer', 'manufacturer')
->leftJoin('p.partUnit', 'partUnit');
}
protected function buildCriteria(QueryBuilder $builder, array $options) protected function buildCriteria(QueryBuilder $builder, array $options)
{ {
if (isset($options['category'])) { if (isset($options['category'])) {
@ -104,6 +118,14 @@ class PartsDataTable implements DataTableTypeInterface
'field' => 'category.name', 'field' => 'category.name',
'label' => $this->translator->trans('part.table.category') 'label' => $this->translator->trans('part.table.category')
]) ])
->add('footprint', TextColumn::class, [
'field' => 'footprint.name',
'label' => $this->translator->trans('part.table.footprint')
])
->add('manufacturer', TextColumn::class, [
'field' => 'manufacturer.name',
'label' => $this->translator->trans('part.table.manufacturer')
])
//->add('footprint', TextColumn::class, ['field' => 'footprint.name']) //->add('footprint', TextColumn::class, ['field' => 'footprint.name'])
//->add('manufacturer', TextColumn::class, ['field' => 'manufacturer.name' ]) //->add('manufacturer', TextColumn::class, ['field' => 'manufacturer.name' ])
//->add('amountSum', TextColumn::class, ['label' => 'instock.label_short']) //->add('amountSum', TextColumn::class, ['label' => 'instock.label_short'])
@ -112,10 +134,14 @@ class PartsDataTable implements DataTableTypeInterface
'propertyPath' => 'amountSum' 'propertyPath' => 'amountSum'
]) ])
->add('minamount', TextColumn::class, [ ->add('minamount', TextColumn::class, [
'label' => $this->translator->trans('part.table.minamount') 'label' => $this->translator->trans('part.table.minamount'),
'visible' => false
])
->add('partUnit', TextColumn::class, [
'field' => 'partUnit.name',
'label' => $this->translator->trans('part.table.partUnit'),
'visible' => false
]) ])
//->add('storelocation', TextColumn::class, ['field' => 'storelocation.name', 'label' => 'storelocation.label'])
->add('addedDate', LocaleDateTimeColumn::class, [ ->add('addedDate', LocaleDateTimeColumn::class, [
'label' => $this->translator->trans('part.table.addedDate'), 'label' => $this->translator->trans('part.table.addedDate'),
'visible' => false 'visible' => false
@ -166,6 +192,9 @@ class PartsDataTable implements DataTableTypeInterface
->addOrderBy('name') ->addOrderBy('name')
->createAdapter(ORMAdapter::class, [ ->createAdapter(ORMAdapter::class, [
'query' => function(QueryBuilder $builder) {
$this->getQuery($builder);
},
'entity' => Part::class, 'entity' => Part::class,
'criteria' => [ 'criteria' => [
function (QueryBuilder $builder) use ($options) { function (QueryBuilder $builder) use ($options) {