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

added filter for global activities (#614)

Browse Source
This commit is contained in:
Kevin Papst
2019-03-05 01:42:06 +01:00
committed by GitHub
parent 642db480ce
commit bce85b04d6
12 changed files with 21 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ abstract class AbstractToolbarForm extends AbstractType
* @param FormBuilderInterface $builder * @param FormBuilderInterface $builder
* @param null|string $label * @param null|string $label
*/ */
protected function addVisibilityChoice(FormBuilderInterface $builder, ?string $label = null) protected function addVisibilityChoice(FormBuilderInterface $builder, string $label = 'label.visible')
{ {
$builder->add('visibility', VisibilityType::class, [ $builder->add('visibility', VisibilityType::class, [
'required' => false, 'required' => false,

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

@@ -10,6 +10,7 @@
namespace App\Form\Toolbar; namespace App\Form\Toolbar;
use App\Repository\Query\ActivityQuery; use App\Repository\Query\ActivityQuery;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -25,6 +26,15 @@ class ActivityToolbarForm extends AbstractToolbarForm
{ {
$this->addPageSizeChoice($builder); $this->addPageSizeChoice($builder);
$this->addVisibilityChoice($builder); $this->addVisibilityChoice($builder);
$builder->add('globalsOnly', ChoiceType::class, [
'choices' => [
'yes' => 1,
'no' => 0,
],
'placeholder' => null,
'required' => false,
'label' => 'label.globalsOnly',
]);
$this->addCustomerChoice($builder); $this->addCustomerChoice($builder);
$this->addProjectChoice($builder); $this->addProjectChoice($builder);
$this->addHiddenPagination($builder); $this->addHiddenPagination($builder);

4
templates/macros/widgets.html.twig
View File

@@ -18,9 +18,9 @@
{% macro label_visible(visible) %} {% macro label_visible(visible) %}
{% import _self as macro %} {% import _self as macro %}
{% if visible %} {% if visible %}
{{ macro.label('badge.visible', 'success') }} {{ macro.label('yes', 'success') }}
{% else %} {% else %}
{{ macro.label('badge.invisible', 'default') }} {{ macro.label('no', 'default') }}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}

8
translations/messages.ar.xliff
View File

@@ -275,14 +275,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>معلومات أخرى</target> <target>معلومات أخرى</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>نعم</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>لا</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>عرض القائمة</target> <target>عرض القائمة</target>

12
translations/messages.de.xliff
View File

@@ -279,14 +279,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>Mehr Infos</target> <target>Mehr Infos</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Ja</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>Nein</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Menü anzeigen</target> <target>Menü anzeigen</target>
@@ -996,6 +988,10 @@
<source>export.mark_all</source> <source>export.mark_all</source>
<target>Alle angezeigten Einträge als abgerechnet markieren?</target> <target>Alle angezeigten Einträge als abgerechnet markieren?</target>
</trans-unit> </trans-unit>
<trans-unit id="label.globalsOnly">
<source>label.globalsOnly</source>
<target>Nur globale</target>
</trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

12
translations/messages.en.xliff
View File

@@ -279,14 +279,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>More infos</target> <target>More infos</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Yes</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>No</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Show menu</target> <target>Show menu</target>
@@ -996,6 +988,10 @@
<source>export.mark_all</source> <source>export.mark_all</source>
<target>Mark all shown records as cleared?</target> <target>Mark all shown records as cleared?</target>
</trans-unit> </trans-unit>
<trans-unit id="label.globalsOnly">
<source>label.globalsOnly</source>
<target>Only global</target>
</trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

8
translations/messages.es.xliff
View File

@@ -283,14 +283,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>Ver más...</target> <target>Ver más...</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Si</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>No</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Mostrar menú</target> <target>Mostrar menú</target>

8
translations/messages.fr.xliff
View File

@@ -283,14 +283,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>Plus d'infos</target> <target>Plus d'infos</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Oui</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>Non</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Montrer le menu</target> <target>Montrer le menu</target>

8
translations/messages.hu.xliff
View File

@@ -276,14 +276,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>További információ</target> <target>További információ</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Igen</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>Nem</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Menü megjelenítése</target> <target>Menü megjelenítése</target>

8
translations/messages.it.xliff
View File

@@ -275,14 +275,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>Più info</target> <target>Più info</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Si</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>No</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Mostra menù</target> <target>Mostra menù</target>

8
translations/messages.pt_BR.xliff
View File

@@ -275,14 +275,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>Mais Informações</target> <target>Mais Informações</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Sim</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>Não</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Mostrar menu</target> <target>Mostrar menu</target>

8
translations/messages.ru.xliff
View File

@@ -275,14 +275,6 @@
<source>more.info.link</source> <source>more.info.link</source>
<target>Подробнее</target> <target>Подробнее</target>
</trans-unit> </trans-unit>
<trans-unit id="badge.visible">
<source>badge.visible</source>
<target>Да</target>
</trans-unit>
<trans-unit id="badge.invisible">
<source>badge.invisible</source>
<target>Нет</target>
</trans-unit>
<trans-unit id="label.toggle_dropdown"> <trans-unit id="label.toggle_dropdown">
<source>label.toggle_dropdown</source> <source>label.toggle_dropdown</source>
<target>Отобразить меню</target> <target>Отобразить меню</target>