Update and delete multi timesheets and tags (#1240)

This commit is contained in:
Kevin Papst
2019-11-15 01:25:31 +01:00
committed by GitHub
parent b4739f8f03
commit 94c28ebbc5
49 changed files with 1836 additions and 307 deletions

View File

@@ -0,0 +1,76 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Form\MultiUpdate;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\EntityRepository;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
class MultiUpdateTable extends AbstractType
{
/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
/** @var EntityRepository $repository */
$repository = $options['repository'];
/** @var MultiUpdateTableDTO $dto */
$dto = $options['data'];
$builder->add('entities', HiddenType::class, [
'required' => false,
]);
$builder->get('entities')->addModelTransformer(
new CallbackTransformer(
function ($ids) {
return implode(',', $ids);
},
function ($ids) use ($repository) {
if (empty($ids)) {
return [];
}
return $repository->matching((new Criteria())->where(Criteria::expr()->in('id', explode(',', $ids))));
}
)
);
$builder->add('action', ChoiceType::class, [
'mapped' => false,
'required' => false,
'choices' => $dto->getActions(),
'search' => false,
]);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefined(['repository']);
$resolver->setAllowedTypes('repository', EntityRepository::class);
$resolver->setRequired('repository');
$resolver->setDefaults([
'data_class' => MultiUpdateTableDTO::class,
'csrf_protection' => true,
'csrf_field_name' => '_token',
'csrf_token_id' => 'entities_multiupdate',
]);
}
}

View File

@@ -0,0 +1,86 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Form\MultiUpdate;
class MultiUpdateTableDTO
{
/**
* @var object[]
*/
private $entities = [];
/**
* @var string[]
*/
private $actions = ['' => ''];
/**
* @var string
*/
private $action = null;
/**
* @return object[]
*/
public function getEntities(): iterable
{
return $this->entities;
}
/**
* @param object[] $entities
* @return MultiUpdateTableDTO
*/
public function setEntities(iterable $entities): MultiUpdateTableDTO
{
$this->entities = $entities;
return $this;
}
/**
* @return string[]
*/
public function getActions(): array
{
return $this->actions;
}
public function addAction(string $label, string $url): MultiUpdateTableDTO
{
$this->actions[$label] = $url;
return $this;
}
public function addDelete(string $url): MultiUpdateTableDTO
{
$this->actions['action.delete'] = $url;
return $this;
}
public function addUpdate(string $url): MultiUpdateTableDTO
{
$this->actions['action.edit'] = $url;
return $this;
}
public function getAction(): ?string
{
return $this->action;
}
public function setAction(string $action): MultiUpdateTableDTO
{
$this->action = $action;
return $this;
}
}

View File

@@ -0,0 +1,232 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Form\MultiUpdate;
use App\Form\Type\ActivityType;
use App\Form\Type\CustomerType;
use App\Form\Type\ProjectType;
use App\Form\Type\TagsInputType;
use App\Form\Type\UserType;
use App\Form\Type\YesNoType;
use App\Repository\ActivityRepository;
use App\Repository\CustomerRepository;
use App\Repository\ProjectRepository;
use App\Repository\Query\ActivityFormTypeQuery;
use App\Repository\Query\CustomerFormTypeQuery;
use App\Repository\Query\ProjectFormTypeQuery;
use App\Repository\TimesheetRepository;
use Doctrine\Common\Collections\Criteria;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\OptionsResolver\OptionsResolver;
class TimesheetMultiUpdate extends AbstractType
{
/**
* @var TimesheetRepository
*/
private $timesheet;
/**
* @var CustomerRepository
*/
private $customers;
public function __construct(TimesheetRepository $timesheet, CustomerRepository $customer)
{
$this->timesheet = $timesheet;
$this->customers = $customer;
}
/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$activity = null;
$project = null;
$customer = null;
$customerCount = $this->customers->countCustomer(true);
if (isset($options['data'])) {
/** @var TimesheetMultiUpdateDTO $entry */
$entry = $options['data'];
$activity = $entry->getActivity();
$project = $entry->getProject();
$customer = null === $project ? null : $project->getCustomer();
if (null === $project && null !== $activity) {
$project = $activity->getProject();
}
}
$builder
->add('customer', CustomerType::class, [
'query_builder' => function (CustomerRepository $repo) use ($builder, $customer) {
$query = new CustomerFormTypeQuery($customer);
$query->setUser($builder->getOption('user'));
return $repo->getQueryBuilderForFormType($query);
},
'data' => $customer ? $customer : '',
'required' => false,
'placeholder' => '',
'mapped' => false,
'project_enabled' => true,
])
;
$projectOptions = [];
if ($customerCount < 2) {
$projectOptions['group_by'] = null;
}
$builder
->add(
'project',
ProjectType::class,
array_merge($projectOptions, [
'required' => false,
'placeholder' => '',
'activity_enabled' => true,
'query_builder' => function (ProjectRepository $repo) use ($builder, $project, $customer) {
$query = new ProjectFormTypeQuery($project, $customer);
$query->setUser($builder->getOption('user'));
return $repo->getQueryBuilderForFormType($query);
},
])
);
// replaces the project select after submission, to make sure only projects for the selected customer are displayed
$builder->addEventListener(
FormEvents::PRE_SUBMIT,
function (FormEvent $event) use ($builder, $project, $customer) {
$data = $event->getData();
$customer = isset($data['customer']) && !empty($data['customer']) ? $data['customer'] : null;
$project = isset($data['project']) && !empty($data['project']) ? $data['project'] : $project;
$event->getForm()->add('project', ProjectType::class, [
'required' => false,
'placeholder' => '',
'activity_enabled' => true,
'group_by' => null,
'query_builder' => function (ProjectRepository $repo) use ($builder, $project, $customer) {
$query = new ProjectFormTypeQuery($project, $customer);
$query->setUser($builder->getOption('user'));
return $repo->getQueryBuilderForFormType($query);
},
]);
}
);
$builder
->add('activity', ActivityType::class, [
'required' => false,
'placeholder' => '',
'query_builder' => function (ActivityRepository $repo) use ($activity, $project) {
return $repo->getQueryBuilderForFormType(new ActivityFormTypeQuery($activity, $project));
},
])
;
// replaces the activity select after submission, to make sure only activities for the selected project are displayed
$builder->addEventListener(
FormEvents::PRE_SUBMIT,
function (FormEvent $event) use ($activity) {
$data = $event->getData();
if (!isset($data['project']) || empty($data['project'])) {
return;
}
$event->getForm()->add('activity', ActivityType::class, [
'required' => false,
'placeholder' => '',
'query_builder' => function (ActivityRepository $repo) use ($data, $activity) {
return $repo->getQueryBuilderForFormType(new ActivityFormTypeQuery($activity, $data['project']));
},
]);
}
);
$builder->add('replaceTags', ChoiceType::class, [
'label' => false,
'required' => true,
'expanded' => true,
'choices' => [
'label.replaceTags' => true,
'label.appendTags' => false,
]
]);
$builder->add('tags', TagsInputType::class, [
'required' => false,
]);
if ($options['include_user']) {
$builder->add('user', UserType::class, [
'required' => false,
]);
}
if ($options['include_exported']) {
$builder->add('exported', YesNoType::class, [
'label' => 'label.exported'
]);
}
$builder->add('entities', HiddenType::class, [
'required' => false,
]);
$builder->get('entities')->addModelTransformer(
new CallbackTransformer(
function ($timesheets) {
$ids = [];
/** @var \App\Entity\Timesheet $timesheet */
foreach ($timesheets as $timesheet) {
$ids[] = $timesheet->getId();
}
return implode(',', $ids);
},
function ($ids) {
if (empty($ids)) {
return [];
}
return $this->timesheet->matching((new Criteria())->where(Criteria::expr()->in('id', explode(',', $ids))));
}
)
);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => TimesheetMultiUpdateDTO::class,
'csrf_protection' => true,
'csrf_field_name' => '_token',
'csrf_token_id' => 'timesheet_multiupdate',
'include_user' => false,
'include_exported' => false,
]);
}
}

View File

@@ -0,0 +1,139 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Form\MultiUpdate;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Tag;
use App\Entity\User;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @App\Validator\Constraints\TimesheetMultiUpdate
*/
class TimesheetMultiUpdateDTO extends MultiUpdateTableDTO
{
/**
* @var Tag[]|ArrayCollection|iterable
*/
private $tags = [];
/**
* @var bool
*/
private $replaceTags = false;
/**
* @var Customer|null
*/
private $customer;
/**
* @var Project|null
*/
private $project;
/**
* @var Activity|null
*/
private $activity;
/**
* @var User|null
*/
private $user;
/**
* @var bool|null
*/
private $exported = null;
public function getCustomer(): ?Customer
{
return $this->customer;
}
public function setCustomer(Customer $customer): TimesheetMultiUpdateDTO
{
$this->customer = $customer;
return $this;
}
public function getProject(): ?Project
{
return $this->project;
}
public function setProject(Project $project): TimesheetMultiUpdateDTO
{
$this->project = $project;
return $this;
}
public function getActivity(): ?Activity
{
return $this->activity;
}
public function setActivity(Activity $activity): TimesheetMultiUpdateDTO
{
$this->activity = $activity;
return $this;
}
/**
* @return Tag[]|ArrayCollection|iterable
*/
public function getTags(): iterable
{
return $this->tags;
}
public function setTags(iterable $tags): TimesheetMultiUpdateDTO
{
$this->tags = $tags;
return $this;
}
public function getUser(): ?User
{
return $this->user;
}
public function setUser(User $user): TimesheetMultiUpdateDTO
{
$this->user = $user;
return $this;
}
public function isExported(): ?bool
{
return $this->exported;
}
public function setExported(bool $exported): TimesheetMultiUpdateDTO
{
$this->exported = $exported;
return $this;
}
public function isReplaceTags(): bool
{
return $this->replaceTags;
}
public function setReplaceTags(bool $replaceTags): TimesheetMultiUpdateDTO
{
$this->replaceTags = $replaceTags;
return $this;
}
}