added create project functionality #23 (#30)

This commit is contained in:
Kevin Papst
2018-01-06 11:08:15 +01:00
committed by GitHub
parent 68629cc2ff
commit f6ab543b8d
3 changed files with 30 additions and 9 deletions

View File

@@ -14,6 +14,7 @@ namespace TimesheetBundle\Controller\Admin;
use AppBundle\Controller\AbstractController; use AppBundle\Controller\AbstractController;
use Pagerfanta\Pagerfanta; use Pagerfanta\Pagerfanta;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use TimesheetBundle\Entity\Customer;
use TimesheetBundle\Entity\Project; use TimesheetBundle\Entity\Project;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -37,9 +38,6 @@ class ProjectController extends AbstractController
* @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_project_paginated") * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_project_paginated")
* @Method("GET") * @Method("GET")
* @Cache(smaxage="10") * @Cache(smaxage="10")
*
* @param $page
* @return \Symfony\Component\HttpFoundation\Response
*/ */
public function indexAction($page) public function indexAction($page)
{ {
@@ -49,15 +47,30 @@ class ProjectController extends AbstractController
return $this->render('TimesheetBundle:admin:project.html.twig', ['entries' => $entries]); return $this->render('TimesheetBundle:admin:project.html.twig', ['entries' => $entries]);
} }
/**
* @Route("/create", name="admin_project_create")
* @Method({"GET", "POST"})
*/
public function createAction(Request $request)
{
return $this->renderProjectForm(new Project(), $request);
}
/** /**
* @Route("/{id}/edit", name="admin_project_edit") * @Route("/{id}/edit", name="admin_project_edit")
* @Method({"GET", "POST"}) * @Method({"GET", "POST"})
* */
public function editAction(Project $project, Request $request)
{
return $this->renderProjectForm($project, $request);
}
/**
* @param Project $project * @param Project $project
* @param Request $request * @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/ */
public function editAction(Project $project, Request $request) protected function renderProjectForm(Project $project, Request $request)
{ {
$editForm = $this->createEditForm($project); $editForm = $this->createEditForm($project);
@@ -90,13 +103,21 @@ class ProjectController extends AbstractController
*/ */
private function createEditForm(Project $project) private function createEditForm(Project $project)
{ {
if ($project->getId() === null) {
$url = $this->generateUrl('admin_project_create');
$currency = Customer::DEFAULT_CURRENCY;
} else {
$url = $this->generateUrl('admin_project_edit', ['id' => $project->getId()]);
$currency = $project->getCustomer()->getCurrency();
}
return $this->createForm( return $this->createForm(
ProjectEditForm::class, ProjectEditForm::class,
$project, $project,
[ [
'action' => $this->generateUrl('admin_project_edit', ['id' => $project->getId()]), 'action' => $url,
'method' => 'POST', 'method' => 'POST',
'currency' => $project->getCustomer()->getCurrency() 'currency' => $currency,
] ]
); );
} }

View File

@@ -19,7 +19,7 @@
'label.budget': 'hidden-xs', 'label.budget': 'hidden-xs',
'label.visible': '', 'label.visible': '',
'label.actions': '', 'label.actions': '',
}) }} }, null, {'plus-square': path('admin_project_create')}) }}
{% for entry in entries %} {% for entry in entries %}
<tr> <tr>

View File

@@ -7,7 +7,7 @@
{% block main %} {% block main %}
{{ include('default/_form.html.twig', { {{ include('default/_form.html.twig', {
'title': project.name, 'title': project.name|default('create'|trans),
'form': form, 'form': form,
'back': path('admin_project') 'back': path('admin_project')
}) }} }) }}