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

show expired projects in search filter (#1641)

Browse Source
This commit is contained in:
Kevin Papst
2020-04-15 16:19:32 +02:00
committed by GitHub
parent 4254c2590a
commit be00a519b3
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Form/ActivityEditForm.php
View File

@@ -86,7 +86,6 @@ class ActivityEditForm extends AbstractType
'query_builder' => function (ProjectRepository $repo) use ($builder, $project, $customer) { 'query_builder' => function (ProjectRepository $repo) use ($builder, $project, $customer) {
$query = new ProjectFormTypeQuery($project, $customer); $query = new ProjectFormTypeQuery($project, $customer);
$query->setUser($builder->getOption('user')); $query->setUser($builder->getOption('user'));
// TODO this should only allow creation of projects which did not yet end (see below)
$query->setIgnoreDate(true); $query->setIgnoreDate(true);
return $repo->getQueryBuilderForFormType($query); return $repo->getQueryBuilderForFormType($query);
@@ -107,7 +106,6 @@ class ActivityEditForm extends AbstractType
'query_builder' => function (ProjectRepository $repo) use ($builder, $data, $project) { 'query_builder' => function (ProjectRepository $repo) use ($builder, $data, $project) {
$query = new ProjectFormTypeQuery($project, $data['customer']); $query = new ProjectFormTypeQuery($project, $data['customer']);
$query->setUser($builder->getOption('user')); $query->setUser($builder->getOption('user'));
// TODO this should only allow creation of projects which did not yet end (see above)
$query->setIgnoreDate(true); $query->setIgnoreDate(true);
return $repo->getQueryBuilderForFormType($query); return $repo->getQueryBuilderForFormType($query);

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

@@ -24,9 +24,14 @@ class ActivityToolbarForm extends AbstractToolbarForm
*/ */
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
{ {
$newOptions = [];
if ($options['ignore_date'] === true) {
$newOptions['ignore_date'] = true;
}
$this->addSearchTermInputField($builder); $this->addSearchTermInputField($builder);
$this->addCustomerMultiChoice($builder, [], true); $this->addCustomerMultiChoice($builder, $newOptions, true);
$this->addProjectMultiChoice($builder, [], true, false); $this->addProjectMultiChoice($builder, $newOptions, true, false);
$builder->add('globalsOnly', ChoiceType::class, [ $builder->add('globalsOnly', ChoiceType::class, [
'choices' => [ 'choices' => [
'yes' => 1, 'yes' => 1,
@@ -51,6 +56,7 @@ class ActivityToolbarForm extends AbstractToolbarForm
$resolver->setDefaults([ $resolver->setDefaults([
'data_class' => ActivityQuery::class, 'data_class' => ActivityQuery::class,
'csrf_protection' => false, 'csrf_protection' => false,
'ignore_date' => true,
]); ]);
} }
} }

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

@@ -23,13 +23,18 @@ class TimesheetToolbarForm extends AbstractToolbarForm
*/ */
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
{ {
$newOptions = [];
if ($options['ignore_date'] === true) {
$newOptions['ignore_date'] = true;
}
$this->addSearchTermInputField($builder); $this->addSearchTermInputField($builder);
if ($options['include_user']) { if ($options['include_user']) {
$this->addUsersChoice($builder); $this->addUsersChoice($builder);
} }
$this->addDateRangeChoice($builder); $this->addDateRangeChoice($builder);
$this->addCustomerMultiChoice($builder, [], true); $this->addCustomerMultiChoice($builder, $newOptions, true);
$this->addProjectMultiChoice($builder, [], true, true); $this->addProjectMultiChoice($builder, $newOptions, true, true);
$this->addActivityMultiChoice($builder, [], true); $this->addActivityMultiChoice($builder, [], true);
$this->addTagInputField($builder); $this->addTagInputField($builder);
$this->addTimesheetStateChoice($builder); $this->addTimesheetStateChoice($builder);
@@ -49,6 +54,7 @@ class TimesheetToolbarForm extends AbstractToolbarForm
'data_class' => TimesheetQuery::class, 'data_class' => TimesheetQuery::class,
'csrf_protection' => false, 'csrf_protection' => false,
'include_user' => false, 'include_user' => false,
'ignore_date' => true,
]); ]);
} }
} }