diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index c59b6d5e6..bc2a87313 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -267,54 +267,42 @@ class CalendarController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
- [$person, $accompanyingPeriod] = $this->getEntity($request);
+ [$user, $accompanyingPeriod] = $this->getEntity($request);
if ($accompanyingPeriod instanceof AccompanyingPeriod) {
$view = 'ChillCalendarBundle:Calendar:confirm_deleteAccompanyingCourse.html.twig';
- } elseif ($person instanceof Person) {
- $view = 'ChillCalendarBundle:Calendar:confirm_deletePerson.html.twig';
- }
+ }
+ // elseif ($person instanceof Person) {
+ // $view = 'ChillCalendarBundle:Calendar:confirm_deletePerson.html.twig';
+ // }
- /* @var $activity Calendar */
- $activity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
+ /* @var $entity Calendar */
+ $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
- if (!$activity) {
+ if (!$entity) {
throw $this->createNotFoundException('Unable to find Calendar entity.');
}
- // TODO
- // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
-
- $form = $this->createDeleteForm($id, $person, $accompanyingPeriod);
+ $form = $this->createDeleteForm($id, $user, $accompanyingPeriod);
if ($request->getMethod() === Request::METHOD_DELETE) {
$form->handleRequest($request);
if ($form->isValid()) {
- $this->logger->notice("An activity has been removed", array(
+ $this->logger->notice("A calendar event has been removed", array(
'by_user' => $this->getUser()->getUsername(),
- 'activity_id' => $activity->getId(),
- 'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
- 'comment' => $activity->getComment()->getComment(),
- 'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
- 'reasons_ids' => $activity->getReasons()
- ->map(function ($ar) { return $ar->getId(); })
- ->toArray(),
- 'type_id' => $activity->getType()->getId(),
- 'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
- 'date' => $activity->getDate()->format('Y-m-d'),
- 'attendee' => $activity->getAttendee()
+ 'calendar_id' => $entity->getId()
));
- $em->remove($activity);
+ $em->remove($entity);
$em->flush();
$this->addFlash('success', $this->get('translator')
- ->trans("The activity has been successfully removed."));
+ ->trans("The calendar has been successfully removed."));
- $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
- return $this->redirectToRoute('chill_activity_activity_list', $params);
+ $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+ return $this->redirectToRoute('chill_calendar_calendar', $params);
}
}
@@ -323,9 +311,8 @@ class CalendarController extends AbstractController
}
return $this->render($view, array(
- 'activity' => $activity,
+ 'calendar' => $entity,
'delete_form' => $form->createView(),
- 'person' => $person,
'accompanyingCourse' => $accompanyingPeriod,
));
}
@@ -339,7 +326,7 @@ class CalendarController extends AbstractController
$params['id'] = $id;
return $this->createFormBuilder()
- ->setAction($this->generateUrl('chill_activity_activity_delete', $params))
+ ->setAction($this->generateUrl('chill_calendar_calendar_delete', $params))
->setMethod('DELETE')
->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig
new file mode 100644
index 000000000..d957293b2
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig
@@ -0,0 +1,16 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar' %}
+
+{% block title 'Remove calendar item'|trans %}
+
+{% block content %}
+ {{ include('@ChillMain/Util/confirmation_template.html.twig',
+ {
+ 'title' : 'Remove calendar item'|trans,
+ 'confirm_question' : 'Are you sure you want to remove the calendar item?'|trans,
+ 'cancel_route' : 'chill_calendar_calendar',
+ 'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : calendar.id },
+ 'form' : delete_form
+ } ) }}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig
new file mode 100644
index 000000000..9f8172bb4
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig
@@ -0,0 +1,17 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+{% set person = activity.person %}
+
+{% block title 'Remove activity'|trans %}
+
+{% block personcontent %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+ {
+ 'title' : 'Remove activity'|trans,
+ 'confirm_question' : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname } ),
+ 'cancel_route' : 'chill_activity_activity_list',
+ 'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id },
+ 'form' : delete_form
+ } ) }}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index 7b2f1a104..cb45bd2ec 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -32,12 +32,9 @@
{% if calendar.endDate %}
{{ calendar.endDate|format_date('long') }}
{% endif %}
-
-
- {{ calendar.endDate.diff(calendar.startDate)|date("%i'%s''") }}
+ {{ calendar.endDate.diff(calendar.startDate)|date("%Y%m%d%h") }}
-
{% if context == 'user' and calendar.accompanyingPeriod is not empty %}