Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-02 21:13:57 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix https://framagit.org/Chill-project/Chill-Person/-/issues/22 bug

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-02-03 18:50:34 +01:00
parent 03cafbf4c6
commit c76e401021
6 changed files with 152 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Controller/AccompanyingPeriodController.php
View File

@@ -55,8 +55,10 @@ class AccompanyingPeriodController extends AbstractController
$this->eventDispatcher = $eventDispatcher;
}
/**
* @param $person_id
* @return Response
*/
public function listAction($person_id){
$person = $this->_getPerson($person_id);
@@ -71,8 +73,15 @@ class AccompanyingPeriodController extends AbstractController
array('accompanying_periods' => $person->getAccompanyingPeriodsOrdered(),
'person' => $person));
}
public function createAction($person_id, Request $request) {
/**
* @param $person_id
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
*/
public function createAction($person_id, Request $request)
{
$person = $this->_getPerson($person_id);
$this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person,
@@ -91,7 +100,7 @@ class AccompanyingPeriodController extends AbstractController
'period_action' => 'create',
'center' => $person->getCenter()
]);
if ($request->getMethod() === 'POST') {
$form->handleRequest($request);
$errors = $this->_validatePerson($person);
@@ -127,7 +136,13 @@ class AccompanyingPeriodController extends AbstractController
)
);
}
/**
* @param $person_id
* @param $period_id
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|Response|\Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/
public function updateAction($person_id, $period_id, Request $request){
$em = $this->getDoctrine()->getManager();
@@ -180,8 +195,16 @@ class AccompanyingPeriodController extends AbstractController
'accompanying_period' => $accompanyingPeriod
) );
}
public function closeAction($person_id, Request $request) {
/**
* @param $person_id
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
* @throws \Exception
*/
public function closeAction($person_id, Request $request)
{
$person = $this->_getPerson($person_id);
$this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person,
@@ -200,6 +223,7 @@ class AccompanyingPeriodController extends AbstractController
}
$current = $person->getCurrentAccompanyingPeriod();
$form = $this->createForm(AccompanyingPeriodType::class, $current, array(
'period_action' => 'close',
'center' => $person->getCenter()
@@ -256,10 +280,9 @@ class AccompanyingPeriodController extends AbstractController
'accompanying_period' => $current
));
}
/**
*
* @param Chill\PersonBundle\Entity\Person $person
* @param Person $person
* @return \Symfony\Component\Validator\ConstraintViolationListInterface
*/
private function _validatePerson(Person $person) {
@@ -274,8 +297,12 @@ class AccompanyingPeriodController extends AbstractController
return $errors;
}
/**
* @param $person_id
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
*/
public function openAction($person_id, Request $request) {
$person = $this->_getPerson($person_id);
@@ -343,7 +370,13 @@ class AccompanyingPeriodController extends AbstractController
'person' => $person,
'accompanying_period' => $accompanyingPeriod));
}
/**
* @param $person_id
* @param $period_id
* @param Request $request
* @return object|\Symfony\Component\HttpFoundation\RedirectResponse|Response
*/
public function reOpenAction($person_id, $period_id, Request $request)
{
$person = $this->_getPerson($person_id);