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

added project importer and grandtotal converter (#1468)

Browse Source
This commit is contained in:
Kevin Papst
2020-10-11 22:08:00 +02:00
committed by GitHub
parent 0ce02b4f06
commit 996f05c73a
68 changed files with 2827 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/EventSubscriber/UserPreferenceSubscriber.php
View File

@@ -9,7 +9,7 @@
namespace App\EventSubscriber;
use App\Configuration\FormConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\User;
use App\Entity\UserPreference;
use App\Event\PrepareUserEvent;
@@ -39,15 +39,15 @@ class UserPreferenceSubscriber implements EventSubscriberInterface
*/
protected $voter;
/**
* @var FormConfiguration
* @var SystemConfiguration
*/
protected $formConfig;
protected $configuration;
public function __construct(EventDispatcherInterface $dispatcher, AuthorizationCheckerInterface $voter, FormConfiguration $formConfig)
public function __construct(EventDispatcherInterface $dispatcher, AuthorizationCheckerInterface $voter, SystemConfiguration $formConfig)
{
$this->eventDispatcher = $dispatcher;
$this->voter = $voter;
$this->formConfig = $formConfig;
$this->configuration = $formConfig;
}
public static function getSubscribedEvents(): array
@@ -59,22 +59,22 @@ class UserPreferenceSubscriber implements EventSubscriberInterface
private function getDefaultTheme(): ?string
{
return $this->formConfig->getUserDefaultTheme();
return $this->configuration->getUserDefaultTheme();
}
private function getDefaultCurrency(): string
{
return $this->formConfig->getUserDefaultCurrency();
return $this->configuration->getUserDefaultCurrency();
}
private function getDefaultLanguage(): string
{
return $this->formConfig->getUserDefaultLanguage();
return $this->configuration->getUserDefaultLanguage();
}
private function getDefaultTimezone(): string
{
$timezone = $this->formConfig->getUserDefaultTimezone();
$timezone = $this->configuration->getUserDefaultTimezone();
if (null === $timezone) {
$timezone = date_default_timezone_get();
}