Release 1.19.4 (#3255)

* login redirects to homepage if already being logged-in
* fix budget check for entries that were moved to another moth
* invoice: fix amount should be decimal if decimal template is used
* added new month grouped by project/activity/user report

src/Controller/AbstractController.php

@@ -18,6 +18,7 @@ use App\Timesheet\DateTimeFactory;
 use App\Utils\LocaleFormats;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
@@ -39,6 +40,13 @@ abstract class AbstractController extends BaseAbstractController implements Serv
         return $this->container->get('translator');
     }
 
+    public function createFormForGetRequest(string $type = FormType::class, $data = null, array $options = []): FormInterface
+    {
+        return $this->container
+            ->get('form.factory')
+            ->createNamed('', $type, $data, $options);
+    }
+
     private function getLogger(): LoggerInterface
     {
         return $this->container->get('logger');

src/Controller/Reporting/CustomerMonthlyProjectsController.php

@@ -0,0 +1,111 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Controller\Reporting;
+
+use App\Controller\AbstractController;
+use App\Export\Spreadsheet\Writer\BinaryFileResponseWriter;
+use App\Export\Spreadsheet\Writer\XlsxWriter;
+use App\Reporting\CustomerMonthlyProjects\CustomerMonthlyProjects;
+use App\Reporting\CustomerMonthlyProjects\CustomerMonthlyProjectsForm;
+use App\Repository\Query\UserQuery;
+use App\Repository\UserRepository;
+use App\Timesheet\TimesheetStatisticService;
+use PhpOffice\PhpSpreadsheet\Reader\Html;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path="/reporting/customer/monthly_projects")
+ * @Security("is_granted('view_reporting') and is_granted('view_other_reporting') and is_granted('view_other_timesheet')")
+ */
+final class CustomerMonthlyProjectsController extends AbstractController
+{
+    /**
+     * @Route(path="/view", name="report_customer_monthly_projects", methods={"GET","POST"})
+     */
+    public function report(Request $request, TimesheetStatisticService $statisticService, UserRepository $userRepository): Response
+    {
+        return $this->render(
+            'reporting/customer/monthly_projects.html.twig',
+            $this->getData($request, $statisticService, $userRepository)
+        );
+    }
+
+    /**
+     * @Route(path="/export", name="report_customer_monthly_projects_export", methods={"GET","POST"})
+     */
+    public function export(Request $request, TimesheetStatisticService $statisticService, UserRepository $userRepository): Response
+    {
+        $data = $this->getData($request, $statisticService, $userRepository);
+
+        $content = $this->render('reporting/customer/monthly_projects_export.html.twig', $data)->getContent();
+
+        $reader = new Html();
+        $spreadsheet = $reader->loadFromString($content);
+
+        $writer = new BinaryFileResponseWriter(new XlsxWriter(), 'kimai-export-users-monthly');
+
+        return $writer->getFileResponse($spreadsheet);
+    }
+
+    private function getData(Request $request, TimesheetStatisticService $statisticService, UserRepository $userRepository): array
+    {
+        $currentUser = $this->getUser();
+        $dateTimeFactory = $this->getDateTimeFactory();
+
+        $query = new UserQuery();
+        $query->setCurrentUser($currentUser);
+        $allUsers = $userRepository->getUsersForQuery($query);
+
+        $values = new CustomerMonthlyProjects();
+        $values->setDate($dateTimeFactory->getStartOfMonth());
+
+        $form = $this->createFormForGetRequest(CustomerMonthlyProjectsForm::class, $values, [
+            'timezone' => $dateTimeFactory->getTimezone()->getName(),
+            'start_date' => $values->getDate(),
+        ]);
+
+        $form->submit($request->query->all(), false);
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $values->setDate($dateTimeFactory->getStartOfMonth());
+        }
+
+        if ($values->getDate() === null) {
+            $values->setDate($dateTimeFactory->getStartOfMonth());
+        }
+
+        $start = $values->getDate();
+        $start = $dateTimeFactory->getStartOfMonth($start);
+        $end = $dateTimeFactory->getEndOfMonth($start);
+
+        $previous = clone $start;
+        $previous->modify('-1 month');
+
+        $next = clone $start;
+        $next->modify('+1 month');
+
+        $stats = $statisticService->getGroupedByCustomerProjectActivityUser($start, $end, $allUsers);
+
+        return [
+            'dataType' => $values->getSumType(),
+            'report_title' => 'report_customer_monthly_projects',
+            'export_route' => 'report_customer_monthly_projects_export',
+            'form' => $form->createView(),
+            'current' => $start,
+            'next' => $next,
+            'previous' => $previous,
+            'decimal' => $values->isDecimal(),
+            'stats' => $stats,
+        ];
+    }
+}

src/Controller/Security/SecurityController.php

@@ -32,6 +32,10 @@ final class SecurityController extends AbstractController
      */
     public function loginAction(Request $request): Response
     {
+        if ($this->isGranted('IS_AUTHENTICATED_FULLY')) {
+            return $this->redirectToRoute('homepage');
+        }
+
         /** @var SessionInterface $session */
         $session = $request->getSession();