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

support multiple teamleads in each team (#2702)

Browse Source 
* fix jumping avatars
* fix line-break after color dot for long names
This commit is contained in:
Kevin Papst
2021-08-07 18:05:41 +02:00
committed by GitHub
parent e9986c92d6
commit b2d3272151
101 changed files with 1952 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Form/API/TeamApiEditForm.php
View File

@@ -18,6 +18,7 @@ class TeamApiEditForm extends TeamEditForm
public function buildForm(FormBuilderInterface $builder, array $options)
{
parent::buildForm($builder, $options);
$builder->remove('users');
}
/**
@@ -28,7 +29,6 @@ class TeamApiEditForm extends TeamEditForm
parent::configureOptions($resolver);
$resolver->setDefaults([
'expand_users' => false,
'csrf_protection' => false,
]);
}

66
src/Form/TeamEditForm.php
View File

@@ -10,8 +10,10 @@
namespace App\Form;
use App\Entity\Team;
use App\Form\Type\TeamMemberType;
use App\Form\Type\UserType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -34,38 +36,51 @@ class TeamEditForm extends AbstractType
'attr' => [
'autofocus' => 'autofocus'
],
// documentation is for NelmioApiDocBundle
'documentation' => [
'type' => 'string',
'description' => 'Name of the team',
],
]);
$this->addColor($builder);
$builder
->add('teamlead', UserType::class, [
'label' => 'label.teamlead',
'multiple' => false,
'expanded' => false,
// documentation is for NelmioApiDocBundle
'documentation' => [
'type' => 'integer',
'description' => 'User ID for the teamlead',
$builder->add('members', CollectionType::class, [
'entry_type' => TeamMemberType::class,
'entry_options' => [
'label' => false,
],
'allow_add' => true,
'by_reference' => false,
'allow_delete' => true,
'label' => 'label.user',
'documentation' => [
'type' => 'array',
'items' => [
'type' => 'object',
'properties' => [
'user' => [
'type' => 'integer',
'description' => 'User ID',
],
'teamlead' => [
'type' => 'boolean',
'description' => 'Whether the user is a teamlead',
],
]
],
])
->add('users', UserType::class, [
'multiple' => true,
'expanded' => $options['expand_users'],
'by_reference' => false,
'documentation' => [
'type' => 'array',
'items' => ['type' => 'integer', 'description' => 'User IDs'],
'title' => 'Team member',
'description' => 'Array of team member IDs',
],
// make sure that disabled users show up in the result list
'include_users' => (null !== $team && $team->getUsers()->count() > 0 ? $team->getUsers()->toArray() : [])
])
;
'description' => 'All team members',
],
]);
$builder->add('users', UserType::class, [
'label' => 'add_user.label',
'help' => 'team.add_user.help',
'mapped' => false,
'multiple' => false,
'expanded' => false,
'required' => false,
'ignore_users' => $team !== null ? $team->getUsers() : []
]);
}
/**
@@ -77,7 +92,6 @@ class TeamEditForm extends AbstractType
'data_class' => Team::class,
'csrf_protection' => true,
'csrf_field_name' => '_token',
'expand_users' => true,
'csrf_token_id' => 'admin_team_edit',
'attr' => [
'data-form-event' => 'kimai.teamUpdate'

4
src/Form/TimesheetMultiUserEditForm.php
View File

@@ -9,8 +9,8 @@
namespace App\Form;
use App\Form\Type\TeamMemberType;
use App\Form\Type\TeamType;
use App\Form\Type\UserType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -24,7 +24,7 @@ class TimesheetMultiUserEditForm extends TimesheetAdminEditForm
parent::buildForm($builder, $options);
$builder->add('users', TeamMemberType::class, [
$builder->add('users', UserType::class, [
'multiple' => true,
'required' => false,
]);

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

@@ -85,9 +85,9 @@ abstract class AbstractToolbarForm extends AbstractType
]);
}
protected function addTeamsChoice(FormBuilderInterface $builder)
protected function addTeamsChoice(FormBuilderInterface $builder, string $field = 'teams')
{
$builder->add('teams', TeamType::class, [
$builder->add($field, TeamType::class, [
'documentation' => [
'type' => 'array',
'items' => ['type' => 'integer', 'description' => 'Team ID'],

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

@@ -25,6 +25,7 @@ class UserToolbarForm extends AbstractToolbarForm
{
$this->addSearchTermInputField($builder);
$this->addUserRoleChoice($builder);
$this->addTeamsChoice($builder, 'searchTeams');
$this->addVisibilityChoice($builder, 'label.active');
$this->addPageSizeChoice($builder);
$this->addHiddenPagination($builder);

62
src/Form/Type/TeamMemberType.php
View File

@@ -9,60 +9,38 @@
namespace App\Form\Type;
use App\Entity\User;
use App\Repository\UserRepository;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use App\Entity\TeamMember;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Select a user that
*/
class TeamMemberType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add('user', UserType::class, [
'selectpicker' => false,
]);
$builder->add('teamlead', YesNoType::class, [
'label' => 'label.teamlead'
]);
}
public function getBlockPrefix()
{
return 'team_member';
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'class' => User::class,
'data_class' => TeamMember::class,
'label' => 'label.user',
'choice_label' => function (User $user) {
return $user->getDisplayName();
},
'compound' => true,
]);
$resolver->setDefault('query_builder', function (Options $options) {
return function (UserRepository $repo) use ($options) {
$qb = $repo->createQueryBuilder('u');
$qb
->andWhere($qb->expr()->eq('u.enabled', ':enabled'))
->setParameter('enabled', true, \PDO::PARAM_BOOL)
->orderBy('u.username', 'ASC');
/** @var User $user */
$user = $options['user'];
if (null !== $user && $user->hasTeamAssignment() && !$user->canSeeAllData()) {
$qb
->leftJoin('u.teams', 'teams')
->leftJoin('teams.users', 'users')
->andWhere($qb->expr()->isMemberOf(':teams', 'u.teams'))
->setParameter('teams', $user->getTeams());
}
return $qb;
};
});
}
/**
* {@inheritdoc}
*/
public function getParent()
{
return EntityType::class;
}
}

2
src/Form/Type/TeamType.php
View File

@@ -46,7 +46,7 @@ class TeamType extends AbstractType
$query->setCurrentUser($user);
if (!$options['teamlead_only']) {
$query->setTeams($user->getTeams()->toArray());
$query->setTeams($user->getTeams());
}
return $repo->getQueryBuilderForFormType($query);

6
src/Form/Type/UserType.php
View File

@@ -37,6 +37,8 @@ class UserType extends AbstractType
'choice_translation_domain' => false,
// whether disabled users should be included in the result list
'include_disabled' => false,
// an array of users that should not be included in the result list
'ignore_users' => [],
// an array of users, which will always be included in the result list
// why? if the base entity could include disabled users, which should not be hidden in/removed from the list
// eg. when editing a team that has disabled users, these users would be removed silently
@@ -57,6 +59,10 @@ class UserType extends AbstractType
$query->setVisibility(VisibilityInterface::SHOW_BOTH);
}
foreach ($options['ignore_users'] as $userToIgnore) {
$query->addUserToIgnore($userToIgnore);
}
if (!empty($options['include_users'])) {
$query->setUsersAlwaysIncluded($options['include_users']);
}