odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]: caldav: Fixed problem of importing recurrent event from sunbird when we edit one 

bzr revid: rpa@tinyerp.com-20100816105916-152tcfm6jynt6spi
This commit is contained in:
rpa (Open ERP) 2010-08-16 16:29:16 +05:30
parent 41f11608ae
commit cf80c1d74a
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/caldav/calendar.py
View File

@ -75,9 +75,9 @@ def uid2openobjectid(cr, uidval, oomodel, rdate):
return (False, None)
def openobjectid2uid(cr, uidval, oomodel):
""" Open Object Id To UId
""" Gives the value of UID for VEVENT
@param cr: the current row, from the database cursor,
@param uidval: Get USerId vale
@param uidval: Id value of the Event
@oomodel: Open Object ModelName """
value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
@ -454,9 +454,16 @@ class CalDAV(object):
recur_pool = {}
try:
for val in vals:
exists, r_id = uid2openobjectid(cr, val['id'], context.get('model'), \
# Compute value of duration
if 'date_deadline' in val and 'duration' not in val:
start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
diff = end - start
val['duration'] = (diff.seconds/float(86400) + diff.days) * 24
exists, r_id = calendar.uid2openobjectid(cr, val['id'], context.get('model'), \
val.get('recurrent_id'))
if val.has_key('create_date'): val.pop('create_date')
if val.has_key('create_date'):
val.pop('create_date')
u_id = val.get('id', None)
val.pop('id')
if exists and r_id:
@ -472,6 +479,11 @@ class CalDAV(object):
revent_id = model_obj.create(cr, uid, val)
ids.append(revent_id)
else:
__rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
wematch = __rege.match(u_id.encode('utf8'))
if wematch:
model, recur_id, dbname = wematch.groups()
val.update({'recurrent_uid': recur_id})
event_id = model_obj.create(cr, uid, val)
recur_pool[u_id] = event_id
ids.append(event_id)

21
addons/crm_caldav/crm_caldav.py
View File

@ -23,6 +23,7 @@ from osv import fields, osv
from crm import crm
from caldav import calendar
from datetime import datetime
import re
class crm_meeting(osv.osv):
_inherit = 'crm.meeting'
@ -74,9 +75,16 @@ class crm_meeting(osv.osv):
recur_pool = {}
try:
for val in vals:
# Compute value of duration
if 'date_deadline' in val and 'duration' not in val:
start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
diff = end - start
val['duration'] = (diff.seconds/float(86400) + diff.days) * 24
exists, r_id = calendar.uid2openobjectid(cr, val['id'], context.get('model'), \
val.get('recurrent_id'))
if val.has_key('create_date'): val.pop('create_date')
if val.has_key('create_date'):
val.pop('create_date')
u_id = val.get('id', None)
val.pop('id')
if exists and r_id:
@ -84,12 +92,6 @@ class crm_meeting(osv.osv):
model_obj.write(cr, uid, [r_id], val)
ids.append(r_id)
elif exists:
# Compute value of duration
if 'date_deadline' in val and 'duration' not in val:
start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
diff = end - start
val['duration'] = (diff.seconds/float(86400) + diff.days) * 24
model_obj.write(cr, uid, [exists], val)
ids.append(exists)
else:
@ -98,6 +100,11 @@ class crm_meeting(osv.osv):
revent_id = model_obj.create(cr, uid, val)
ids.append(revent_id)
else:
__rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
wematch = __rege.match(u_id.encode('utf8'))
if wematch:
model, recur_id, dbname = wematch.groups()
val.update({'recurrent_uid': recur_id})
event_id = model_obj.create(cr, uid, val)
recur_pool[u_id] = event_id
ids.append(event_id)