youssef/GOLEM
2
0
Fork 0
forked from Yaltik/golem
Code Issues Pull Requests Releases Wiki Activity

ajout des test

Browse Source
This commit is contained in:
eloyoussef 2018-03-20 09:54:34 +01:00
parent 5e495ce93a
commit 67451339ff
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
golem_activity/models/golem_activity.py
View File

@ -180,11 +180,26 @@ class GolemActivity(models.Model):
real_events = self.browse([real_id for calendar_id, real_id in select]) real_events = self.browse([real_id for calendar_id, real_id in select])
real_data = super(GolemActivity, real_events).read(fields=fields2, load=load) real_data = super(GolemActivity, real_events).read(fields=fields2, load=load)
real_data = dict((d['id'], d) for d in real_data) real_data = dict((d['id'], d) for d in real_data)
print '------------------------------------'
print real_data print real_data
print '------------------------------------'
print real_events print real_events
print '------------------------------------'
result = []
for calendar_id, real_id in select:
res = real_data[real_id].copy()
print res
print '_*_*_*_*_*_*_*_*_*_*_*_*_*_*_*_'
print calendar_id
print '_*_*_*_*_*_*_*_*_*_*_*_*_*_*_*_'
print real_id
#ls = self.calendar_id2real_id(calendar_id, with_date=res and res.get('duration', 0) > 0 and res.get('duration') or 1)
"""
for calendar_id, real_id in select: for calendar_id, real_id in select:
print calendar_id print calendar_id
print real_id print real_id"""
#for id in self.ids: #for id in self.ids:
# print self.env['golem.activity'].browse(id) # print self.env['golem.activity'].browse(id)
@ -193,7 +208,7 @@ class GolemActivity(models.Model):
@api.multi @api.multi
def calendar_id2real_id(self, calendar_id=None): def calendar_id2real_id(self, calendar_id=None):
if calendar_id and isinstance(calendar_id, (basestring)): if calendar_id and isinstance(calendar_id, (basestring)):
res = filter(None, calendar_id.split('-')) res = filter(None, calendar_id.split('_'))
if len(res) == 2: if len(res) == 2:
real_id = res[0] real_id = res[0]
return int(real_id) return int(real_id)
@ -201,7 +216,7 @@ class GolemActivity(models.Model):
@api.multi @api.multi
def real_id2calendar_id(self, record_id, date): def real_id2calendar_id(self, record_id, date):
return '%s-%s' % (record_id, date) return '%s_%s' % (record_id, date)
@api.multi @api.multi
def get_recurrent_ids(self): def get_recurrent_ids(self):