Skip to content

#33 Add duration filter on Process Execution Crud. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 10, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions src/Admin/Filter/ProcessExecutionDurationFilter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php

declare(strict_types=1);

/*
* This file is part of the CleverAge/UiProcessBundle package.
*
* Copyright (c) Clever-Age
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace CleverAge\UiProcessBundle\Admin\Filter;

use Doctrine\ORM\QueryBuilder;
use EasyCorp\Bundle\EasyAdminBundle\Contracts\Filter\FilterInterface;
use EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto;
use EasyCorp\Bundle\EasyAdminBundle\Dto\FieldDto;
use EasyCorp\Bundle\EasyAdminBundle\Dto\FilterDataDto;
use EasyCorp\Bundle\EasyAdminBundle\Filter\FilterTrait;
use EasyCorp\Bundle\EasyAdminBundle\Form\Filter\Type\NumericFilterType;

class ProcessExecutionDurationFilter implements FilterInterface
{
use FilterTrait;

public static function new(string $propertyName, ?string $label = null): self
{
return (new self())
->setFilterFqcn(self::class)
->setProperty($propertyName)
->setLabel($label)
->setFormType(NumericFilterType::class)
->setFormTypeOption('translation_domain', 'EasyAdminBundle');
}

public function apply(QueryBuilder $queryBuilder, FilterDataDto $filterDataDto, ?FieldDto $fieldDto, EntityDto $entityDto): void
{
if (\in_array($filterDataDto->getComparison(), ['=', '>', '>=', '<', '<=', '!='])) {
$queryBuilder->andWhere(
\sprintf(
'entity.endDate %s date_add(entity.startDate, %s, \'SECOND\')',
$filterDataDto->getComparison(),
$filterDataDto->getValue()
)
);
} elseif ('between' === $filterDataDto->getComparison()) {
$queryBuilder->andWhere(
\sprintf(
'entity.endDate BETWEEN date_add(entity.startDate, %s, \'SECOND\') and date_add(entity.startDate, %s, \'SECOND\')',
$filterDataDto->getValue(),
$filterDataDto->getValue2()
)
);
}
}
}
9 changes: 8 additions & 1 deletion src/Controller/Admin/ProcessExecutionCrudController.php
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@

use CleverAge\UiProcessBundle\Admin\Field\ContextField;
use CleverAge\UiProcessBundle\Admin\Field\EnumField;
use CleverAge\UiProcessBundle\Admin\Filter\ProcessExecutionDurationFilter;
use CleverAge\UiProcessBundle\Entity\ProcessExecution;
use CleverAge\UiProcessBundle\Repository\ProcessExecutionRepository;
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
@@ -143,7 +144,13 @@ public function downloadLogFile(

public function configureFilters(Filters $filters): Filters
{
return $filters->add('code')->add('startDate');
return $filters
->add('code')
->add('startDate')
->add(
ProcessExecutionDurationFilter::new('duration', 'Duration (in seconds)')
->setFormTypeOption('mapped', false)
);
}

private function getLogFilePath(ProcessExecution $processExecution): string