Merge remote-tracking branch 'origin/master'

This commit is contained in:
2018-04-25 12:12:08 +02:00
8 changed files with 441 additions and 42 deletions

View File

@@ -16,75 +16,270 @@ use Chill\TaskBundle\Security\Authorization\TaskVoter;
use Symfony\Component\Security\Core\Role\Role;
use Chill\MainBundle\Pagination\PaginatorFactory;
use Chill\TaskBundle\Repository\SingleTaskRepository;
use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Security\Authorization\PersonVoter;
use Chill\TaskBundle\Repository\SingleTaskRepository;
use Chill\MainBundle\Pagination\PaginatorFactory;
class SingleTaskController extends Controller
{
/**
* @Route("/{_locale}/task/single-task/new")
* @Route(
* "/{_locale}/task/single-task/new",
* name="chill_task_single_task_new"
* )
*/
public function newAction(Request $request)
{
$personId = $request->query->getInt('person_id', null);
if ($personId === null) {
return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
}
$person = $this->getDoctrine()->getManager()
->getRepository(Person::class)
->find($personId);
if ($person === null) {
throw $this->createNotFoundException("Invalid person id");
}
$task = (new SingleTask())
->setPerson($person)
->setAssignee($this->getUser())
->setType('task_default')
;
$this->denyAccessUnlessGranted(TaskVoter::CREATE, $task, 'You are not '
. 'allowed to create this task');
$form = $this->createCreateForm($task);
// $this->denyAccessUnlessGranted(TaskVoter::CREATE, $task, 'You are not '
// . 'allowed to create this task');
$form = $this->setCreateForm($task, new Role(TaskVoter::CREATE));
$form->handleRequest($request);
if ($form->isSubmitted()) {
if ($form->isValid()) {
$em = $this->getDoctrine()->getManager();
$em->persist($task);
$em->flush();
$this->addFlash('success', "The task is created");
$em->flush();
return $this->redirectToRoute('chill_task_task_list', [
'personId' => $task->getPerson()->getId()
]);
} else {
$this->addFlash('error', "This form contains errors");
}
}
return $this->render('ChillTaskBundle:SingleTask:new.html.twig', array(
'form' => $form->createView(),
'task' => $task
));
}
/**
*
* @Route(
* "/{_locale}/task/single-task/{id}/show",
* name="chill_task_single_task_show"
* )
*/
public function showAction(Request $request, $id)
{
/* @var $taskRepository SingleTaskRepository */
$taskRepository = $this->get('chill_task.single_task_repository');
$task = $taskRepository->find($id);
if (!is_null($task->getPerson() === !null)) {
$personId = $task->getPerson()->getId();
if ($personId === null) {
return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
}
$person = $this->getDoctrine()->getManager()
->getRepository(Person::class)
->find($personId);
if ($person === null) {
throw $this->createNotFoundException("Invalid person id");
}
}
// $this->denyAccessUnlessGranted(TaskVoter::SEE, $task, 'You are not '
// . 'allowed to view this task');
if (!$task) {
throw $this->createNotFoundException('Unable to find Task entity.');
}
return $this->render('ChillTaskBundle:SingleTask:show.html.twig', array(
'task' => $task,
));
}
/**
* @Route(
* "/{_locale}/task/single-task/{id}/edit",
* name="chill_task_single_task_edit"
* )
*/
public function editAction(Request $request, $id)
{
/* @var $taskRepository SingleTaskRepository */
$taskRepository = $this->get('chill_task.single_task_repository');
$task = $taskRepository->find($id);
if (!is_null($task->getPerson() === !null)) {
$personId = $task->getPerson()->getId();
if ($personId === null) {
return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
}
$person = $this->getDoctrine()->getManager()
->getRepository(Person::class)
->find($personId);
if ($person === null) {
throw $this->createNotFoundException("Invalid person id");
}
}
// $this->denyAccessUnlessGranted(TaskVoter::UPDATE, $task, 'You are not '
// . 'allowed to edit this task');
if (!$task) {
throw $this->createNotFoundException('Unable to find Task entity.');
}
$form = $this->setCreateForm($task, new Role(TaskVoter::UPDATE));
$form->handleRequest($request);
if ($form->isSubmitted()) {
if ($form->isValid()) {
$em = $this->getDoctrine()->getManager();
$em->persist($task);
$em->flush();
$this->addFlash('success', "Success : task updated!");
return $this->redirectToRoute('chill_task_task_list', [
'personId' => $task->getPerson()->getId()
]);
} else {
$this->addFlash('error', "This form contains errors");
}
}
return $this->render('ChillTaskBundle:SingleTask:edit.html.twig', array(
'task' => $task,
'form' => $form->createView()
));
}
/**
* @Route(
* "/{_locale}/task/single-task/{id}/delete",
* name="chill_task_single_task_delete"
* )
*/
public function deleteAction(Request $request, $id)
{
/* @var $taskRepository SingleTaskRepository */
$taskRepository = $this->get('chill_task.single_task_repository');
$task = $taskRepository->find($id);
if (!is_null($task->getPerson() === !null)) {
$personId = $task->getPerson()->getId();
if ($personId === null) {
return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
}
$person = $this->getDoctrine()->getManager()
->getRepository(Person::class)
->find($personId);
if ($person === null) {
throw $this->createNotFoundException("Invalid person id");
}
}
// $this->denyAccessUnlessGranted(TaskVoter::DELETE, $task, 'You are not '
// . 'allowed to delete this task');
if (!$task) {
throw $this->createNotFoundException('Unable to find Task entity.');
}
$form = $this->createDeleteForm($id);
if ($request->getMethod() === Request::METHOD_DELETE) {
$form->handleRequest($request);
if ($form->isValid()) {
$logger = $this->get('chill.main.logger');
$logger->notice("A task has been removed", array(
'by_user' => $this->getUser()->getUsername(),
'task_id' => $task->getId(),
'description' => $task->getDescription(),
'assignee' => $task->getAssignee(),
'scope_id' => $task->getScope()->getId(),
//'start_date' => $task->getStartDate()->format('Y-m-d'),
//'end_date' => $task->getEndDate()->format('Y-m-d'),
//'warning_interval' => $task->getWarningInterval()->format('Y-m-d')
));
$em = $this->getDoctrine()->getManager();
$em->remove($task);
$em->flush();
$this->addFlash('success', $this->get('translator')
->trans("The task has been successfully removed."));
return $this->redirect($this->generateUrl(
'chill_task_task_list', array(
'personId' => $personId
)));
}
}
return $this->render('ChillTaskBundle:SingleTask:confirm_delete.html.twig', array(
'task' => $task,
'delete_form' => $form->createView()
));
}
/**
*
* @param SingleTask $task
* @param Role $role
* @return \Symfony\Component\Form\FormInterface
*/
protected function createCreateForm(SingleTask $task)
protected function setCreateForm(SingleTask $task, Role $role)
{
$form = $this->createForm(SingleTaskType::class, $task, [
'center' => $task->getCenter(),
'role' => new Role(TaskVoter::CREATE)
'role' => $role
]);
$form->add('submit', SubmitType::class);
return $form;
}
@@ -175,4 +370,23 @@ class SingleTaskController extends Controller
return $user;
}
/**
* Creates a form to delete a Task entity by id.
*
* @param mixed $id The entity id
*
* @return \Symfony\Component\Form\Form The form
*/
private function createDeleteForm($id)
{
return $this->createFormBuilder()
->setAction($this->generateUrl(
'chill_task_single_task_delete',
array('id' => $id)))
->setMethod('DELETE')
->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
;
}
}