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

alphabetical order for selectboxes (#510)

Browse Source
This commit is contained in:
Kevin Papst
2019-01-19 19:24:29 +01:00
committed by GitHub
parent a609cbf84a
commit 5b1ec1eb8f
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Form/ActivityEditForm.php
View File

@@ -70,8 +70,8 @@ class ActivityEditForm extends AbstractType
->add('project', ProjectType::class, [ ->add('project', ProjectType::class, [
'label' => 'label.project', 'label' => 'label.project',
'required' => false, 'required' => false,
'query_builder' => function (ProjectRepository $repo) use ($project) { 'query_builder' => function (ProjectRepository $repo) use ($project, $customer) {
return $repo->builderForEntityType($project); return $repo->builderForEntityType($project, $customer);
}, },
]) ])
->add('fixedRate', NumberType::class, [ ->add('fixedRate', NumberType::class, [

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

@@ -69,6 +69,7 @@ abstract class AbstractToolbarForm extends AbstractType
$query = new CustomerQuery(); $query = new CustomerQuery();
$query->setVisibility(CustomerQuery::SHOW_BOTH); // this field is the reason for the query here $query->setVisibility(CustomerQuery::SHOW_BOTH); // this field is the reason for the query here
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
$query->setOrderBy('name');
return $repo->findByQuery($query); return $repo->findByQuery($query);
}, },
@@ -162,6 +163,7 @@ abstract class AbstractToolbarForm extends AbstractType
$query->setCustomer($data['customer']); $query->setCustomer($data['customer']);
$query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER);
$query->setVisibility(ProjectQuery::SHOW_BOTH); $query->setVisibility(ProjectQuery::SHOW_BOTH);
$query->setOrderBy('name');
return $repo->findByQuery($query); return $repo->findByQuery($query);
}, },
@@ -176,7 +178,6 @@ abstract class AbstractToolbarForm extends AbstractType
protected function addActivityChoice(FormBuilderInterface $builder) protected function addActivityChoice(FormBuilderInterface $builder)
{ {
$builder->add('activity', ActivityType::class, [ $builder->add('activity', ActivityType::class, [
'group_by' => null,
'required' => false, 'required' => false,
'query_builder' => function (ActivityRepository $repo) { 'query_builder' => function (ActivityRepository $repo) {
$query = new ActivityQuery(); $query = new ActivityQuery();
@@ -184,6 +185,7 @@ abstract class AbstractToolbarForm extends AbstractType
$query->setGlobalsOnly(true); $query->setGlobalsOnly(true);
$query->setOrderGlobalsFirst(true); $query->setOrderGlobalsFirst(true);
$query->setVisibility(ActivityQuery::SHOW_BOTH); $query->setVisibility(ActivityQuery::SHOW_BOTH);
$query->setOrderBy('name');
return $repo->findByQuery($query); return $repo->findByQuery($query);
}, },
@@ -198,7 +200,6 @@ abstract class AbstractToolbarForm extends AbstractType
} }
$event->getForm()->add('activity', ActivityType::class, [ $event->getForm()->add('activity', ActivityType::class, [
'group_by' => null,
'required' => false, 'required' => false,
'query_builder' => function (ActivityRepository $repo) use ($data) { 'query_builder' => function (ActivityRepository $repo) use ($data) {
$query = new ActivityQuery(); $query = new ActivityQuery();
@@ -206,6 +207,7 @@ abstract class AbstractToolbarForm extends AbstractType
$query->setProject($data['project']); $query->setProject($data['project']);
$query->setOrderGlobalsFirst(true); $query->setOrderGlobalsFirst(true);
$query->setVisibility(ActivityQuery::SHOW_BOTH); $query->setVisibility(ActivityQuery::SHOW_BOTH);
$query->setOrderBy('name');
return $repo->findByQuery($query); return $repo->findByQuery($query);
}, },

13
src/Repository/ActivityRepository.php
View File

@@ -142,8 +142,13 @@ class ActivityRepository extends AbstractRepository
$qb->select('a', 'p', 'c') $qb->select('a', 'p', 'c')
->from(Activity::class, 'a') ->from(Activity::class, 'a')
->leftJoin('a.project', 'p') ->leftJoin('a.project', 'p')
->leftJoin('p.customer', 'c') ->leftJoin('p.customer', 'c');
->orderBy('a.' . $query->getOrderBy(), $query->getOrder());
if ($query->isOrderGlobalsFirst()) {
$qb->orderBy('a.project', 'ASC');
}
$qb->addOrderBy('a.' . $query->getOrderBy(), $query->getOrder());
$where = $qb->expr()->andX(); $where = $qb->expr()->andX();
@@ -202,10 +207,6 @@ class ActivityRepository extends AbstractRepository
$qb->setParameter('activity', $entity); $qb->setParameter('activity', $entity);
} }
if ($query->isOrderGlobalsFirst()) {
$qb->orderBy('a.project', 'ASC');
}
if ($or->count() > 0) { if ($or->count() > 0) {
$qb->andWhere($or); $qb->andWhere($or);
} }

1
src/Repository/CustomerRepository.php
View File

@@ -99,6 +99,7 @@ class CustomerRepository extends AbstractRepository
$query = new CustomerQuery(); $query = new CustomerQuery();
$query->setHiddenEntity($entity); $query->setHiddenEntity($entity);
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
$query->setOrderBy('name');
return $this->findByQuery($query); return $this->findByQuery($query);
} }

1
src/Repository/ProjectRepository.php
View File

@@ -95,6 +95,7 @@ class ProjectRepository extends AbstractRepository
$query->setHiddenEntity($entity); $query->setHiddenEntity($entity);
$query->setCustomer($customer); $query->setCustomer($customer);
$query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER);
$query->setOrderBy('name');
return $this->findByQuery($query); return $this->findByQuery($query);
} }