Compare commits

...

3 Commits

Author SHA1 Message Date
Jean-Marie Favreau 9652024852 Correction boutons alignés 2024-05-01 16:19:23 +02:00
Jean-Marie Favreau 2d157c29ec supression d'un log inutile 2024-05-01 16:19:16 +02:00
Jean-Marie Favreau a8aaece180 Correction de la durée d'événements durant plus d'un jour 2024-05-01 16:18:53 +02:00
3 changed files with 8 additions and 3 deletions

View File

@ -4,7 +4,7 @@ import warnings
from icalendar import vDatetime from icalendar import vDatetime
import bbcode import bbcode
from datetime import datetime, date from datetime import datetime, date, timedelta
from bs4 import BeautifulSoup, MarkupResemblesLocatorWarning from bs4 import BeautifulSoup, MarkupResemblesLocatorWarning
from .extractor import * from .extractor import *
@ -67,6 +67,12 @@ class ICALExtractor(Extractor):
start_day, start_time = self.get_dt_item_from_vevent(event, "DTSTART") start_day, start_time = self.get_dt_item_from_vevent(event, "DTSTART")
end_day, end_time = self.get_dt_item_from_vevent(event, "DTEND") end_day, end_time = self.get_dt_item_from_vevent(event, "DTEND")
# if the start and end are only defined by dates (and not times),
# then the event does not occurs on the last day (because it is the end
# of the event...)
if not start_time and not end_time and start_day != end_day:
end_day = end_day + timedelta(days=-1)
location = self.get_item_from_vevent(event, "LOCATION") location = self.get_item_from_vevent(event, "LOCATION")
if location is None: if location is None:

View File

@ -463,7 +463,6 @@ class Event(models.Model):
if not self.exact_location: if not self.exact_location:
for p in Place.objects.all(): for p in Place.objects.all():
if p.match(self): if p.match(self):
logger.warning("Found a place for an imported event: " + p.name)
self.exact_location = p self.exact_location = p
break break

View File

@ -34,7 +34,7 @@ Mettre l'événement {{ event.title }} à la corbeille
{% endif %} {% endif %}
</p> </p>
{{ form }} {{ form }}
<div class="grid"> <div class="grid buttons">
<a href="{{ cancel_url }}" role="button" class="secondary">Annuler</a> <a href="{{ cancel_url }}" role="button" class="secondary">Annuler</a>
<input type="submit" value="Confirmer"> <input type="submit" value="Confirmer">
</div> </div>