Browse Source

fix recurring event update

master
root 2 years ago
parent
commit
0c29f68656
1 changed files with 12 additions and 14 deletions
  1. +12
    -14
      models/event.py

+ 12
- 14
models/event.py View File

@ -204,7 +204,13 @@ class KalachakraEvent(models.Model):
child_event.date_begin=child_event.date_begin.replace(hour=hour_date_begin, minute=minute_date_begin)
child_event.date_end=child_event.date_end.replace(hour=hour_date_end, minute=minute_date_end)
diff_start=int(child_event.date_begin.astimezone(client_tz).hour)-int(rec.date_begin.astimezone(client_tz).hour)
diff_end=int(child_event.date_end.astimezone(client_tz).hour)-int(rec.date_end.astimezone(client_tz).hour)
child_event.date_begin=child_event.date_begin.replace(hour=hour_date_begin-diff_start, minute=minute_date_begin)
child_event.date_end=child_event.date_end.replace(hour=hour_date_end-diff_end, minute=minute_date_end)
child_event.recurring_event_newsletter_id=rec.recurring_event_newsletter_id
child_event.find_out_more_link=rec.find_out_more_link
@ -233,6 +239,8 @@ class KalachakraEvent(models.Model):
child_event.participation_member_price=rec.participation_member_price
child_event.participation_super_member_price=rec.participation_super_member_price
def remove_generated_events(self):
evt=self.env['event.event'].search([('parent_event_id','=', self.id)])
@ -303,31 +311,21 @@ class KalachakraEvent(models.Model):
# _logger.error('hour1='+str(start_date_event))
end_date_event_tz=end_date_event.astimezone(client_tz)
start_date_event_tz=start_date_event.astimezone(client_tz)
diff_start=int(start_date_event_tz.hour)-int(old_start_date_event_tz.hour)
#start_date_event=start_date_event+timedelta(hours=diff_start)
diff_end=int(end_date_event_tz.hour)-int(old_end_date_event_tz.hour)
#end_date_event=end_date_event+timedelta(hours=diff_end)
if diff_start!=0:
new_hour_start=start_date_event.hour-diff_start
new_hour_end=end_date_event.hour-diff_start
_logger.error('new_hour_start='+str(new_hour_start))
start_date_event=start_date_event.replace(hour=new_hour_start)
end_date_event=end_date_event.replace(hour=new_hour_end)
#_logger.error('start_date_event='+str(start_date_event))
#_logger.error('diff_start='+str(diff_start))
# dst_offset_diff_end = old_end_date_event.dst() - end_date_event.dst()
# end_date_event=end_date_event+dst_offset_diff_end
# dst_offset_diff_start = old_start_date_event.dst() - start_date_event.dst()
# start_date_event=start_date_event+dst_offset_diff_start


Loading…
Cancel
Save