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

allow switching user displayed in calendar (#3314)

Browse Source
This commit is contained in:
Kevin Papst
2022-05-18 21:30:58 +02:00
committed by GitHub
parent 913839727c
commit 3c71640547
8 changed files with 165 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Controller/CalendarController.php
View File

@@ -11,8 +11,12 @@ namespace App\Controller;
use App\Calendar\CalendarService;
use App\Configuration\SystemConfiguration;
use App\Entity\User;
use App\Form\CalendarForm;
use App\Timesheet\TrackingModeService;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
/**
@@ -24,20 +28,43 @@ use Symfony\Component\Routing\Annotation\Route;
class CalendarController extends AbstractController
{
private $calendarService;
private $configuration;
private $service;
public function __construct(CalendarService $calendarService)
public function __construct(CalendarService $calendarService, SystemConfiguration $configuration, TrackingModeService $service)
{
$this->calendarService = $calendarService;
$this->configuration = $configuration;
$this->service = $service;
}
/**
* @Route(path="/", name="calendar", methods={"GET"})
* @Route(path="/{profile}", name="calendar_user", methods={"GET"})
*/
public function userCalendar(SystemConfiguration $configuration, TrackingModeService $service)
public function userCalendar(Request $request): Response
{
$mode = $service->getActiveMode();
$form = null;
$profile = $this->getUser();
if ($this->isGranted('view_other_timesheet')) {
$form = $this->createFormForGetRequest(CalendarForm::class, ['user' => $profile], [
'action' => $this->generateUrl('calendar'),
]);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$values = $form->getData();
if ($values['user'] instanceof User) {
$profile = $values['user'];
}
}
}
$mode = $this->service->getActiveMode();
$factory = $this->getDateTimeFactory();
$defaultStart = $factory->createDateTime($configuration->getTimesheetDefaultBeginTime());
$defaultStart = $factory->createDateTime($this->configuration->getTimesheetDefaultBeginTime());
$config = $this->calendarService->getConfiguration();
@@ -46,16 +73,18 @@ class CalendarController extends AbstractController
if ($mode->canEditBegin()) {
try {
$dragAndDrop = $this->calendarService->getDragAndDropResources($this->getUser());
$dragAndDrop = $this->calendarService->getDragAndDropResources($profile);
} catch (\Exception $ex) {
$this->logException($ex);
}
}
return $this->render('calendar/user.html.twig', [
'form' => ($form === null ? null : $form->createView()),
'user' => $profile,
'config' => $config,
'dragAndDrop' => $dragAndDrop,
'google' => $this->calendarService->getGoogleSources($this->getUser()),
'google' => $this->calendarService->getGoogleSources($profile),
'now' => $factory->createDateTime(),
'defaultStartTime' => $defaultStart->format('h:i:s'),
'is_punch_mode' => $isPunchMode,

47
src/Controller/TimesheetAbstractController.php
View File

@@ -23,10 +23,9 @@ use App\Form\MultiUpdate\MultiUpdateTableDTO;
use App\Form\MultiUpdate\TimesheetMultiUpdate;
use App\Form\MultiUpdate\TimesheetMultiUpdateDTO;
use App\Form\TimesheetEditForm;
use App\Form\TimesheetPreCreateForm;
use App\Form\Toolbar\TimesheetExportToolbarForm;
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;
@@ -147,48 +146,14 @@ abstract class TimesheetAbstractController extends AbstractController
]);
}
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
protected function create(Request $request, string $renderTemplate): 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('description')) {
$description = $request->query->get('description');
$entry->setDescription($description);
}
if ($request->query->get('tags')) {
foreach ($this->getTags($tagRepository, $request->query->get('tags')) as $tag) {
$entry->addTag($tag);
}
}
$preForm = $this->createFormForGetRequest(TimesheetPreCreateForm::class, $entry, [
'include_user' => $this->includeUserInForms('create'),
]);
$preForm->submit($request->query->all(), false);
$this->service->prepareNewTimesheet($entry, $request);
$createForm = $this->getCreateForm($entry);

7
src/Controller/TimesheetController.php
View File

@@ -13,9 +13,6 @@ use App\Entity\Timesheet;
use App\Event\TimesheetMetaDisplayEvent;
use App\Export\ServiceExport;
use App\Form\TimesheetEditForm;
use App\Repository\ActivityRepository;
use App\Repository\ProjectRepository;
use App\Repository\TagRepository;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
@@ -90,9 +87,9 @@ class TimesheetController extends TimesheetAbstractController
* @Route(path="/create", name="timesheet_create", methods={"GET", "POST"})
* @Security("is_granted('create_own_timesheet')")
*/
public function createAction(Request $request, ProjectRepository $projectRepository, ActivityRepository $activityRepository, TagRepository $tagRepository): Response
public function createAction(Request $request): Response
{
return $this->create($request, 'timesheet/edit.html.twig', $projectRepository, $activityRepository, $tagRepository);
return $this->create($request, 'timesheet/edit.html.twig');
}
protected function getCreateForm(Timesheet $entry): FormInterface

7
src/Controller/TimesheetTeamController.php
View File

@@ -18,10 +18,7 @@ use App\Export\ServiceExport;
use App\Form\Model\MultiUserTimesheet;
use App\Form\TimesheetAdminEditForm;
use App\Form\TimesheetMultiUserEditForm;
use App\Repository\ActivityRepository;
use App\Repository\ProjectRepository;
use App\Repository\Query\TimesheetQuery;
use App\Repository\TagRepository;
use Doctrine\Common\Collections\ArrayCollection;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\Form\FormInterface;
@@ -83,9 +80,9 @@ class TimesheetTeamController extends TimesheetAbstractController
* @Route(path="/create", name="admin_timesheet_create", methods={"GET", "POST"})
* @Security("is_granted('create_other_timesheet')")
*/
public function createAction(Request $request, ProjectRepository $projectRepository, ActivityRepository $activityRepository, TagRepository $tagRepository): Response
public function createAction(Request $request): Response
{
return $this->create($request, 'timesheet-team/edit.html.twig', $projectRepository, $activityRepository, $tagRepository);
return $this->create($request, 'timesheet-team/edit.html.twig');
}
/**

34
src/Form/CalendarForm.php Normal file
View File

@@ -0,0 +1,34 @@
<?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\Form;
use App\Form\Type\UserType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
class CalendarForm extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder->add('user', UserType::class, [
'required' => false,
'attr' => ['onchange' => 'this.form.submit()']
]);
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'csrf_protection' => false,
'method' => 'GET',
]);
}
}

46
src/Form/TimesheetPreCreateForm.php Normal file
View File

@@ -0,0 +1,46 @@
<?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\Form;
use App\Form\Type\DescriptionType;
use App\Form\Type\TagsInputType;
use App\Form\Type\UserType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Values that are allowed to be pre-set via URL.
*/
class TimesheetPreCreateForm extends AbstractType
{
use FormTrait;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$this->addProject($builder, true, null, null, ['required' => false]);
$this->addActivity($builder, null, null, ['required' => false]);
$builder->add('description', DescriptionType::class, ['required' => false]);
$builder->add('tags', TagsInputType::class, ['required' => false]);
if ($options['include_user']) {
$builder->add('user', UserType::class, ['required' => false]);
}
}
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'csrf_protection' => false,
'include_user' => false,
'method' => 'GET',
'validation_groups' => ['none'] // otherwise the default timesheet validations would trigger
]);
}
}

14
src/Validator/Constraints/TimesheetZeroDurationValidator.php
View File

@@ -17,9 +17,6 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
final class TimesheetZeroDurationValidator extends ConstraintValidator
{
/**
* @var SystemConfiguration
*/
private $configuration;
public function __construct(SystemConfiguration $configuration)
@@ -45,7 +42,16 @@ final class TimesheetZeroDurationValidator extends ConstraintValidator
return;
}
if ($timesheet->getDuration() == 0) {
if ($timesheet->isRunning()) {
return;
}
$duration = 0;
if ($timesheet->getEnd() !== null && $timesheet->getBegin() !== null) {
$duration = $timesheet->getEnd()->getTimestamp() - $timesheet->getBegin()->getTimestamp();
}
if ($duration <= 0) {
$this->context->buildViolation($constraint->message)
->atPath('duration')
->setTranslationDomain('validators')

38
templates/calendar/user.html.twig
View File

@@ -11,8 +11,17 @@
{% block main %}
<div class="row">
{% set hasDragAndDrop = (config.dragDropAmount > 0 and dragAndDrop is not empty and (dragAndDrop|filter(s => s.entries|length > 0)|length > 0)) %}
{% if hasDragAndDrop %}
{% if hasDragAndDrop or form is not null %}
<div class="hidden-xs col-sm-5 col-md-4 col-lg-3 no-print">
{% if form is not null %}
{% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
{% block box_body %}
{{ form_start(form) }}
{{ form_widget(form) }}
{{ form_end(form) }}
{% endblock %}
{% endembed %}
{% endif %}
{% for source in dragAndDrop|filter(s => s.entries|length > 0) %}
{% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
{% block box_title %}{{ source.title|trans }}{% endblock %}
@@ -58,6 +67,19 @@
{% block javascripts %}
{% set calendarSelector = '#timesheet_calendar' %}
{% set createParams = '' %}
{% set createRoute = 'timesheet_create' %}
{% set canDelete = is_granted('delete_own_timesheet') %}
{% set canCreate = is_granted('create_own_timesheet') %}
{% set canEdit = is_granted('edit_own_timesheet') %}
{% if user != app.user %}
{% set createParams = '&user=' ~ user.id %}
{% set createRoute = 'admin_timesheet_create' %}
{% set canDelete = is_granted('delete_other_timesheet') %}
{% set canCreate = is_granted('create_other_timesheet') %}
{% set canEdit = is_granted('edit_other_timesheet') %}
{% endif %}
{{ parent() }}
<script>
activatePopover();
@@ -237,7 +259,7 @@
googleCalendarApiKey: '{{ google.apiKey }}',
{% endif %}
header : {
left : 'prev,next today{% if is_granted('delete_own_timesheet') %} deleteButton{% endif %}',
left : 'prev,next today{% if canDelete %} deleteButton{% endif %}',
center: 'title',
right : 'month,agendaWeek,agendaDay'
},
@@ -347,7 +369,7 @@
events: function(start, end, timezone, callback) {
let from = moment(start.format()).format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
let to = moment(end.format()).format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
API.get('{{ path('get_timesheets') }}?size=1000&full=true&begin='+from+'&end='+to, {}, function(result) {
API.get('{{ path('get_timesheets') }}?user={{ user.id }}&size=1000&full=true&begin='+from+'&end='+to, {}, function(result) {
let apiEvents = [];
for (const record of result) {
apiEvents.push(convertApiTimesheetToCalendar(record));
@@ -436,7 +458,7 @@
$element.data('ids', event.id + ' ' + ids);
$element.text(DATES.formatSeconds(duration));
},
{% if not is_punch_mode and is_granted('create_own_timesheet') %}
{% if not is_punch_mode and canCreate %}
dayClick: function(date, jsEvent, view) {
{#
Day-clicks are always triggered, unless a selection was created.
@@ -447,7 +469,7 @@
return;
}
let createUrl = '{{ path('timesheet_create') }}?begin=' + date.format();
let createUrl = '{{ path(createRoute) }}?begin=' + date.format() + '{{ createParams|raw }}';
kimai.getPlugin('modal').openUrlInModal(createUrl);
},
selectable: true,
@@ -459,11 +481,11 @@
#}
return;
}
let createUrl = '{{ path('timesheet_create') }}' + '?from=' + start.format() + '&to=' + end.format();
let createUrl = '{{ path(createRoute) }}' + '?from=' + start.format() + '&to=' + end.format() + '{{ createParams|raw }}';
kimai.getPlugin('modal').openUrlInModal(createUrl);
},
{% endif %}
{% if is_granted('edit_own_timesheet') %}
{% if canEdit %}
eventClick: function(eventObj, jsEvent, view) {
if (eventObj.source.ajaxSettings !== undefined) {
jsEvent.preventDefault();
@@ -479,7 +501,7 @@
},
eventDragStop: function(event, jsEvent, ui, view) {
activatePopover();
{% if is_granted('delete_own_timesheet') %}
{% if canDelete %}
var trash = jQuery('.fc-deleteButton-button');
var offset = trash.offset();