* added sortable js library * activity in invoice is optional * added javascript widget for paginated boxes * fix activity dropdown for globals only * added timesheet service to reduce code duplication * use repository to query for teams in dropdowns * added project validator * validate project start and end against timesheet * include begin and end in dynamic form requests for projects * added timezone and language option to import flag, improve timesheet import speed * deactivate cross-timezone filter * add virtual fields to field order list * composer update * added param to ignore dates * position loader icon fixed - fixes #1330 * permission problem when creating a new project - fixes #1340 * remove dev dependencies webserver and thanks bundle * stop information leak (begin and end date) in duration mode - fixes #1307 * unify timesheet edit dialog for user and admins * fix security issue, own rates exposed to unauthorized users in multi-update dialog
534 lines
18 KiB
PHP
534 lines
18 KiB
PHP
<?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;
|
|
|
|
use App\Entity\MetaTableTypeInterface;
|
|
use App\Entity\Tag;
|
|
use App\Entity\Timesheet;
|
|
use App\Event\TimesheetMetaDefinitionEvent;
|
|
use App\Event\TimesheetMetaDisplayEvent;
|
|
use App\Export\ServiceExport;
|
|
use App\Form\MultiUpdate\MultiUpdateTable;
|
|
use App\Form\MultiUpdate\MultiUpdateTableDTO;
|
|
use App\Form\MultiUpdate\TimesheetMultiUpdate;
|
|
use App\Form\MultiUpdate\TimesheetMultiUpdateDTO;
|
|
use App\Form\TimesheetEditForm;
|
|
use App\Form\Toolbar\TimesheetToolbarForm;
|
|
use App\Repository\ActivityRepository;
|
|
use App\Repository\ProjectRepository;
|
|
use App\Repository\Query\TimesheetQuery;
|
|
use App\Repository\TagRepository;
|
|
use App\Repository\TimesheetRepository;
|
|
use App\Timesheet\TimesheetService;
|
|
use App\Timesheet\TrackingMode\TrackingModeInterface;
|
|
use App\Timesheet\TrackingModeService;
|
|
use App\Timesheet\UserDateTimeFactory;
|
|
use Doctrine\Common\Collections\ArrayCollection;
|
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
|
use Symfony\Component\Form\FormInterface;
|
|
use Symfony\Component\HttpFoundation\Request;
|
|
use Symfony\Component\HttpFoundation\Response;
|
|
|
|
abstract class TimesheetAbstractController extends AbstractController
|
|
{
|
|
/**
|
|
* @var UserDateTimeFactory
|
|
*/
|
|
protected $dateTime;
|
|
/**
|
|
* @var TimesheetRepository
|
|
*/
|
|
protected $repository;
|
|
/**
|
|
* @var TrackingModeService
|
|
*/
|
|
protected $trackingModeService;
|
|
/**
|
|
* @var EventDispatcherInterface
|
|
*/
|
|
protected $dispatcher;
|
|
/**
|
|
* @var ServiceExport
|
|
*/
|
|
protected $exportService;
|
|
/**
|
|
* @var TimesheetService
|
|
*/
|
|
private $service;
|
|
|
|
public function __construct(
|
|
UserDateTimeFactory $dateTime,
|
|
TimesheetRepository $repository,
|
|
TrackingModeService $trackingModeService,
|
|
EventDispatcherInterface $dispatcher,
|
|
ServiceExport $exportService,
|
|
TimesheetService $timesheetService
|
|
) {
|
|
$this->dateTime = $dateTime;
|
|
$this->repository = $repository;
|
|
$this->trackingModeService = $trackingModeService;
|
|
$this->dispatcher = $dispatcher;
|
|
$this->exportService = $exportService;
|
|
$this->service = $timesheetService;
|
|
}
|
|
|
|
protected function getTrackingMode(): TrackingModeInterface
|
|
{
|
|
return $this->trackingModeService->getActiveMode();
|
|
}
|
|
|
|
protected function index($page, Request $request, string $renderTemplate, string $location): Response
|
|
{
|
|
$query = new TimesheetQuery();
|
|
$query->setPage($page);
|
|
|
|
$form = $this->getToolbarForm($query);
|
|
$form->setData($query);
|
|
$form->submit($request->query->all(), false);
|
|
|
|
if (!$form->isValid()) {
|
|
$query->resetByFormError($form->getErrors());
|
|
}
|
|
|
|
if (null !== $query->getBegin()) {
|
|
$query->getBegin()->setTime(0, 0, 0);
|
|
}
|
|
if (null !== $query->getEnd()) {
|
|
$query->getEnd()->setTime(23, 59, 59);
|
|
}
|
|
|
|
$tags = $query->getTags(true);
|
|
if (!empty($tags)) {
|
|
/** @var TagRepository $tagRepo */
|
|
$tagRepo = $this->getDoctrine()->getRepository(Tag::class);
|
|
$query->setTags(
|
|
new ArrayCollection(
|
|
$tagRepo->findIdsByTagNameList(implode(',', $tags))
|
|
)
|
|
);
|
|
}
|
|
|
|
$this->prepareQuery($query);
|
|
|
|
$pager = $this->repository->getPagerfantaForQuery($query);
|
|
|
|
return $this->render($renderTemplate, [
|
|
'entries' => $pager,
|
|
'page' => $query->getPage(),
|
|
'query' => $query,
|
|
'toolbarForm' => $form->createView(),
|
|
'multiUpdateForm' => $this->getMultiUpdateActionForm()->createView(),
|
|
'showSummary' => $this->includeSummary(),
|
|
'showStartEndTime' => $this->canSeeStartEndTime(),
|
|
'metaColumns' => $this->findMetaColumns($query, $location),
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* @param TimesheetQuery $query
|
|
* @param string $location
|
|
* @return MetaTableTypeInterface[]
|
|
*/
|
|
protected function findMetaColumns(TimesheetQuery $query, string $location): array
|
|
{
|
|
$event = new TimesheetMetaDisplayEvent($query, $location);
|
|
$this->dispatcher->dispatch($event);
|
|
|
|
return $event->getFields();
|
|
}
|
|
|
|
protected function edit(Timesheet $entry, Request $request, string $renderTemplate): Response
|
|
{
|
|
$event = new TimesheetMetaDefinitionEvent($entry);
|
|
$this->dispatcher->dispatch($event);
|
|
|
|
$editForm = $this->getEditForm($entry, $request->get('page'));
|
|
$editForm->handleRequest($request);
|
|
|
|
if ($editForm->isSubmitted() && $editForm->isValid()) {
|
|
try {
|
|
$this->repository->save($entry);
|
|
$this->flashSuccess('action.update.success');
|
|
|
|
return $this->redirectToRoute($this->getTimesheetRoute(), ['page' => $request->get('page', 1)]);
|
|
} catch (\Exception $ex) {
|
|
$this->flashError('action.update.error', ['%reason%' => $ex->getMessage()]);
|
|
}
|
|
}
|
|
|
|
return $this->render($renderTemplate, [
|
|
'timesheet' => $entry,
|
|
'form' => $editForm->createView(),
|
|
]);
|
|
}
|
|
|
|
protected function getTags(TagRepository $tagRepository, $tagNames)
|
|
{
|
|
$tags = [];
|
|
if (!is_array($tagNames)) {
|
|
$tagNames = explode(',', $tagNames);
|
|
}
|
|
foreach ($tagNames as $tagName) {
|
|
$tag = $tagRepository->findTagByName($tagName);
|
|
if (!$tag) {
|
|
$tag = new Tag();
|
|
$tag->setName($tagName);
|
|
}
|
|
$tags[] = $tag;
|
|
}
|
|
|
|
return $tags;
|
|
}
|
|
|
|
protected function create(Request $request, string $renderTemplate, ProjectRepository $projectRepository, ActivityRepository $activityRepository, TagRepository $tagRepository): Response
|
|
{
|
|
$entry = $this->service->createNewTimesheet($this->getUser());
|
|
|
|
if ($request->query->get('project')) {
|
|
$project = $projectRepository->find($request->query->get('project'));
|
|
$entry->setProject($project);
|
|
}
|
|
|
|
if ($request->query->get('activity')) {
|
|
$activity = $activityRepository->find($request->query->get('activity'));
|
|
$entry->setActivity($activity);
|
|
}
|
|
|
|
if ($request->query->get('tags')) {
|
|
foreach ($this->getTags($tagRepository, $request->query->get('tags')) as $tag) {
|
|
$entry->addTag($tag);
|
|
}
|
|
}
|
|
|
|
$this->service->prepareNewTimesheet($entry, $request);
|
|
|
|
$mode = $this->getTrackingMode();
|
|
$createForm = $this->getCreateForm($entry, $mode);
|
|
$createForm->handleRequest($request);
|
|
|
|
if ($createForm->isSubmitted() && $createForm->isValid()) {
|
|
try {
|
|
$this->service->saveNewTimesheet($entry);
|
|
$this->flashSuccess('action.update.success');
|
|
|
|
return $this->redirectToRoute($this->getTimesheetRoute());
|
|
} catch (\Exception $ex) {
|
|
$this->flashError('action.update.error', ['%reason%' => $ex->getMessage()]);
|
|
}
|
|
}
|
|
|
|
return $this->render($renderTemplate, [
|
|
'timesheet' => $entry,
|
|
'form' => $createForm->createView(),
|
|
]);
|
|
}
|
|
|
|
protected function export(Request $request, string $exporterId): Response
|
|
{
|
|
$query = new TimesheetQuery();
|
|
|
|
$form = $this->getToolbarForm($query);
|
|
$form->setData($query);
|
|
$form->submit($request->query->all(), false);
|
|
|
|
// by default the current month is exported, but it can be overwritten
|
|
// this should not be removed, otherwise we would export EVERY available record in the admin section
|
|
// as the default toolbar query does neither limit the user nor the date-range!
|
|
if (null === $query->getBegin()) {
|
|
$query->setBegin($this->dateTime->createDateTime('first day of this month'));
|
|
}
|
|
$query->getBegin()->setTime(0, 0, 0);
|
|
|
|
if (null === $query->getEnd()) {
|
|
$query->setEnd($this->dateTime->createDateTime('last day of this month'));
|
|
}
|
|
$query->getEnd()->setTime(23, 59, 59);
|
|
|
|
$this->prepareQuery($query);
|
|
|
|
$entries = $this->repository->getTimesheetsForQuery($query);
|
|
|
|
$exporter = $this->exportService->getTimesheetExporterById($exporterId);
|
|
|
|
if (null === $exporter) {
|
|
throw $this->createNotFoundException('Invalid timesheet exporter given');
|
|
}
|
|
|
|
return $exporter->render($entries, $query);
|
|
}
|
|
|
|
protected function multiUpdate(Request $request, string $renderTemplate)
|
|
{
|
|
$dto = new TimesheetMultiUpdateDTO();
|
|
|
|
// initial request from the listing posts a different form
|
|
$form = $this->getMultiUpdateActionForm();
|
|
$form->handleRequest($request);
|
|
if ($form->isSubmitted() && $form->isValid()) {
|
|
$dto->setEntities($form->getData()->getEntities());
|
|
}
|
|
|
|
$form = $this->getMultiUpdateForm($dto);
|
|
$form->handleRequest($request);
|
|
|
|
// remove all, which are not allowed to be edited
|
|
$timesheets = [];
|
|
$disallowed = 0;
|
|
/** @var Timesheet $timesheet */
|
|
foreach ($dto->getEntities() as $timesheet) {
|
|
if (!$this->isGranted('edit', $timesheet)) {
|
|
$disallowed++;
|
|
continue;
|
|
}
|
|
$timesheets[] = $timesheet;
|
|
}
|
|
|
|
if ($disallowed > 0) {
|
|
$this->flashWarning(sprintf('You are missing the permission to edit %s timesheets', $disallowed));
|
|
}
|
|
|
|
$dto->setEntities($timesheets);
|
|
|
|
if (count($dto->getEntities()) === 0) {
|
|
return $this->redirectToRoute($this->getTimesheetRoute());
|
|
}
|
|
|
|
if ($form->isSubmitted() && $form->isValid()) {
|
|
/** @var Timesheet $timesheet */
|
|
$execute = false;
|
|
foreach ($dto->getEntities() as $timesheet) {
|
|
if ($dto->isReplaceTags()) {
|
|
foreach ($timesheet->getTags() as $tag) {
|
|
$timesheet->removeTag($tag);
|
|
}
|
|
$execute = true;
|
|
}
|
|
foreach ($dto->getTags() as $tag) {
|
|
$timesheet->addTag($tag);
|
|
$execute = true;
|
|
}
|
|
if (null !== $dto->getActivity()) {
|
|
$timesheet->setActivity($dto->getActivity());
|
|
$execute = true;
|
|
}
|
|
if (null !== $dto->getProject()) {
|
|
$timesheet->setProject($dto->getProject());
|
|
$execute = true;
|
|
}
|
|
if (null !== $dto->getUser()) {
|
|
$timesheet->setUser($dto->getUser());
|
|
$execute = true;
|
|
}
|
|
if (null !== $dto->isExported()) {
|
|
$timesheet->setExported($dto->isExported());
|
|
$execute = true;
|
|
}
|
|
// setting both values allows to erase wrong
|
|
if (null !== $dto->getHourlyRate()) {
|
|
$timesheet->setFixedRate(null);
|
|
$timesheet->setHourlyRate($dto->getHourlyRate());
|
|
$execute = true;
|
|
} elseif (null !== $dto->getFixedRate()) {
|
|
$timesheet->setFixedRate($dto->getFixedRate());
|
|
$timesheet->setHourlyRate(null);
|
|
$execute = true;
|
|
}
|
|
}
|
|
|
|
if ($execute) {
|
|
try {
|
|
$this->repository->saveMultiple($dto->getEntities());
|
|
$this->flashSuccess('action.update.success');
|
|
|
|
return $this->redirectToRoute($this->getTimesheetRoute());
|
|
} catch (\Exception $ex) {
|
|
$this->flashError('action.update.error', ['%reason%' => $ex->getMessage()]);
|
|
}
|
|
}
|
|
}
|
|
|
|
return $this->render($renderTemplate, [
|
|
'form' => $form->createView(),
|
|
'dto' => $dto,
|
|
]);
|
|
}
|
|
|
|
protected function multiDelete(Request $request)
|
|
{
|
|
$form = $this->getMultiUpdateActionForm();
|
|
$form->handleRequest($request);
|
|
|
|
if ($form->isSubmitted() && $form->isValid()) {
|
|
$dto = $form->getData();
|
|
$timesheets = [];
|
|
/** @var Timesheet $timesheet */
|
|
foreach ($dto->getEntities() as $timesheet) {
|
|
if (!$this->isGranted('delete', $timesheet)) {
|
|
continue;
|
|
}
|
|
$timesheets[] = $timesheet;
|
|
}
|
|
$dto->setEntities($timesheets);
|
|
|
|
try {
|
|
$this->repository->deleteMultiple($dto->getEntities());
|
|
$this->flashSuccess('action.delete.success');
|
|
} catch (\Exception $ex) {
|
|
$this->flashError('action.delete.error', ['%reason%' => $ex->getMessage()]);
|
|
}
|
|
}
|
|
|
|
return $this->redirectToRoute($this->getTimesheetRoute());
|
|
}
|
|
|
|
protected function prepareQuery(TimesheetQuery $query)
|
|
{
|
|
$query->setUser($this->getUser());
|
|
}
|
|
|
|
protected function getMultiUpdateForm(TimesheetMultiUpdateDTO $multiUpdate): FormInterface
|
|
{
|
|
return $this->createForm(TimesheetMultiUpdate::class, $multiUpdate, [
|
|
'action' => $this->generateUrl($this->getMultiUpdateRoute(), []),
|
|
'method' => 'POST',
|
|
'include_exported' => $this->isGranted($this->getPermissionEditExport()),
|
|
'include_rate' => $this->isGranted($this->getPermissionEditRate()),
|
|
'include_user' => $this->includeUserInForms('multi'),
|
|
]);
|
|
}
|
|
|
|
protected function getMultiUpdateActionForm(): FormInterface
|
|
{
|
|
$dto = new MultiUpdateTableDTO();
|
|
|
|
$dto->addUpdate($this->generateUrl($this->getMultiUpdateRoute()));
|
|
$dto->addDelete($this->generateUrl($this->getMultiDeleteRoute()));
|
|
|
|
return $this->createForm(MultiUpdateTable::class, $dto, [
|
|
'action' => $this->generateUrl($this->getTimesheetRoute()),
|
|
'repository' => $this->repository,
|
|
'method' => 'POST',
|
|
]);
|
|
}
|
|
|
|
protected function getCreateForm(Timesheet $entry, TrackingModeInterface $mode): FormInterface
|
|
{
|
|
return $this->createForm($this->getCreateFormClassName(), $entry, [
|
|
'action' => $this->generateUrl($this->getCreateRoute()),
|
|
'include_rate' => $this->isGranted('edit_rate', $entry),
|
|
'include_exported' => $this->isGranted('edit_export', $entry),
|
|
'include_user' => $this->includeUserInForms('create'),
|
|
'allow_begin_datetime' => $mode->canEditBegin(),
|
|
'allow_end_datetime' => $mode->canEditEnd(),
|
|
'allow_duration' => $mode->canEditDuration(),
|
|
'customer' => true,
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* @param Timesheet $entry
|
|
* @param int $page
|
|
* @return FormInterface
|
|
*/
|
|
protected function getEditForm(Timesheet $entry, $page)
|
|
{
|
|
$mode = $this->getTrackingMode();
|
|
|
|
return $this->createForm($this->getEditFormClassName(), $entry, [
|
|
'action' => $this->generateUrl($this->getEditRoute(), [
|
|
'id' => $entry->getId(),
|
|
'page' => $page,
|
|
]),
|
|
'include_rate' => $this->isGranted('edit_rate', $entry),
|
|
'include_exported' => $this->isGranted('edit_export', $entry),
|
|
'include_user' => $this->includeUserInForms('edit'),
|
|
'allow_begin_datetime' => $mode->canEditBegin(),
|
|
'allow_end_datetime' => $mode->canEditEnd(),
|
|
'allow_duration' => $mode->canEditDuration(),
|
|
'customer' => true,
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* @param TimesheetQuery $query
|
|
* @return FormInterface
|
|
*/
|
|
protected function getToolbarForm(TimesheetQuery $query)
|
|
{
|
|
return $this->createForm(TimesheetToolbarForm::class, $query, [
|
|
'action' => $this->generateUrl($this->getTimesheetRoute(), [
|
|
'page' => $query->getPage(),
|
|
]),
|
|
'method' => 'GET',
|
|
'include_user' => $this->includeUserInForms('toolbar'),
|
|
]);
|
|
}
|
|
|
|
protected function getPermissionEditExport(): string
|
|
{
|
|
return 'edit_export_own_timesheet';
|
|
}
|
|
|
|
protected function getPermissionEditRate(): string
|
|
{
|
|
return 'edit_rate_own_timesheet';
|
|
}
|
|
|
|
protected function getCreateFormClassName(): string
|
|
{
|
|
return TimesheetEditForm::class;
|
|
}
|
|
|
|
protected function getEditFormClassName(): string
|
|
{
|
|
return TimesheetEditForm::class;
|
|
}
|
|
|
|
protected function includeSummary(): bool
|
|
{
|
|
return (bool) $this->getUser()->getPreferenceValue('timesheet.daily_stats', false);
|
|
}
|
|
|
|
protected function includeUserInForms(string $formName): bool
|
|
{
|
|
return false;
|
|
}
|
|
|
|
protected function getTimesheetRoute(): string
|
|
{
|
|
return 'timesheet';
|
|
}
|
|
|
|
protected function getEditRoute(): string
|
|
{
|
|
return 'timesheet_edit';
|
|
}
|
|
|
|
protected function getCreateRoute(): string
|
|
{
|
|
return 'timesheet_create';
|
|
}
|
|
|
|
protected function getMultiUpdateRoute(): string
|
|
{
|
|
return 'timesheet_multi_update';
|
|
}
|
|
|
|
protected function getMultiDeleteRoute(): string
|
|
{
|
|
return 'timesheet_multi_delete';
|
|
}
|
|
|
|
protected function canSeeStartEndTime(): bool
|
|
{
|
|
return $this->getTrackingMode()->canSeeBeginAndEndTimes();
|
|
}
|
|
}
|