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

6
src/Controller/ActivityController.php
View File

@@ -9,7 +9,7 @@
namespace App\Controller;
use App\Configuration\FormConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\Activity;
use App\Entity\ActivityRate;
use App\Entity\MetaTableTypeInterface;
@@ -51,7 +51,7 @@ final class ActivityController extends AbstractController
*/
private $repository;
/**
* @var FormConfiguration
* @var SystemConfiguration
*/
private $configuration;
/**
@@ -59,7 +59,7 @@ final class ActivityController extends AbstractController
*/
private $dispatcher;
public function __construct(ActivityRepository $repository, FormConfiguration $configuration, EventDispatcherInterface $dispatcher)
public function __construct(ActivityRepository $repository, SystemConfiguration $configuration, EventDispatcherInterface $dispatcher)
{
$this->repository = $repository;
$this->configuration = $configuration;

4
src/Controller/CustomerController.php
View File

@@ -9,7 +9,7 @@
namespace App\Controller;
use App\Configuration\FormConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\Customer;
use App\Entity\CustomerComment;
use App\Entity\CustomerRate;
@@ -109,7 +109,7 @@ final class CustomerController extends AbstractController
* @Route(path="/create", name="admin_customer_create", methods={"GET", "POST"})
* @Security("is_granted('create_customer')")
*/
public function createAction(Request $request, FormConfiguration $configuration)
public function createAction(Request $request, SystemConfiguration $configuration)
{
$timezone = date_default_timezone_get();
if (null !== $configuration->getCustomerDefaultTimezone()) {

6
src/Controller/ProjectController.php
View File

@@ -9,7 +9,7 @@
namespace App\Controller;
use App\Configuration\FormConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\Customer;
use App\Entity\MetaTableTypeInterface;
use App\Entity\Project;
@@ -57,7 +57,7 @@ final class ProjectController extends AbstractController
*/
private $repository;
/**
* @var FormConfiguration
* @var SystemConfiguration
*/
private $configuration;
/**
@@ -69,7 +69,7 @@ final class ProjectController extends AbstractController
*/
private $projectService;
public function __construct(ProjectRepository $repository, FormConfiguration $configuration, EventDispatcherInterface $dispatcher, ProjectService $projectService)
public function __construct(ProjectRepository $repository, SystemConfiguration $configuration, EventDispatcherInterface $dispatcher, ProjectService $projectService)
{
$this->repository = $repository;
$this->configuration = $configuration;

6
src/Controller/UserController.php
View File

@@ -9,7 +9,7 @@
namespace App\Controller;
use App\Configuration\FormConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\User;
use App\Event\UserPreferenceDisplayEvent;
use App\Export\Spreadsheet\UserExporter;
@@ -97,7 +97,7 @@ final class UserController extends AbstractController
]);
}
private function createNewDefaultUser(FormConfiguration $config): User
private function createNewDefaultUser(SystemConfiguration $config): User
{
$user = new User();
$user->setEnabled(true);
@@ -112,7 +112,7 @@ final class UserController extends AbstractController
* @Route(path="/create", name="admin_user_create", methods={"GET", "POST"})
* @Security("is_granted('create_user')")
*/
public function createAction(Request $request, FormConfiguration $config): Response
public function createAction(Request $request, SystemConfiguration $config): Response
{
$user = $this->createNewDefaultUser($config);
$editForm = $this->getCreateUserForm($user);