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

support custom fields in timesheet batch update (#2043)

Browse Source
This commit is contained in:
Kevin Papst
2020-10-21 17:10:11 +02:00
committed by GitHub
parent 167a826f50
commit 6ed7ee76e7
25 changed files with 392 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Form/MultiUpdate/TimesheetMultiUpdate.php
View File

@@ -13,6 +13,7 @@ use App\Form\Type\ActivityType;
use App\Form\Type\CustomerType;
use App\Form\Type\FixedRateType;
use App\Form\Type\HourlyRateType;
use App\Form\Type\MetaFieldsCollectionType;
use App\Form\Type\ProjectType;
use App\Form\Type\TagsType;
use App\Form\Type\UserType;
@@ -60,6 +61,7 @@ class TimesheetMultiUpdate extends AbstractType
$project = null;
$customer = null;
$currency = null;
$entry = null;
$customerCount = $this->customers->countCustomer(true);
if (isset($options['data'])) {
@@ -119,6 +121,7 @@ class TimesheetMultiUpdate extends AbstractType
);
// replaces the project select after submission, to make sure only projects for the selected customer are displayed
// TODO replace me with FormTrait
$builder->addEventListener(
FormEvents::PRE_SUBMIT,
function (FormEvent $event) use ($builder, $project, $customer) {
@@ -146,12 +149,14 @@ class TimesheetMultiUpdate extends AbstractType
'required' => false,
'placeholder' => '',
'query_builder' => function (ActivityRepository $repo) use ($activity, $project) {
// TODO respect user (team permission)
return $repo->getQueryBuilderForFormType(new ActivityFormTypeQuery($activity, $project));
},
])
;
// replaces the activity select after submission, to make sure only activities for the selected project are displayed
// TODO replace me with FormTrait
$builder->addEventListener(
FormEvents::PRE_SUBMIT,
function (FormEvent $event) use ($activity) {
@@ -164,6 +169,7 @@ class TimesheetMultiUpdate extends AbstractType
'required' => false,
'placeholder' => '',
'query_builder' => function (ActivityRepository $repo) use ($data, $activity) {
// TODO respect user (team permission)
return $repo->getQueryBuilderForFormType(new ActivityFormTypeQuery($activity, $data['project']));
},
]);
@@ -215,6 +221,25 @@ class TimesheetMultiUpdate extends AbstractType
;
}
// meta fields only if at least one exists
if ($entry !== null && $entry->getMetaFields()->count() > 0) {
$builder->add('metaFields', MetaFieldsCollectionType::class);
$choices = [];
foreach ($entry->getMetaFields() as $field) {
$name = $field->getName();
$label = $entry->getMetaField($name)->getLabel();
$choices[$label] = $name;
}
$builder->add('updateMeta', ChoiceType::class, [
'choices' => $choices,
'multiple' => true,
'expanded' => true,
'label' => 'label.batch_meta_fields',
'help' => 'help.batch_meta_fields',
]);
}
$builder->add('entities', HiddenType::class, [
'required' => false,
]);