diff --git a/controllers/kalachakra.py b/controllers/kalachakra.py
index 25e6677..e28cc70 100644
--- a/controllers/kalachakra.py
+++ b/controllers/kalachakra.py
@@ -100,12 +100,21 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
events = Event.search(domain + ['&','|', ('address_id', '=', None), ('country_id.code', '=', country_code), ('date_begin', '>=', '%s 00:00:00' % fields.Date.today()),('booking_event','=',False)], order="date_begin")
if not events:
events = Event.search(domain + [('booking_event','=',False),('date_begin', '>=', '%s 00:00:00' % fields.Date.today())], order="date_begin")
- result['date_next_week']=self.onDay(datetime.today(),6)
+ result['date_next_week_saturday']=self.onDay(datetime.today(),5)
+ result['date_next_week_sunday']=self.onDay(datetime.today(),6)
+
for event in events:
-
+ next_weekend_evt=0
+ delta1=event.date_begin- result['date_next_week_saturday']
+ delta2=event.date_begin- result['date_next_week_sunday']
+
+ if delta1.days==-1:next_weekend_evt=1
+ if delta2.days==-1:next_weekend_evt=1
if country_code and event.country_id.code == country_code:
result['country'] = country
result['events'].append({
+ "next_weekend_evt":next_weekend_evt,
+ "d_day":delta2,
"date": self.get_formated_date2(event),
"event": event,
"url": event.website_url})
@@ -120,6 +129,9 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
consider then doing onDay(foo, day + 1).
"""
days = (day - date.weekday() + 7) % 7
+ if days==0:
+ date=date+timedelta(days = 1)
+ days=(day - date.weekday() + 7) % 7
return date + timedelta(days=days)
def get_formated_date2(self, event):
diff --git a/views/website_snippets.xml b/views/website_snippets.xml
index 1098adf..cdaa29c 100644
--- a/views/website_snippets.xml
+++ b/views/website_snippets.xml
@@ -56,7 +56,36 @@
View all
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+