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

timesheet export (#317)

Browse Source 
* remove autocomplete for begin and end
* fix minute display in timesheet-edit form
* toolbar form label in separate row
* added export action
This commit is contained in:
Kevin Papst
2018-09-24 16:46:10 +02:00
committed by GitHub
parent 7bcd6a6382
commit 98dc38ed99
29 changed files with 422 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Form/TimesheetEditForm.php
View File

@@ -44,9 +44,9 @@ class TimesheetEditForm extends AbstractType
'label' => 'label.begin',
'widget' => 'single_text',
'html5' => false,
'format' => 'yyyy-MM-dd H:m',
'format' => 'yyyy-MM-dd HH:mm',
'with_seconds' => false,
'attr' => ['data-datetimepicker' => 'on'],
'attr' => ['autocomplete' => 'off', 'data-datetimepicker' => 'on'],
]);
}
@@ -58,9 +58,9 @@ class TimesheetEditForm extends AbstractType
'widget' => 'single_text',
'required' => false,
'html5' => false,
'format' => 'yyyy-MM-dd H:m',
'format' => 'yyyy-MM-dd HH:mm',
'with_seconds' => false,
'attr' => ['data-datetimepicker' => 'on'],
'attr' => ['autocomplete' => 'off', 'data-datetimepicker' => 'on'],
]);
}

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

@@ -110,7 +110,8 @@ abstract class AbstractToolbarForm extends AbstractType
'widget' => 'single_text',
'html5' => false,
'required' => false,
'attr' => ['data-datepicker' => 'on'],
'format' => 'yyyy-MM-dd',
'attr' => ['autocomplete' => 'off', 'data-datepicker' => 'on'],
]);
}
@@ -124,7 +125,8 @@ abstract class AbstractToolbarForm extends AbstractType
'widget' => 'single_text',
'html5' => false,
'required' => false,
'attr' => ['data-datepicker' => 'on'],
'format' => 'yyyy-MM-dd',
'attr' => ['autocomplete' => 'off', 'data-datepicker' => 'on'],
]);
}

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

@@ -24,6 +24,8 @@ class TimesheetAdminToolbarForm extends TimesheetToolbarForm
$this->addTimesheetStateChoice($builder);
$this->addPageSizeChoice($builder);
$this->addUserChoice($builder);
$this->addStartDateChoice($builder);
$this->addEndDateChoice($builder);
$this->addCustomerChoice($builder);
$this->addProjectChoice($builder);
$this->addActivityChoice($builder);

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

@@ -26,6 +26,8 @@ class TimesheetToolbarForm extends AbstractToolbarForm
{
$this->addTimesheetStateChoice($builder);
$this->addPageSizeChoice($builder);
$this->addStartDateChoice($builder);
$this->addEndDateChoice($builder);
$this->addCustomerChoice($builder);
$this->addProjectChoice($builder);
$this->addActivityChoice($builder);