mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-06-24 02:38:50 +02:00
fixed tab/spaces in PartsDataTable
This commit is contained in:
misaz
parent
9d54001f89
commit
0753b7137f
1 changed files with 397 additions and 397 deletions
|
|
@ -63,161 +63,161 @@ use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
|
||||||
final class PartsDataTable implements DataTableTypeInterface
|
final class PartsDataTable implements DataTableTypeInterface
|
||||||
{
|
{
|
||||||
public function __construct(private readonly EntityURLGenerator $urlGenerator, private readonly TranslatorInterface $translator, private readonly AmountFormatter $amountFormatter, private readonly PartDataTableHelper $partDataTableHelper, private readonly Security $security, private readonly string $default_part_columns, protected LoggerInterface $logger)
|
public function __construct(private readonly EntityURLGenerator $urlGenerator, private readonly TranslatorInterface $translator, private readonly AmountFormatter $amountFormatter, private readonly PartDataTableHelper $partDataTableHelper, private readonly Security $security, private readonly string $default_part_columns, protected LoggerInterface $logger)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configureOptions(OptionsResolver $optionsResolver): void
|
public function configureOptions(OptionsResolver $optionsResolver): void
|
||||||
{
|
{
|
||||||
$optionsResolver->setDefaults([
|
$optionsResolver->setDefaults([
|
||||||
'filter' => null,
|
'filter' => null,
|
||||||
'search' => null
|
'search' => null
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$optionsResolver->setAllowedTypes('filter', [PartFilter::class, 'null']);
|
$optionsResolver->setAllowedTypes('filter', [PartFilter::class, 'null']);
|
||||||
$optionsResolver->setAllowedTypes('search', [PartSearchFilter::class, 'null']);
|
$optionsResolver->setAllowedTypes('search', [PartSearchFilter::class, 'null']);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configure(DataTable $dataTable, array $options): void
|
public function configure(DataTable $dataTable, array $options): void
|
||||||
{
|
{
|
||||||
$resolver = new OptionsResolver();
|
$resolver = new OptionsResolver();
|
||||||
$this->configureOptions($resolver);
|
$this->configureOptions($resolver);
|
||||||
$options = $resolver->resolve($options);
|
$options = $resolver->resolve($options);
|
||||||
|
|
||||||
$dataTable
|
$dataTable
|
||||||
//Color the table rows depending on the review and favorite status
|
//Color the table rows depending on the review and favorite status
|
||||||
->add('dont_matter', RowClassColumn::class, [
|
->add('dont_matter', RowClassColumn::class, [
|
||||||
'render' => function ($value, Part $context): string {
|
'render' => function ($value, Part $context): string {
|
||||||
if ($context->isNeedsReview()) {
|
if ($context->isNeedsReview()) {
|
||||||
return 'table-secondary';
|
return 'table-secondary';
|
||||||
}
|
}
|
||||||
if ($context->isFavorite()) {
|
if ($context->isFavorite()) {
|
||||||
return 'table-info';
|
return 'table-info';
|
||||||
}
|
}
|
||||||
|
|
||||||
return ''; //Default coloring otherwise
|
return ''; //Default coloring otherwise
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
->add('select', SelectColumn::class)
|
->add('select', SelectColumn::class)
|
||||||
->add('picture', TextColumn::class, [
|
->add('picture', TextColumn::class, [
|
||||||
'label' => '',
|
'label' => '',
|
||||||
'className' => 'no-colvis',
|
'className' => 'no-colvis',
|
||||||
'render' => fn($value, Part $context) => $this->partDataTableHelper->renderPicture($context),
|
'render' => fn($value, Part $context) => $this->partDataTableHelper->renderPicture($context),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
||||||
// internal array of $dataTable->add(...) parameters. Parameters will be later passed to the method
|
// internal array of $dataTable->add(...) parameters. Parameters will be later passed to the method
|
||||||
// after sorting columns according to TABLE_PART_DEFAULT_COLUMNS option.
|
// after sorting columns according to TABLE_PART_DEFAULT_COLUMNS option.
|
||||||
$columns = [];
|
$columns = [];
|
||||||
|
|
||||||
$columns['name'] = [
|
$columns['name'] = [
|
||||||
'name', TextColumn::class,
|
'name', TextColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.name'),
|
'label' => $this->translator->trans('part.table.name'),
|
||||||
'render' => fn($value, Part $context) => $this->partDataTableHelper->renderName($context),
|
'render' => fn($value, Part $context) => $this->partDataTableHelper->renderName($context),
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['id'] = [
|
$columns['id'] = [
|
||||||
'id', TextColumn::class,
|
'id', TextColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.id'),
|
'label' => $this->translator->trans('part.table.id'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['ipn'] = [
|
$columns['ipn'] = [
|
||||||
'ipn', TextColumn::class,
|
'ipn', TextColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.ipn'),
|
'label' => $this->translator->trans('part.table.ipn'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['description'] = [
|
$columns['description'] = [
|
||||||
'description', MarkdownColumn::class,
|
'description', MarkdownColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.description'),
|
'label' => $this->translator->trans('part.table.description'),
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($this->security->isGranted('@categories.read')) {
|
if ($this->security->isGranted('@categories.read')) {
|
||||||
$columns['category'] = [
|
$columns['category'] = [
|
||||||
'category', EntityColumn::class,
|
'category', EntityColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.category'),
|
'label' => $this->translator->trans('part.table.category'),
|
||||||
'property' => 'category',
|
'property' => 'category',
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->security->isGranted('@footprints.read')) {
|
if ($this->security->isGranted('@footprints.read')) {
|
||||||
$columns['footprint'] = [
|
$columns['footprint'] = [
|
||||||
'footprint', EntityColumn::class,
|
'footprint', EntityColumn::class,
|
||||||
[
|
[
|
||||||
'property' => 'footprint',
|
'property' => 'footprint',
|
||||||
'label' => $this->translator->trans('part.table.footprint'),
|
'label' => $this->translator->trans('part.table.footprint'),
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
if ($this->security->isGranted('@manufacturers.read')) {
|
if ($this->security->isGranted('@manufacturers.read')) {
|
||||||
$columns['manufacturer'] = [
|
$columns['manufacturer'] = [
|
||||||
'manufacturer', EntityColumn::class,
|
'manufacturer', EntityColumn::class,
|
||||||
[
|
[
|
||||||
'property' => 'manufacturer',
|
'property' => 'manufacturer',
|
||||||
'label' => $this->translator->trans('part.table.manufacturer'),
|
'label' => $this->translator->trans('part.table.manufacturer'),
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
if ($this->security->isGranted('@storelocations.read')) {
|
if ($this->security->isGranted('@storelocations.read')) {
|
||||||
$columns['storelocation'] = [
|
$columns['storelocation'] = [
|
||||||
'storelocation', TextColumn::class,
|
'storelocation', TextColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.storeLocations'),
|
'label' => $this->translator->trans('part.table.storeLocations'),
|
||||||
'orderField' => 'storelocations.name',
|
'orderField' => 'storelocations.name',
|
||||||
'render' => function ($value, Part $context): string {
|
'render' => function ($value, Part $context): string {
|
||||||
$tmp = [];
|
$tmp = [];
|
||||||
foreach ($context->getPartLots() as $lot) {
|
foreach ($context->getPartLots() as $lot) {
|
||||||
//Ignore lots without storelocation
|
//Ignore lots without storelocation
|
||||||
if (!$lot->getStorageLocation() instanceof Storelocation) {
|
if (!$lot->getStorageLocation() instanceof Storelocation) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$tmp[] = sprintf(
|
$tmp[] = sprintf(
|
||||||
'<a href="%s" title="%s">%s</a>',
|
'<a href="%s" title="%s">%s</a>',
|
||||||
$this->urlGenerator->listPartsURL($lot->getStorageLocation()),
|
$this->urlGenerator->listPartsURL($lot->getStorageLocation()),
|
||||||
htmlspecialchars($lot->getStorageLocation()->getFullPath()),
|
htmlspecialchars($lot->getStorageLocation()->getFullPath()),
|
||||||
htmlspecialchars($lot->getStorageLocation()->getName())
|
htmlspecialchars($lot->getStorageLocation()->getName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return implode('<br>', $tmp);
|
return implode('<br>', $tmp);
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
$columns['amount'] = [
|
$columns['amount'] = [
|
||||||
'amount', TextColumn::class,
|
'amount', TextColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.amount'),
|
'label' => $this->translator->trans('part.table.amount'),
|
||||||
'render' => function ($value, Part $context) {
|
'render' => function ($value, Part $context) {
|
||||||
$amount = $context->getAmountSum();
|
$amount = $context->getAmountSum();
|
||||||
$expiredAmount = $context->getExpiredAmountSum();
|
$expiredAmount = $context->getExpiredAmountSum();
|
||||||
|
|
||||||
$ret = '';
|
$ret = '';
|
||||||
|
|
||||||
if ($context->isAmountUnknown()) {
|
if ($context->isAmountUnknown()) {
|
||||||
//When all amounts are unknown, we show a question mark
|
//When all amounts are unknown, we show a question mark
|
||||||
if ($amount === 0.0) {
|
if ($amount === 0.0) {
|
||||||
$ret .= sprintf('<b class="text-primary" title="%s">?</b>',
|
$ret .= sprintf('<b class="text-primary" title="%s">?</b>',
|
||||||
$this->translator->trans('part_lots.instock_unknown'));
|
$this->translator->trans('part_lots.instock_unknown'));
|
||||||
} else { //Otherwise mark it with greater equal and the (known) amount
|
} else { //Otherwise mark it with greater equal and the (known) amount
|
||||||
$ret .= sprintf('<b class="text-primary" title="%s">≥</b>',
|
$ret .= sprintf('<b class="text-primary" title="%s">≥</b>',
|
||||||
$this->translator->trans('part_lots.instock_unknown')
|
$this->translator->trans('part_lots.instock_unknown')
|
||||||
);
|
);
|
||||||
$ret .= htmlspecialchars($this->amountFormatter->format($amount, $context->getPartUnit()));
|
$ret .= htmlspecialchars($this->amountFormatter->format($amount, $context->getPartUnit()));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$ret .= htmlspecialchars($this->amountFormatter->format($amount, $context->getPartUnit()));
|
$ret .= htmlspecialchars($this->amountFormatter->format($amount, $context->getPartUnit()));
|
||||||
}
|
}
|
||||||
|
|
||||||
//If we have expired lots, we show them in parentheses behind
|
//If we have expired lots, we show them in parentheses behind
|
||||||
if ($expiredAmount > 0) {
|
if ($expiredAmount > 0) {
|
||||||
|
|
@ -233,296 +233,296 @@ final class PartsDataTable implements DataTableTypeInterface
|
||||||
$ret);
|
$ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $ret;
|
return $ret;
|
||||||
},
|
},
|
||||||
'orderField' => 'amountSum'
|
'orderField' => 'amountSum'
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['minamount'] = [
|
$columns['minamount'] = [
|
||||||
'minamount', TextColumn::class,
|
'minamount', TextColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.minamount'),
|
'label' => $this->translator->trans('part.table.minamount'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
'render' => fn($value, Part $context): string => htmlspecialchars($this->amountFormatter->format($value, $context->getPartUnit())),
|
'render' => fn($value, Part $context): string => htmlspecialchars($this->amountFormatter->format($value, $context->getPartUnit())),
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($this->security->isGranted('@footprints.read')) {
|
if ($this->security->isGranted('@footprints.read')) {
|
||||||
$columns['partUnit'] = [
|
$columns['partUnit'] = [
|
||||||
'partUnit', TextColumn::class,
|
'partUnit', TextColumn::class,
|
||||||
[
|
[
|
||||||
'field' => 'partUnit.name',
|
'field' => 'partUnit.name',
|
||||||
'label' => $this->translator->trans('part.table.partUnit'),
|
'label' => $this->translator->trans('part.table.partUnit'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
$columns['addedDate'] = [
|
$columns['addedDate'] = [
|
||||||
'addedDate', LocaleDateTimeColumn::class,
|
'addedDate', LocaleDateTimeColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.addedDate'),
|
'label' => $this->translator->trans('part.table.addedDate'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['lastModified'] = [
|
$columns['lastModified'] = [
|
||||||
'lastModified', LocaleDateTimeColumn::class,
|
'lastModified', LocaleDateTimeColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.lastModified'),
|
'label' => $this->translator->trans('part.table.lastModified'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['needs_review'] = [
|
$columns['needs_review'] = [
|
||||||
'needs_review', PrettyBoolColumn::class,
|
'needs_review', PrettyBoolColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.needsReview'),
|
'label' => $this->translator->trans('part.table.needsReview'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['favorite'] = [
|
$columns['favorite'] = [
|
||||||
'favorite', PrettyBoolColumn::class,
|
'favorite', PrettyBoolColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.favorite'),
|
'label' => $this->translator->trans('part.table.favorite'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['manufacturing_status'] = [
|
$columns['manufacturing_status'] = [
|
||||||
'manufacturing_status', EnumColumn::class,
|
'manufacturing_status', EnumColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.manufacturingStatus'),
|
'label' => $this->translator->trans('part.table.manufacturingStatus'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
'class' => ManufacturingStatus::class,
|
'class' => ManufacturingStatus::class,
|
||||||
'render' => function(?ManufacturingStatus $status, Part $context): string {
|
'render' => function(?ManufacturingStatus $status, Part $context): string {
|
||||||
if (!$status) {
|
if (!$status) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->translator->trans($status->toTranslationKey());
|
return $this->translator->trans($status->toTranslationKey());
|
||||||
} ,
|
} ,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['manufacturer_product_number'] = [
|
$columns['manufacturer_product_number'] = [
|
||||||
'manufacturer_product_number', TextColumn::class,
|
'manufacturer_product_number', TextColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.mpn'),
|
'label' => $this->translator->trans('part.table.mpn'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['mass'] = [
|
$columns['mass'] = [
|
||||||
'mass', SIUnitNumberColumn::class,
|
'mass', SIUnitNumberColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.mass'),
|
'label' => $this->translator->trans('part.table.mass'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
'unit' => 'g'
|
'unit' => 'g'
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['tags'] = [
|
$columns['tags'] = [
|
||||||
'tags', TagsColumn::class,
|
'tags', TagsColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.tags'),
|
'label' => $this->translator->trans('part.table.tags'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['attachments'] = [
|
$columns['attachments'] = [
|
||||||
'attachments', PartAttachmentsColumn::class,
|
'attachments', PartAttachmentsColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.attachments'),
|
'label' => $this->translator->trans('part.table.attachments'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$columns['edit'] = [
|
$columns['edit'] = [
|
||||||
'edit', IconLinkColumn::class,
|
'edit', IconLinkColumn::class,
|
||||||
[
|
[
|
||||||
'label' => $this->translator->trans('part.table.edit'),
|
'label' => $this->translator->trans('part.table.edit'),
|
||||||
'visible' => false,
|
'visible' => false,
|
||||||
'href' => fn($value, Part $context) => $this->urlGenerator->editURL($context),
|
'href' => fn($value, Part $context) => $this->urlGenerator->editURL($context),
|
||||||
'disabled' => fn($value, Part $context) => !$this->security->isGranted('edit', $context),
|
'disabled' => fn($value, Part $context) => !$this->security->isGranted('edit', $context),
|
||||||
'title' => $this->translator->trans('part.table.edit.title'),
|
'title' => $this->translator->trans('part.table.edit.title'),
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
|
|
||||||
$visible_columns_ids = array_map("trim", explode(",", $this->default_part_columns));
|
$visible_columns_ids = array_map("trim", explode(",", $this->default_part_columns));
|
||||||
$allowed_configurable_columns_ids = ["name", "id", "ipn", "description", "category", "footprint", "manufacturer",
|
$allowed_configurable_columns_ids = ["name", "id", "ipn", "description", "category", "footprint", "manufacturer",
|
||||||
"storelocation", "amount", "minamount", "partUnit", "addedDate", "lastModified", "needs_review", "favorite",
|
"storelocation", "amount", "minamount", "partUnit", "addedDate", "lastModified", "needs_review", "favorite",
|
||||||
"manufacturing_status", "manufacturer_product_number", "mass", "tags", "attachments", "edit"
|
"manufacturing_status", "manufacturer_product_number", "mass", "tags", "attachments", "edit"
|
||||||
];
|
];
|
||||||
$processed_columns = [];
|
$processed_columns = [];
|
||||||
|
|
||||||
foreach ($visible_columns_ids as $col_id) {
|
foreach ($visible_columns_ids as $col_id) {
|
||||||
if (!in_array($col_id, $allowed_configurable_columns_ids) || !isset($columns[$col_id])) {
|
if (!in_array($col_id, $allowed_configurable_columns_ids) || !isset($columns[$col_id])) {
|
||||||
$this->logger->warning("Configuration option TABLE_PART_DEFAULT_COLUMNS specify invalid column '$col_id'. Collumn is skipped.");
|
$this->logger->warning("Configuration option TABLE_PART_DEFAULT_COLUMNS specify invalid column '$col_id'. Collumn is skipped.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_array($col_id, $processed_columns)) {
|
if (in_array($col_id, $processed_columns)) {
|
||||||
$this->logger->warning("Configuration option TABLE_PART_DEFAULT_COLUMNS specify column '$col_id' multiple time. Only first occurence is used.");
|
$this->logger->warning("Configuration option TABLE_PART_DEFAULT_COLUMNS specify column '$col_id' multiple time. Only first occurence is used.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$options = [];
|
$options = [];
|
||||||
if (count($columns[$col_id]) >= 3) {
|
if (count($columns[$col_id]) >= 3) {
|
||||||
$options = $columns[$col_id][2];
|
$options = $columns[$col_id][2];
|
||||||
}
|
}
|
||||||
$options["visible"] = true;
|
$options["visible"] = true;
|
||||||
$dataTable->add($col_id, $columns[$col_id][1], $options);
|
$dataTable->add($col_id, $columns[$col_id][1], $options);
|
||||||
|
|
||||||
$processed_columns[] = $col_id;
|
$processed_columns[] = $col_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
// add remaining non-visible columns
|
// add remaining non-visible columns
|
||||||
foreach ($allowed_configurable_columns_ids as $col_id) {
|
foreach ($allowed_configurable_columns_ids as $col_id) {
|
||||||
if (in_array($col_id, $processed_columns)) {
|
if (in_array($col_id, $processed_columns)) {
|
||||||
// column already processed
|
// column already processed
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$options = [];
|
$options = [];
|
||||||
if (count($columns[$col_id]) >= 3) {
|
if (count($columns[$col_id]) >= 3) {
|
||||||
$options = $columns[$col_id][2];
|
$options = $columns[$col_id][2];
|
||||||
}
|
}
|
||||||
$options["visible"] = false;
|
$options["visible"] = false;
|
||||||
$dataTable->add($col_id, $columns[$col_id][1], $options);
|
$dataTable->add($col_id, $columns[$col_id][1], $options);
|
||||||
|
|
||||||
$processed_columns[] = $col_id;
|
$processed_columns[] = $col_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
$dataTable->addOrderBy('name')
|
$dataTable->addOrderBy('name')
|
||||||
->createAdapter(TwoStepORMAdapater::class, [
|
->createAdapter(TwoStepORMAdapater::class, [
|
||||||
'filter_query' => $this->getFilterQuery(...),
|
'filter_query' => $this->getFilterQuery(...),
|
||||||
'detail_query' => $this->getDetailQuery(...),
|
'detail_query' => $this->getDetailQuery(...),
|
||||||
'entity' => Part::class,
|
'entity' => Part::class,
|
||||||
'hydrate' => Query::HYDRATE_OBJECT,
|
'hydrate' => Query::HYDRATE_OBJECT,
|
||||||
'criteria' => [
|
'criteria' => [
|
||||||
function (QueryBuilder $builder) use ($options): void {
|
function (QueryBuilder $builder) use ($options): void {
|
||||||
$this->buildCriteria($builder, $options);
|
$this->buildCriteria($builder, $options);
|
||||||
},
|
},
|
||||||
new SearchCriteriaProvider(),
|
new SearchCriteriaProvider(),
|
||||||
],
|
],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private function getFilterQuery(QueryBuilder $builder): void
|
private function getFilterQuery(QueryBuilder $builder): void
|
||||||
{
|
{
|
||||||
/* In the filter query we only select the IDs. The fetching of the full entities is done in the detail query.
|
/* In the filter query we only select the IDs. The fetching of the full entities is done in the detail query.
|
||||||
* We only need to join the entities here, so we can filter by them.
|
* We only need to join the entities here, so we can filter by them.
|
||||||
* The filter conditions are added to this QB in the buildCriteria method.
|
* The filter conditions are added to this QB in the buildCriteria method.
|
||||||
*/
|
*/
|
||||||
$builder
|
$builder
|
||||||
->select('part.id')
|
->select('part.id')
|
||||||
->addSelect('part.minamount AS HIDDEN minamount')
|
->addSelect('part.minamount AS HIDDEN minamount')
|
||||||
//Calculate amount sum using a subquery, so we can filter and sort by it
|
//Calculate amount sum using a subquery, so we can filter and sort by it
|
||||||
->addSelect(
|
->addSelect(
|
||||||
'(
|
'(
|
||||||
SELECT IFNULL(SUM(partLot.amount), 0.0)
|
SELECT IFNULL(SUM(partLot.amount), 0.0)
|
||||||
FROM '. PartLot::class. ' partLot
|
FROM '. PartLot::class. ' partLot
|
||||||
WHERE partLot.part = part.id
|
WHERE partLot.part = part.id
|
||||||
AND partLot.instock_unknown = false
|
AND partLot.instock_unknown = false
|
||||||
AND (partLot.expiration_date IS NULL OR partLot.expiration_date > CURRENT_DATE())
|
AND (partLot.expiration_date IS NULL OR partLot.expiration_date > CURRENT_DATE())
|
||||||
) AS HIDDEN amountSum'
|
) AS HIDDEN amountSum'
|
||||||
)
|
)
|
||||||
->from(Part::class, 'part')
|
->from(Part::class, 'part')
|
||||||
->leftJoin('part.category', 'category')
|
->leftJoin('part.category', 'category')
|
||||||
->leftJoin('part.master_picture_attachment', 'master_picture_attachment')
|
->leftJoin('part.master_picture_attachment', 'master_picture_attachment')
|
||||||
->leftJoin('part.partLots', 'partLots')
|
->leftJoin('part.partLots', 'partLots')
|
||||||
->leftJoin('partLots.storage_location', 'storelocations')
|
->leftJoin('partLots.storage_location', 'storelocations')
|
||||||
->leftJoin('part.footprint', 'footprint')
|
->leftJoin('part.footprint', 'footprint')
|
||||||
->leftJoin('footprint.master_picture_attachment', 'footprint_attachment')
|
->leftJoin('footprint.master_picture_attachment', 'footprint_attachment')
|
||||||
->leftJoin('part.manufacturer', 'manufacturer')
|
->leftJoin('part.manufacturer', 'manufacturer')
|
||||||
->leftJoin('part.orderdetails', 'orderdetails')
|
->leftJoin('part.orderdetails', 'orderdetails')
|
||||||
->leftJoin('orderdetails.supplier', 'suppliers')
|
->leftJoin('orderdetails.supplier', 'suppliers')
|
||||||
->leftJoin('part.attachments', 'attachments')
|
->leftJoin('part.attachments', 'attachments')
|
||||||
->leftJoin('part.partUnit', 'partUnit')
|
->leftJoin('part.partUnit', 'partUnit')
|
||||||
->leftJoin('part.parameters', 'parameters')
|
->leftJoin('part.parameters', 'parameters')
|
||||||
|
|
||||||
//This must be the only group by, or the paginator will not work correctly
|
//This must be the only group by, or the paginator will not work correctly
|
||||||
->addGroupBy('part.id')
|
->addGroupBy('part.id')
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getDetailQuery(QueryBuilder $builder, array $filter_results): void
|
private function getDetailQuery(QueryBuilder $builder, array $filter_results): void
|
||||||
{
|
{
|
||||||
$ids = array_map(fn($row) => $row['id'], $filter_results);
|
$ids = array_map(fn($row) => $row['id'], $filter_results);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* In this query we take the IDs which were filtered, paginated and sorted in the filter query, and fetch the
|
* In this query we take the IDs which were filtered, paginated and sorted in the filter query, and fetch the
|
||||||
* full entities.
|
* full entities.
|
||||||
* We can do complex fetch joins, as we do not need to filter or sort here (which would kill the performance).
|
* We can do complex fetch joins, as we do not need to filter or sort here (which would kill the performance).
|
||||||
* The only condition should be for the IDs.
|
* The only condition should be for the IDs.
|
||||||
* It is important that elements are ordered the same way, as the IDs are passed, or ordering will be wrong.
|
* It is important that elements are ordered the same way, as the IDs are passed, or ordering will be wrong.
|
||||||
*/
|
*/
|
||||||
$builder
|
$builder
|
||||||
->select('part')
|
->select('part')
|
||||||
->addSelect('category')
|
->addSelect('category')
|
||||||
->addSelect('footprint')
|
->addSelect('footprint')
|
||||||
->addSelect('manufacturer')
|
->addSelect('manufacturer')
|
||||||
->addSelect('partUnit')
|
->addSelect('partUnit')
|
||||||
->addSelect('master_picture_attachment')
|
->addSelect('master_picture_attachment')
|
||||||
->addSelect('footprint_attachment')
|
->addSelect('footprint_attachment')
|
||||||
->addSelect('partLots')
|
->addSelect('partLots')
|
||||||
->addSelect('orderdetails')
|
->addSelect('orderdetails')
|
||||||
->addSelect('attachments')
|
->addSelect('attachments')
|
||||||
->addSelect('storelocations')
|
->addSelect('storelocations')
|
||||||
//Calculate amount sum using a subquery, so we can filter and sort by it
|
//Calculate amount sum using a subquery, so we can filter and sort by it
|
||||||
->addSelect(
|
->addSelect(
|
||||||
'(
|
'(
|
||||||
SELECT IFNULL(SUM(partLot.amount), 0.0)
|
SELECT IFNULL(SUM(partLot.amount), 0.0)
|
||||||
FROM '. PartLot::class. ' partLot
|
FROM '. PartLot::class. ' partLot
|
||||||
WHERE partLot.part = part.id
|
WHERE partLot.part = part.id
|
||||||
AND partLot.instock_unknown = false
|
AND partLot.instock_unknown = false
|
||||||
AND (partLot.expiration_date IS NULL OR partLot.expiration_date > CURRENT_DATE())
|
AND (partLot.expiration_date IS NULL OR partLot.expiration_date > CURRENT_DATE())
|
||||||
) AS HIDDEN amountSum'
|
) AS HIDDEN amountSum'
|
||||||
)
|
)
|
||||||
->from(Part::class, 'part')
|
->from(Part::class, 'part')
|
||||||
->leftJoin('part.category', 'category')
|
->leftJoin('part.category', 'category')
|
||||||
->leftJoin('part.master_picture_attachment', 'master_picture_attachment')
|
->leftJoin('part.master_picture_attachment', 'master_picture_attachment')
|
||||||
->leftJoin('part.partLots', 'partLots')
|
->leftJoin('part.partLots', 'partLots')
|
||||||
->leftJoin('partLots.storage_location', 'storelocations')
|
->leftJoin('partLots.storage_location', 'storelocations')
|
||||||
->leftJoin('part.footprint', 'footprint')
|
->leftJoin('part.footprint', 'footprint')
|
||||||
->leftJoin('footprint.master_picture_attachment', 'footprint_attachment')
|
->leftJoin('footprint.master_picture_attachment', 'footprint_attachment')
|
||||||
->leftJoin('part.manufacturer', 'manufacturer')
|
->leftJoin('part.manufacturer', 'manufacturer')
|
||||||
->leftJoin('part.orderdetails', 'orderdetails')
|
->leftJoin('part.orderdetails', 'orderdetails')
|
||||||
->leftJoin('orderdetails.supplier', 'suppliers')
|
->leftJoin('orderdetails.supplier', 'suppliers')
|
||||||
->leftJoin('part.attachments', 'attachments')
|
->leftJoin('part.attachments', 'attachments')
|
||||||
->leftJoin('part.partUnit', 'partUnit')
|
->leftJoin('part.partUnit', 'partUnit')
|
||||||
->leftJoin('part.parameters', 'parameters')
|
->leftJoin('part.parameters', 'parameters')
|
||||||
|
|
||||||
->where('part.id IN (:ids)')
|
->where('part.id IN (:ids)')
|
||||||
->setParameter('ids', $ids)
|
->setParameter('ids', $ids)
|
||||||
|
|
||||||
//We have to group by all elements, or only the first sub elements of an association is fetched! (caused issue #190)
|
//We have to group by all elements, or only the first sub elements of an association is fetched! (caused issue #190)
|
||||||
->addGroupBy('part')
|
->addGroupBy('part')
|
||||||
->addGroupBy('partLots')
|
->addGroupBy('partLots')
|
||||||
->addGroupBy('category')
|
->addGroupBy('category')
|
||||||
->addGroupBy('master_picture_attachment')
|
->addGroupBy('master_picture_attachment')
|
||||||
->addGroupBy('storelocations')
|
->addGroupBy('storelocations')
|
||||||
->addGroupBy('footprint')
|
->addGroupBy('footprint')
|
||||||
->addGroupBy('footprint_attachment')
|
->addGroupBy('footprint_attachment')
|
||||||
->addGroupBy('manufacturer')
|
->addGroupBy('manufacturer')
|
||||||
->addGroupBy('orderdetails')
|
->addGroupBy('orderdetails')
|
||||||
->addGroupBy('suppliers')
|
->addGroupBy('suppliers')
|
||||||
->addGroupBy('attachments')
|
->addGroupBy('attachments')
|
||||||
->addGroupBy('partUnit')
|
->addGroupBy('partUnit')
|
||||||
->addGroupBy('parameters')
|
->addGroupBy('parameters')
|
||||||
;
|
;
|
||||||
|
|
||||||
//Get the results in the same order as the IDs were passed
|
//Get the results in the same order as the IDs were passed
|
||||||
FieldHelper::addOrderByFieldParam($builder, 'part.id', 'ids');
|
FieldHelper::addOrderByFieldParam($builder, 'part.id', 'ids');
|
||||||
}
|
}
|
||||||
|
|
||||||
private function buildCriteria(QueryBuilder $builder, array $options): void
|
private function buildCriteria(QueryBuilder $builder, array $options): void
|
||||||
{
|
{
|
||||||
//Apply the search criterias first
|
//Apply the search criterias first
|
||||||
if ($options['search'] instanceof PartSearchFilter) {
|
if ($options['search'] instanceof PartSearchFilter) {
|
||||||
$search = $options['search'];
|
$search = $options['search'];
|
||||||
$search->apply($builder);
|
$search->apply($builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
//We do the most stuff here in the filter class
|
//We do the most stuff here in the filter class
|
||||||
if ($options['filter'] instanceof PartFilter) {
|
if ($options['filter'] instanceof PartFilter) {
|
||||||
$filter = $options['filter'];
|
$filter = $options['filter'];
|
||||||
$filter->apply($builder);
|
$filter->apply($builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue