jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added basic invoice rendering #97 #93 (#99)

Browse Source
This commit is contained in:
Kevin Papst
2018-01-21 22:50:46 +01:00
committed by GitHub
parent 9a161b8fd9
commit 4cbc5391c0
73 changed files with 2986 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
src/Form/Toolbar/AbstractToolbarForm.php
View File

@@ -11,15 +11,33 @@
namespace App\Form\Toolbar;
use App\Form\Type\ActivityType;
use App\Form\Type\CustomerType;
use App\Form\Type\PageSizeType;
use App\Form\Type\ProjectType;
use App\Form\Type\UserRoleType;
use App\Form\Type\UserType;
use App\Form\Type\VisibilityType;
use App\Repository\ActivityRepository;
use App\Repository\CustomerRepository;
use App\Repository\ProjectRepository;
use App\Repository\Query\CustomerQuery;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
/**
* Defines the base form used for all toolbars.
*
* Extend this class and stack the elements defined here, they are coupled to each other and with the toolbar.js.
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
abstract class AbstractToolbarForm extends AbstractType
{
/**
* Dirty hack to enable easy handling of GET form in controller and javascript.
*Cleans up the name of all form elents (and unfortunately of the form itself).
@@ -30,4 +48,135 @@ abstract class AbstractToolbarForm extends AbstractType
{
return '';
}
/**
* @param FormBuilderInterface $builder
*/
protected function addUserChoice(FormBuilderInterface $builder)
{
$builder->add('user', UserType::class, [
'label' => 'label.user',
'required' => false,
]);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addCustomerChoice(FormBuilderInterface $builder)
{
$builder->add('customer', CustomerType::class, [
'required' => false,
'query_builder' => function (CustomerRepository $repo) {
$query = new CustomerQuery();
$query->setVisibility(CustomerQuery::SHOW_BOTH); // this field is the reason for the query here
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
return $repo->findByQuery($query);
},
]);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addVisibilityChoice(FormBuilderInterface $builder)
{
$builder->add('visibility', VisibilityType::class, []);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addPageSizeChoice(FormBuilderInterface $builder)
{
$builder->add('pageSize', PageSizeType::class, [
'required' => false,
]);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addUserRoleChoice(FormBuilderInterface $builder)
{
$builder->add('role', UserRoleType::class, [
'required' => false,
]);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addStartDateChoice(FormBuilderInterface $builder)
{
$builder->add('begin', DateType::class, [
'label' => 'label.begin',
'widget' => 'single_text',
'required' => false,
]);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addEndDateChoice(FormBuilderInterface $builder)
{
$builder->add('end', DateType::class, [
'label' => 'label.end',
'widget' => 'single_text',
'required' => false,
]);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addProjectChoice(FormBuilderInterface $builder)
{
$builder->addEventListener(
FormEvents::PRE_SUBMIT,
function (FormEvent $event) {
$data = $event->getData();
if (!isset($data['customer']) || empty($data['customer'])) {
return;
}
$event->getForm()->add('project', ProjectType::class, array(
'group_by' => null,
'required' => false,
'query_builder' => function (ProjectRepository $repo) use ($data) {
$qb = $repo->builderForEntityType();
$qb->where('p.customer = :customer')->setParameter('customer', $data['customer']);
return $qb;
},
));
}
);
}
/**
* @param FormBuilderInterface $builder
*/
protected function addActivityChoice(FormBuilderInterface $builder)
{
$builder->addEventListener(
FormEvents::PRE_SUBMIT,
function (FormEvent $event) {
$data = $event->getData();
if (!isset($data['project']) || empty($data['project'])) {
return;
}
$event->getForm()->add('activity', ActivityType::class, array(
'group_by' => null,
'required' => false,
'query_builder' => function (ActivityRepository $repo) use ($data) {
$qb = $repo->builderForEntityType();
$qb->where('a.project = :project')->setParameter('project', $data['project']);
return $qb;
},
));
}
);
}
}

26
src/Form/Toolbar/ActivityToolbarForm.php
View File

@@ -13,7 +13,6 @@ namespace App\Form\Toolbar;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use App\Form\Type\ProjectType;
use App\Repository\Query\ActivityQuery;
/**
@@ -21,7 +20,7 @@ use App\Repository\Query\ActivityQuery;
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class ActivityToolbarForm extends ProjectToolbarForm
class ActivityToolbarForm extends AbstractToolbarForm
{
/**
@@ -29,25 +28,10 @@ class ActivityToolbarForm extends ProjectToolbarForm
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
parent::buildForm($builder, $options);
/** @var ActivityQuery $query */
$query = $options['data'];
if ($query->getCustomer() === null) {
return;
}
$choices = [];
foreach ($query->getCustomer()->getProjects() as $project) {
$choices[] = $project;
}
$builder
->add('project', ProjectType::class, [
'required' => false,
'choices' => $choices,
]);
$this->addPageSizeChoice($builder);
$this->addVisibilityChoice($builder);
$this->addCustomerChoice($builder);
$this->addProjectChoice($builder);
}
/**

13
src/Form/Toolbar/CustomerToolbarForm.php
View File

@@ -11,7 +11,7 @@
namespace App\Form\Toolbar;
use App\Form\Toolbar\VisibilityToolbarForm;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use App\Repository\Query\CustomerQuery;
@@ -20,9 +20,18 @@ use App\Repository\Query\CustomerQuery;
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class CustomerToolbarForm extends VisibilityToolbarForm
class CustomerToolbarForm extends AbstractToolbarForm
{
/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$this->addPageSizeChoice($builder);
$this->addVisibilityChoice($builder);
}
/**
* {@inheritdoc}
*/

58
src/Form/Toolbar/InvoiceToolbarForm.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Form\Toolbar;
use App\Form\Type\InvoiceTemplateType;
use App\Repository\Query\InvoiceQuery;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Defines the form used for filtering timesheet entries for invoices.
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class InvoiceToolbarForm extends AbstractToolbarForm
{
/**
* @inheritdoc
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$this->addTemplateChoice($builder);
$this->addUserChoice($builder);
$this->addStartDateChoice($builder);
$this->addEndDateChoice($builder);
$this->addCustomerChoice($builder);
$this->addProjectChoice($builder);
$this->addActivityChoice($builder);
}
protected function addTemplateChoice(FormBuilderInterface $builder)
{
$builder->add('template', InvoiceTemplateType::class, [
'required' => true
]);
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => InvoiceQuery::class,
'csrf_protection' => false,
]);
}
}

40
src/Form/Toolbar/PagedToolbarForm.php
View File

@@ -1,40 +0,0 @@
<?php
/*
* This file is part of the Kimai package.
*
* (c) Kevin Papst <kevin@kevinpapst.de>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Form\Toolbar;
use App\Form\Type\PageSizeType;
use Symfony\Component\Form\FormBuilderInterface;
use App\Repository\Query\CustomerQuery;
/**
* Defines the base form used for all toolbars with pageSizes.
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class PagedToolbarForm extends AbstractToolbarForm
{
/**
* {@inheritdoc}
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
/** @var CustomerQuery $query */
$query = $options['data'];
$builder
->add('pageSize', PageSizeType::class, [
'required' => false,
])
;
}
}

22
src/Form/Toolbar/ProjectToolbarForm.php
View File

@@ -11,12 +11,8 @@
namespace App\Form\Toolbar;
use App\Form\Toolbar\VisibilityToolbarForm;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use App\Form\Type\CustomerType;
use App\Repository\CustomerRepository;
use App\Repository\Query\CustomerQuery;
use App\Repository\Query\ProjectQuery;
/**
@@ -24,7 +20,7 @@ use App\Repository\Query\ProjectQuery;
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class ProjectToolbarForm extends VisibilityToolbarForm
class ProjectToolbarForm extends AbstractToolbarForm
{
/**
@@ -32,19 +28,9 @@ class ProjectToolbarForm extends VisibilityToolbarForm
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
parent::buildForm($builder, $options);
$builder
->add('customer', CustomerType::class, [
'required' => false,
'query_builder' => function (CustomerRepository $repo) {
$query = new CustomerQuery();
$query->setVisibility(CustomerQuery::SHOW_BOTH); // this field is the reason for the query here
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
return $repo->findByQuery($query);
},
])
;
$this->addPageSizeChoice($builder);
$this->addVisibilityChoice($builder);
$this->addCustomerChoice($builder);
}
/**

20
src/Form/Toolbar/VisibilityToolbarForm.php → src/Form/Toolbar/TimesheetAdminToolbarForm.php
View File

@@ -11,28 +11,26 @@
namespace App\Form\Toolbar;
use App\Form\Type\VisibilityType;
use Symfony\Component\Form\FormBuilderInterface;
/**
* Defines the form used for filtering entities with a "visibility" field.
* Defines the form used for filtering the admin timesheet.
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class VisibilityToolbarForm extends PagedToolbarForm
class TimesheetAdminToolbarForm extends TimesheetToolbarForm
{
/**
* {@inheritdoc}
* @inheritdoc
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
parent::buildForm($builder, $options);
$builder
->add('visibility', VisibilityType::class, [
'required' => false,
])
;
$this->addTimesheetStateChoice($builder);
$this->addPageSizeChoice($builder);
$this->addUserChoice($builder);
$this->addCustomerChoice($builder);
$this->addProjectChoice($builder);
$this->addActivityChoice($builder);
}
}

47
src/Form/Toolbar/TimesheetToolbarForm.php
View File

@@ -14,7 +14,6 @@ namespace App\Form\Toolbar;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use App\Form\Type\ActivityType;
use App\Repository\Query\TimesheetQuery;
/**
@@ -22,7 +21,7 @@ use App\Repository\Query\TimesheetQuery;
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class TimesheetToolbarForm extends ActivityToolbarForm
class TimesheetToolbarForm extends AbstractToolbarForm
{
/**
@@ -30,42 +29,26 @@ class TimesheetToolbarForm extends ActivityToolbarForm
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('state', ChoiceType::class, [
'label' => 'label.entryState',
'choices' => [
'entryState.all' => TimesheetQuery::STATE_ALL,
'entryState.running' => TimesheetQuery::STATE_RUNNING,
'entryState.stopped' => TimesheetQuery::STATE_STOPPED
],
])
;
parent::buildForm($builder, $options);
$this->addActivityChoice($builder, $options['data']);
$builder->remove('visibility');
$this->addTimesheetStateChoice($builder);
$this->addPageSizeChoice($builder);
$this->addCustomerChoice($builder);
$this->addProjectChoice($builder);
$this->addActivityChoice($builder);
}
/**
* @param FormBuilderInterface $builder
* @param TimesheetQuery $query
*/
protected function addActivityChoice(FormBuilderInterface $builder, TimesheetQuery $query)
protected function addTimesheetStateChoice(FormBuilderInterface $builder)
{
if ($query->getProject() === null) {
return;
}
$choices = [];
foreach ($query->getProject()->getActivities() as $activity) {
$choices[] = $activity;
}
$builder
->add('activity', ActivityType::class, [
'required' => false,
'choices' => $choices,
]);
$builder->add('state', ChoiceType::class, [
'label' => 'label.entryState',
'choices' => [
'entryState.all' => TimesheetQuery::STATE_ALL,
'entryState.running' => TimesheetQuery::STATE_RUNNING,
'entryState.stopped' => TimesheetQuery::STATE_STOPPED
],
]);
}
/**

13
src/Form/Toolbar/UserToolbarForm.php
View File

@@ -11,7 +11,6 @@
namespace App\Form\Toolbar;
use App\Form\Type\UserRoleType;
use App\Repository\Query\UserQuery;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -21,7 +20,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
*
* @author Kevin Papst <kevin@kevinpapst.de>
*/
class UserToolbarForm extends VisibilityToolbarForm
class UserToolbarForm extends AbstractToolbarForm
{
/**
@@ -29,13 +28,9 @@ class UserToolbarForm extends VisibilityToolbarForm
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
parent::buildForm($builder, $options);
$builder
->add('role', UserRoleType::class, [
'required' => false,
])
;
$this->addPageSizeChoice($builder);
$this->addVisibilityChoice($builder);
$this->addUserRoleChoice($builder);
}
/**