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

onchange on resource_calendar_leaves,override search on resource_resource 

bzr revid: rvo@tinyerp.co.in-20100225101123-9zz137jdtvd7t403
This commit is contained in:
Rvo (Open ERP) 2010-02-25 15:41:23 +05:30
parent 04a579d34d
commit ef6b702634
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
addons/resource/resource.py
View File

@ -37,15 +37,13 @@ class resource_calendar(osv.osv):
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', c)
}
def interval_min_get(self, cr, uid, id, dt_from, hours,resource=None):
def interval_min_get(self, cr, uid, id, dt_from, hours,resource=False):
resource_cal_leaves = self.pool.get('resource.calendar.leaves')
dt_leave = []
if not id:
return [(dt_from-mx.DateTime.RelativeDateTime(hours=int(hours)*3), dt_from)]
if resource:
resource_leave_ids = self.pool.get('resource.calendar.leaves').search(cr,uid,['|',('resource_id','=',resource.id),('resource_id','=',False)])
else:
resource_leave_ids = self.pool.get('resource.calendar.leaves').search(cr,uid,[('resource_id','=',False)])
res_leaves = self.pool.get('resource.calendar.leaves').read(cr,uid,resource_leave_ids,['date_from','date_to'])
resource_leave_ids = resource_cal_leaves.search(cr,uid,[('calendar_id','=',id),'|',('resource_id','=',False),('resource_id','=',resource)])
res_leaves = resource_cal_leaves.read(cr,uid,resource_leave_ids,['date_from','date_to'])
for leave in res_leaves:
dtf = mx.DateTime.strptime(leave['date_from'],'%Y-%m-%d %H:%M:%S')
dtt = mx.DateTime.strptime(leave['date_to'],'%Y-%m-%d %H:%M:%S')
@ -85,21 +83,20 @@ class resource_calendar(osv.osv):
result.reverse()
return result
def interval_get(self, cr, uid, id, dt_from, hours, resource=None, byday=True):
def interval_get(self, cr, uid, id, dt_from, hours, resource=False, byday=True):
resource_cal_leaves = self.pool.get('resource.calendar.leaves')
dt_leave = []
if not id:
return [(dt_from,dt_from+mx.DateTime.RelativeDateTime(hours=int(hours)*3))]
if resource:
resource_leave_ids = self.pool.get('resource.calendar.leaves').search(cr,uid,['|',('resource_id','=',resource.id),('resource_id','=',False) ])
else:
resource_leave_ids = self.pool.get('resource.calendar.leaves').search(cr,uid,[('resource_id','=',False)])
res_leaves = self.pool.get('resource.calendar.leaves').read(cr,uid,resource_leave_ids,['date_from','date_to'])
resource_leave_ids = resource_cal_leaves.search(cr,uid,[('calendar_id','=',id),'|',('resource_id','=',False),('resource_id','=',resource)])
res_leaves = resource_cal_leaves.read(cr,uid,resource_leave_ids,['date_from','date_to'])
for leave in res_leaves:
dtf = mx.DateTime.strptime(leave['date_from'],'%Y-%m-%d %H:%M:%S')
dtt = mx.DateTime.strptime(leave['date_to'],'%Y-%m-%d %H:%M:%S')
no = dtt - dtf
[dt_leave.append((dtf + mx.DateTime.RelativeDateTime(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
dt_leave.sort()
print 'dtLevae',dt_leave
todo = hours
cycle = 0
result = []
@ -166,6 +163,18 @@ class resource_resource(osv.osv):
'active' : lambda *a: True,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', c)
}
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
if context.get('project_id',False):
project_pool = self.pool.get('project.project')
project_rec = project_pool.browse(cr,uid,context['project_id'])
user_ids = [user_id.id for user_id in project_rec.members]
args.append(('user_id','in',user_ids))
return super(resource_resource, self).search(cr, uid, args, offset, limit,order, context, count)
resource_resource()
class resource_calendar_leaves(osv.osv):
@ -189,5 +198,14 @@ class resource_calendar_leaves(osv.osv):
_constraints = [
(check_dates, 'Error! leave start-date must be lower then leave end-date.', ['date_from', 'date_to'])
]
def onchange_resource(self,cr,uid,ids,resource):
result = {}
if resource:
resource_pool = self.pool.get('resource.resource')
result['calendar_id'] = resource_pool.browse(cr,uid,resource).calendar_id.id
return {'value':result}
return {'value':{'calendar_id':[]}}
resource_calendar_leaves()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/resource/resource_view.xml
View File

@ -61,7 +61,6 @@
<field name="arch" type="xml">
<calendar color="resource_id" date_start="date_from" string="Resource">
<field name="name"/>
</calendar>
</field>
</record>
@ -135,7 +134,7 @@
<field name="calendar_id" />
<field name="date_from" />
<field name="date_to" />
<field name="resource_id" />
<field name="resource_id" on_change="onchange_resource(resource_id)"/>
</form>
</field>
</record>