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

allow decimals in users hourly rate (#460)

Browse Source
This commit is contained in:
Kevin Papst
2018-12-03 20:23:52 +01:00
committed by GitHub
parent 43b488f21f
commit 589d750e59
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/EventSubscriber/UserPreferenceSubscriber.php
View File

@@ -19,7 +19,7 @@ use App\Form\Type\SkinType;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Validator\Constraints\Range; use Symfony\Component\Validator\Constraints\Range;
@@ -86,7 +86,7 @@ class UserPreferenceSubscriber implements EventSubscriberInterface
(new UserPreference()) (new UserPreference())
->setName(UserPreference::HOURLY_RATE) ->setName(UserPreference::HOURLY_RATE)
->setValue(0) ->setValue(0)
->setType(IntegerType::class) ->setType(NumberType::class)
->setEnabled($enableHourlyRate) ->setEnabled($enableHourlyRate)
->addConstraint(new Range(['min' => 0])), ->addConstraint(new Range(['min' => 0])),

6
tests/Controller/ProfileControllerTest.php
View File

@@ -225,9 +225,9 @@ class ProfileControllerTest extends ControllerBaseTest
// assert that the user doesn't have the "hourly-rate_own_profile" permission // assert that the user doesn't have the "hourly-rate_own_profile" permission
[User::ROLE_USER, UserFixtures::USERNAME_USER, 82, 82, 'ar'], [User::ROLE_USER, UserFixtures::USERNAME_USER, 82, 82, 'ar'],
// admins are allowed to update their own hourly rate // admins are allowed to update their own hourly rate
[User::ROLE_ADMIN, UserFixtures::USERNAME_ADMIN, 81, 37, 'ar'], [User::ROLE_ADMIN, UserFixtures::USERNAME_ADMIN, 81, 37.5, 'ar'],
// admins are allowed to update other peoples hourly rate // admins are allowed to update other peoples hourly rate
[User::ROLE_SUPER_ADMIN, UserFixtures::USERNAME_USER, 82, 37, 'en'], [User::ROLE_SUPER_ADMIN, UserFixtures::USERNAME_USER, 82, 37.5, 'en'],
]; ];
} }
@@ -255,7 +255,7 @@ class ProfileControllerTest extends ControllerBaseTest
$client->submit($form, [ $client->submit($form, [
'user_preferences_form' => [ 'user_preferences_form' => [
'preferences' => [ 'preferences' => [
['name' => UserPreference::HOURLY_RATE, 'value' => 37], ['name' => UserPreference::HOURLY_RATE, 'value' => 37.5],
// ['name' => 'timezone', 'value' => 'America/Creston'], // ['name' => 'timezone', 'value' => 'America/Creston'],
['name' => 'language', 'value' => 'ar'], ['name' => 'language', 'value' => 'ar'],
['name' => UserPreference::SKIN, 'value' => 'blue'], ['name' => UserPreference::SKIN, 'value' => 'blue'],