The SSH host key has changed on 8 April, 2022 to this one: SHA256:573uTBSeh74kvOo0HJXi5ijdzRm8me27suzNEDlGyrQ

Fixed event listing

Signed-off-by: Gergely POLONKAI <polesz@w00d5t0ck.info>
master
Gergely POLONKAI 10 years ago
parent 7a77a4e1ed
commit 111c563409
  1. 29
      src/KekRozsak/FrontBundle/Controller/EventController.php
  2. 16
      src/KekRozsak/FrontBundle/Entity/Event.php
  3. 4
      src/KekRozsak/FrontBundle/Resources/views/Box/Events.html.twig
  4. 2
      src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig
  5. 6
      src/KekRozsak/FrontBundle/Resources/views/Event/list.html.twig
  6. 4
      src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig

@ -34,7 +34,7 @@ class EventController extends Controller
/**
* @Route("/esemeny/{startDate}/{eventSlug}/csatlakozas", name="KekRozsakFrontBundle_eventJoin")
* @Template()
* @ParamConverter("event", class="KekRozsakFrontBundle:Event", options={"mapping"={"eventSlug"="slug", "startDate"="startDate"}})
* @ParamConverter("event", class="KekRozsakFrontBundle:Event", options={"mapping"={"eventSlug": "slug", "startDate": "startDate"}})
* @ParamConverter("startDate", class="DateTime", options={"format"="Y-m-d"})
*/
public function joinAction(\DateTime $startDate, Event $event)
@ -58,20 +58,27 @@ class EventController extends Controller
}
/**
* @Route("/esemenyek/{date}", name="KekRozsakFrontBundle_eventList")
* @Route("/esemenyek/{date}", name="KekRozsakFrontBundle_eventList", defaults={"date": null})
* @Template()
* @ParamConverter("date", options={"format": "Y-m-d"})
*/
public function listAction(\DateTime $date)
public function listAction($date = null)
{
$query = $this->getDoctrine()->getEntityManager()->createQuery('SELECT e FROM KekRozsakFrontBundle:Event e WHERE e.cancelled = FALSE AND ((e.startDate < :day AND e.endDate >= :day) OR e.startDate = :day)');
$query->setParameter('day', $date, \Doctrine\DBAL\Types\Type::DATE);
$events = $query->getResult();
$realDate = null;
return array(
'day' => $date,
'events' => $events,
);
if ($date === null) {
$query = $this->getDoctrine()->getEntityManager()->createQuery('SELECT e FROM KekRozsakFrontBundle:Event e WHERE e.cancelled = FALSE AND (e.startDate >= :day OR (e.startDate <= :day AND e.endDate >= :day))');
$query->setParameter('day', new \DateTime('now'), \Doctrine\DBAL\Types\Type::DATE);
} else {
$realDate = \DateTime::createFromFormat('Y-m-d', $date);
$query = $this->getDoctrine()->getEntityManager()->createQuery('SELECT e FROM KekRozsakFrontBundle:Event e WHERE e.cancelled = FALSE AND ((e.startDate < :day AND e.endDate >= :day) OR e.startDate = :day)');
$query->setParameter('day', $realDate, \Doctrine\DBAL\Types\Type::DATE);
}
$events = $query->getResult();
return array(
'day' => $realDate,
'events' => $events,
);
}
/**

@ -399,4 +399,20 @@ class Event
)
);
}
/**
* Check if the event happened before a given date
*
* @param DateTime $date
* @return boolean
*/
public function isPast(\DateTime $date = null)
{
if ($date === null)
{
$date = new \DateTime('now');
}
return ($this->endDate < $date);
}
}

@ -38,7 +38,7 @@
OR (event.startDate <= this day AND evend.endDate >= this day)
#}
<td id="event-calendar-{{ i }}"{% if eventList[i].events|length > 0 %} class="program" rel="{{ path('KekRozsakFrontBundle_eventAjaxList', {date: eventList[i].date|date('Y-m-d'), _format: 'html'}) }}"{% endif %}>
<a href="{{ path('KekRozsakFrontBundle_eventList', { date: eventList[i].date|date('Y-m-d'), _format: 'html'}) }}">{{ eventList[i].date|date('d') }}</a>
<a href="{{ path('KekRozsakFrontBundle_eventList', { date: eventList[i].date|date('Y-m-d')}) }}">{{ eventList[i].date|date('d') }}</a>
</td>
{% if cur is divisibleby(7) %}
</tr>
@ -56,7 +56,7 @@ OR (event.startDate <= this day AND evend.endDate >= this day)
</tr>
</tbody>
</table>
<a href="">További események</a>
<a href="{{ path('KekRozsakFrontBundle_eventList') }}">További események</a>
</div>
</div>
</div>

@ -213,7 +213,7 @@
$('#news-close-button').click(function() {
$('#hirek').html('');
$('#hirek').hide();
$('#content-outline').css('width', '955px');
$('#content-outline').css('width', '960px');
$('#news-button').show();
resizeBoxes();
});

@ -3,7 +3,7 @@
{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %}
{% block title %} - Események - {{ day|date('Y-m-d') }}{% endblock %}
{% block content %}
<h3>Események - {{ day|date('Y-m-d') }}</h3>
<h3>Események{% if day is not null %} - {{ day|date('Y-m-d') }}{% endif %}</h3>
{% if events %}
<ul>
{% for event in events %}
@ -11,6 +11,10 @@
{% endfor %}
</ul>
{% else %}
{% if day is not null %}
<p>Erre a napra nincsenek kiírva események.</p>
{% else %}
<p>Nincsenek kiírva későbbi események.</p>
{% endif %}
{% endif %}
{% endblock content %}

@ -15,7 +15,7 @@
<li>{{ attendee|userdataspan }}</li>
{% endfor %}
</ul>
{% if not event.isAttending(app.user) %}
<a href="{{ path('KekRozsakFrontBundle_eventJoin', { eventDate: event.startDate|date('Y-m-d'), eventSlug: event.slug }) }}">Megyek</a>
{% if not event.isAttending(app.user) and not event.isPast %}
<a href="{{ path('KekRozsakFrontBundle_eventJoin', { startDate: event.startDate|date('Y-m-d'), eventSlug: event.slug }) }}">Megyek</a>
{% endif %}
{% endblock content %}

Loading…
Cancel
Save