use dialog to duplicate timesheet (#2567)

* fix: display time budget in customer listing if set
* updated api methods with annotations
* do not require checkboxes for system configurations
* open dialog for duplicated timesheets
This commit is contained in:
Kevin Papst
2021-05-12 22:32:08 +02:00
committed by GitHub
parent f81f9ba492
commit f2b32b211b
16 changed files with 271 additions and 230 deletions

View File

@@ -11,11 +11,13 @@ namespace App\Controller;
use App\Entity\Timesheet;
use App\Event\TimesheetMetaDisplayEvent;
use App\Form\TimesheetEditForm;
use App\Repository\ActivityRepository;
use App\Repository\ProjectRepository;
use App\Repository\Query\TimesheetQuery;
use App\Repository\TagRepository;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
@@ -30,12 +32,8 @@ class TimesheetController extends TimesheetAbstractController
* @Route(path="/", defaults={"page": 1}, name="timesheet", methods={"GET"})
* @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="timesheet_paginated", methods={"GET"})
* @Security("is_granted('view_own_timesheet')")
*
* @param int $page
* @param Request $request
* @return Response
*/
public function indexAction($page, Request $request)
public function indexAction(int $page, Request $request): Response
{
$query = new TimesheetQuery();
$query->setPage($page);
@@ -47,12 +45,8 @@ class TimesheetController extends TimesheetAbstractController
/**
* @Route(path="/export/{exporter}", name="timesheet_export", methods={"GET"})
* @Security("is_granted('export_own_timesheet')")
*
* @param Request $request
* @param string $exporter
* @return Response
*/
public function exportAction(Request $request, string $exporter)
public function exportAction(Request $request, string $exporter): Response
{
return $this->export($request, $exporter);
}
@@ -60,21 +54,26 @@ class TimesheetController extends TimesheetAbstractController
/**
* @Route(path="/{id}/edit", name="timesheet_edit", methods={"GET", "POST"})
* @Security("is_granted('edit', entry)")
*
* @param Timesheet $entry
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function editAction(Timesheet $entry, Request $request)
public function editAction(Timesheet $entry, Request $request): Response
{
return $this->edit($entry, $request, 'timesheet/edit.html.twig');
}
/**
* @Route(path="/{id}/duplicate", name="timesheet_duplicate", methods={"GET", "POST"})
* @Security("is_granted('duplicate', entry)")
*/
public function duplicateAction(Timesheet $entry, Request $request): Response
{
return $this->duplicate($entry, $request, 'timesheet/edit.html.twig');
}
/**
* @Route(path="/multi-update", name="timesheet_multi_update", methods={"POST"})
* @Security("is_granted('edit_own_timesheet')")
*/
public function multiUpdateAction(Request $request)
public function multiUpdateAction(Request $request): Response
{
return $this->multiUpdate($request, 'timesheet/multi-update.html.twig');
}
@@ -83,7 +82,7 @@ class TimesheetController extends TimesheetAbstractController
* @Route(path="/multi-delete", name="timesheet_multi_delete", methods={"POST"})
* @Security("is_granted('delete_own_timesheet')")
*/
public function multiDeleteAction(Request $request)
public function multiDeleteAction(Request $request): Response
{
return $this->multiDelete($request);
}
@@ -91,14 +90,19 @@ class TimesheetController extends TimesheetAbstractController
/**
* @Route(path="/create", name="timesheet_create", methods={"GET", "POST"})
* @Security("is_granted('create_own_timesheet')")
*
* @param Request $request
* @param ProjectRepository $projectRepository
* @param ActivityRepository $activityRepository
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function createAction(Request $request, ProjectRepository $projectRepository, ActivityRepository $activityRepository, TagRepository $tagRepository)
public function createAction(Request $request, ProjectRepository $projectRepository, ActivityRepository $activityRepository, TagRepository $tagRepository): Response
{
return $this->create($request, 'timesheet/edit.html.twig', $projectRepository, $activityRepository, $tagRepository);
}
protected function getCreateForm(Timesheet $entry): FormInterface
{
return $this->generateCreateForm($entry, TimesheetEditForm::class, $this->generateUrl('timesheet_create'));
}
protected function getDuplicateForm(Timesheet $entry): FormInterface
{
return $this->generateCreateForm($entry, TimesheetEditForm::class, $this->generateUrl('timesheet_duplicate', ['id' => $entry->getId()]));
}
}